总累计运行数据数据来源改为电表报表表数据

2. 运行曲线数据改用电表报表的数据

src/api/ems/dzjk.js

@@ -1,6 +1,6 @@
-import request from '@/utils/request'
+import request from '@/utils/request'
 
-//获取单个站点的信息
+//鑾峰彇鍗曚釜绔欑偣鐨勪俊鎭?
 export function getDzjkHomeView(siteId) {
     return request({
         url: `/ems/siteMonitor/homeView?siteId=${siteId}`,
@@ -8,7 +8,40 @@ export function getDzjkHomeView(siteId) {
     })
 }
 
-//站点首页 冲放曲线
+//鑾峰彇鍗曚釜绔欑偣鎬荤疮璁¤繍琛屾暟鎹紙鍩轰簬鏃ヨ〃锛?
+export function getDzjkHomeTotalView(siteId) {
+    return request({
+        url: `/ems/siteMonitor/homeTotalView?siteId=${siteId}`,
+        method: 'get'
+    })
+}
+
+// 鍗曠珯鐩戞帶椤圭洰鐐逛綅閰嶇疆锛堜緵鍗曠珯鐩戞帶鍔熻兘鏌ヨ锛?
+export function getProjectPointMapping(siteId) {
+    return request({
+        url: `/ems/siteMonitor/getProjectPointMapping?siteId=${siteId}`,
+        method: 'get'
+    })
+}
+
+// 鍗曠珯鐩戞帶椤圭洰灞曠ず鏁版嵁锛堝瓧娈甸厤缃?+ 鏈€鏂板€硷級
+export function getProjectDisplayData(siteId) {
+    return request({
+        url: `/ems/siteMonitor/getProjectDisplayData?siteId=${siteId}`,
+        method: 'get'
+    })
+}
+
+// 鍗曠珯鐩戞帶椤圭洰灞曠ず鏁版嵁鍐欏叆锛堟壒閲忥級
+export function saveProjectDisplayData(data) {
+    return request({
+        url: `/ems/siteMonitor/saveProjectDisplayData`,
+        method: 'post',
+        data
+    })
+}
+
+//绔欑偣棣栭〉 鍐叉斁鏇茬嚎
 export function getSevenChargeData({siteId, startDate, endDate}) {
     return request({
         url: `/ems/siteMap/getSevenChargeData?siteId=${siteId}&startDate=${startDate}&endDate=${endDate}`,
@@ -16,7 +49,7 @@ export function getSevenChargeData({siteId, startDate, endDate}) {
     })
 }
 
-// 获取站点包含的设备种类 用来判断单站监控设备监控的菜单栏展示
+// 鑾峰彇绔欑偣鍖呭惈鐨勮澶囩绫?鐢ㄦ潵鍒ゆ柇鍗曠珯鐩戞帶璁惧鐩戞帶鐨勮彍鍗曟爮灞曠ず
 export function getSiteAllDeviceCategory(siteId) {
     return request({
         url: `/ems/siteConfig/getSiteAllDeviceCategory?siteId=${siteId}`,
@@ -32,7 +65,7 @@ export function getEmsDataList(siteId) {
     })
 }
 
-//获取pcs、实时运行头部的设备信息
+//鑾峰彇pcs銆佸疄鏃惰繍琛屽ご閮ㄧ殑璁惧淇℃伅
 export function getRunningHeadInfo(siteId) {
     return request({
         url: `/ems/siteMonitor/runningHeadInfo?siteId=${siteId}`,
@@ -40,7 +73,7 @@ export function getRunningHeadInfo(siteId) {
     })
 }
 
-//获取pcs列表
+//鑾峰彇pcs鍒楄〃
 export function getPcsDetailInfo(siteId) {
     return request({
         url: `/ems/siteMonitor/getPcsDetailInfo?siteId=${siteId}`,
@@ -48,7 +81,7 @@ export function getPcsDetailInfo(siteId) {
     })
 }
 
-//获取BMS总览数据
+//鑾峰彇BMS鎬昏鏁版嵁
 export function getBMSOverView(siteId) {
     return request({
         url: `/ems/siteMonitor/getBMSOverView?siteId=${siteId}`,
@@ -56,7 +89,7 @@ export function getBMSOverView(siteId) {
     })
 }
 
-//获取BMS电池簇总览数据
+//鑾峰彇BMS鐢垫睜绨囨€昏鏁版嵁
 export function getBMSBatteryCluster(siteId) {
     return request({
         url: `/ems/siteMonitor/getBMSBatteryCluster?siteId=${siteId}`,
@@ -64,7 +97,7 @@ export function getBMSBatteryCluster(siteId) {
     })
 }
 
-//获取单体电池 电池堆列表数据
+//鑾峰彇鍗曚綋鐢垫睜 鐢垫睜鍫嗗垪琛ㄦ暟鎹?
 export function getStackNameList(siteId) {
     return request({
         url: `/ems/siteMonitor/getStackNameList?siteId=${siteId}`,
@@ -72,7 +105,7 @@ export function getStackNameList(siteId) {
     })
 }
 
-//获取单体电池 电池簇列表数据
+//鑾峰彇鍗曚綋鐢垫睜 鐢垫睜绨囧垪琛ㄦ暟鎹?
 export function getClusterNameList({stackDeviceId, siteId}) {
     return request({
         url: `/ems/siteMonitor/getClusterNameList?stackDeviceId=${stackDeviceId}&siteId=${siteId}`,
@@ -80,7 +113,7 @@ export function getClusterNameList({stackDeviceId, siteId}) {
     })
 }
 
-//单体电池表格数据
+//鍗曚綋鐢垫睜琛ㄦ牸鏁版嵁
 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}`,
@@ -88,7 +121,7 @@ export function getClusterDataInfoList({siteId, stackDeviceId, clusterDeviceId,
     })
 }
 
-// 单体电池图表
+// 鍗曚綋鐢垫睜鍥捐〃
 //http://localhost:8089/ems/siteMonitor/getSingleBatteryData?clusterDeviceId=BMSC01&siteId=021_FXX_01&deviceId=001&startDate=2025-07-11&endDate=2025-07-18
 export function getSingleBatteryData({siteId, deviceId, clusterDeviceId, startDate, endDate}) {
     return request({
@@ -97,7 +130,7 @@ export function getSingleBatteryData({siteId, deviceId, clusterDeviceId, startDa
     })
 }
 
-//获取液冷列表数据
+//鑾峰彇娑插喎鍒楄〃鏁版嵁
 export function getCoolingDataList(siteId) {
     return request({
         url: `/ems/siteMonitor/getCoolingDataList?siteId=${siteId}`,
@@ -105,7 +138,7 @@ export function getCoolingDataList(siteId) {
     })
 }
 
-//获取动环数据
+//鑾峰彇鍔ㄧ幆鏁版嵁
 export function getDhDataList(siteId) {
     return request({
         url: `/ems/siteMonitor/getDhDataList?siteId=${siteId}`,
@@ -113,7 +146,7 @@ export function getDhDataList(siteId) {
     })
 }
 
-//获取消防数据
+//鑾峰彇娑堥槻鏁版嵁
 export function getXfDataList(siteId) {
     return request({
         url: `/ems/siteMonitor/getXfDataList?siteId=${siteId}`,
@@ -122,7 +155,7 @@ export function getXfDataList(siteId) {
 }
 
 
-//获取电表数据
+//鑾峰彇鐢佃〃鏁版嵁
 export function getAmmeterDataList(siteId) {
     return request({
         url: `/ems/siteMonitor/getAmmeterDataList?siteId=${siteId}`,
@@ -130,7 +163,7 @@ export function getAmmeterDataList(siteId) {
     })
 }
 
-// 故障告警
+// 鏁呴殰鍛婅
 export function getAlarmDetailList({
                                        status,
                                        siteId,
@@ -147,7 +180,7 @@ export function getAlarmDetailList({
     })
 }
 
-// 告警生成工单
+// 鍛婅鐢熸垚宸ュ崟
 export function createTicketNo(data) {
     return request({
         url: `/ems/siteAlarm/createTicketNo`,
@@ -156,16 +189,312 @@ export function createTicketNo(data) {
     })
 }
 
-// 概率统计
+// 鍛婅纭鍏抽棴
-//获取概率统计 电量指标接口
+export function closeAlarm(data) {
-export function getElectricData({siteId, startDate, endDate}) {
     return request({
-        url: `/ems/statsReport/getElectricData?siteId=${siteId}&startDate=${startDate}&endDate=${endDate}`,
+        url: `/ems/siteAlarm/closeAlarm`,
-        method: 'get'
+        method: 'post',
+        data
     })
 }
 
-//获取pcs列表
+function getFieldNameByCode(fieldCode) {
+    const raw = String(fieldCode || '').trim()
+    if (!raw) return ''
+    const idx = raw.lastIndexOf('__')
+    return idx >= 0 ? raw.slice(idx + 2) : raw
+}
+
+function normalizeRows(displayResponse) {
+    const rows = displayResponse?.data || []
+    return Array.isArray(rows) ? rows : []
+}
+
+function filterByMenu(rows, menuCode) {
+    return (rows || []).filter(item => item && item.menuCode === menuCode)
+}
+
+function toDateLabel(valueTime) {
+    if (!valueTime) return ''
+    const date = new Date(valueTime)
+    if (isNaN(date.getTime())) return ''
+    const p = (n) => String(n).padStart(2, '0')
+    return `${date.getFullYear()}-${p(date.getMonth() + 1)}-${p(date.getDate())}`
+}
+
+function toDateTimeLabel(valueTime) {
+    if (!valueTime) return ''
+    const date = new Date(valueTime)
+    if (isNaN(date.getTime())) return ''
+    const p = (n) => String(n).padStart(2, '0')
+    return `${date.getFullYear()}-${p(date.getMonth() + 1)}-${p(date.getDate())} ${p(date.getHours())}:${p(date.getMinutes())}`
+}
+
+function toValueMap(rows) {
+    const map = {}
+    ;(rows || []).forEach(item => {
+        const fieldName = getFieldNameByCode(item?.fieldCode)
+        if (fieldName) {
+            map[fieldName] = item?.fieldValue
+        }
+    })
+    return map
+}
+
+function groupRowsByDevice(rows) {
+    const map = new Map()
+    ;(rows || []).forEach(item => {
+        const deviceId = String(item?.deviceId || '').trim() || 'DEFAULT'
+        if (!map.has(deviceId)) {
+            map.set(deviceId, [])
+        }
+        map.get(deviceId).push(item)
+    })
+    return map
+}
+
+function paginateRows(rows, pageNum = 1, pageSize = 10) {
+    const safePageNum = Number(pageNum) > 0 ? Number(pageNum) : 1
+    const safePageSize = Number(pageSize) > 0 ? Number(pageSize) : 10
+    const start = (safePageNum - 1) * safePageSize
+    return (rows || []).slice(start, start + safePageSize)
+}
+
+function toNumber(value) {
+    const num = Number(value)
+    return Number.isFinite(num) ? num : null
+}
+
+function normalizeDateInput(dateStr) {
+    if (dateStr) return dateStr
+    return toDateLabel(new Date())
+}
+
+function resolveElectricUnit(startDate, endDate) {
+    const start = new Date(`${normalizeDateInput(startDate)} 00:00:00`)
+    const end = new Date(`${normalizeDateInput(endDate)} 00:00:00`)
+    if (isNaN(start.getTime()) || isNaN(end.getTime())) return '\u65e5'
+    const diffDays = Math.floor((end.getTime() - start.getTime()) / (24 * 60 * 60 * 1000))
+    if (diffDays <= 0) return '\u65e5'
+    if (diffDays < 30) return '\u65e5'
+    return '\u6708'
+}
+
+function formatByUnit(date, unit) {
+    const p = (n) => String(n).padStart(2, '0')
+    if (unit === '\u65e5') return `${p(date.getHours())}:${p(date.getMinutes())}`
+    if (unit === '\u6708') return `${date.getFullYear()}-${p(date.getMonth() + 1)}`
+    return `${date.getFullYear()}-${p(date.getMonth() + 1)}-${p(date.getDate())}`
+}
+
+function aggregateCurveByUnit(curveRows, unit) {
+    const result = new Map()
+    ;(curveRows || []).forEach(item => {
+        const time = item?.dataTime ? new Date(item.dataTime) : null
+        if (!time || isNaN(time.getTime())) return
+        const value = toNumber(item?.pointValue)
+        if (value == null) return
+        const label = formatByUnit(time, unit)
+        result.set(label, value)
+    })
+    return result
+}
+
+function getLatestCurveValue(curveRows) {
+    let latestTime = null
+    let latestValue = null
+    ;(curveRows || []).forEach(item => {
+        const time = item?.dataTime ? new Date(item.dataTime) : null
+        if (!time || isNaN(time.getTime())) return
+        const value = toNumber(item?.pointValue)
+        if (value == null) return
+        if (latestTime == null || time.getTime() > latestTime) {
+            latestTime = time.getTime()
+            latestValue = value
+        }
+    })
+    return latestValue
+}
+
+function findMappingByField(rows, fieldNames = []) {
+    const targetSet = new Set((fieldNames || []).map(name => String(name || '').trim()))
+    return (rows || []).find(item => targetSet.has(getFieldNameByCode(item?.fieldCode)))
+}
+
+function getDataPointFromMapping(mapping) {
+    if (!mapping) return ''
+    const useFixedDisplay = Number(mapping?.useFixedDisplay) === 1
+    const fixedDataPoint = String(mapping?.fixedDataPoint || '').trim()
+    const dataPoint = String(mapping?.dataPoint || '').trim()
+    if (useFixedDisplay && fixedDataPoint) return fixedDataPoint
+    return dataPoint || fixedDataPoint
+}
+
+function queryPointCurveByPointId({siteId, pointId, startDate, endDate}) {
+    if (!siteId || !pointId) return Promise.resolve([])
+    const start = `${normalizeDateInput(startDate)} 00:00:00`
+    const end = `${normalizeDateInput(endDate)} 23:59:59`
+    return request({
+        url: `/ems/pointConfig/curve`,
+        method: 'post',
+        headers: {
+            repeatSubmit: false
+        },
+        data: {
+            siteId,
+            pointId,
+            rangeType: 'custom',
+            startTime: start,
+            endTime: end
+        }
+    }).then(resp => (Array.isArray(resp?.data) ? resp.data : []))
+}
+
+function sortCurveRows(curveRows = []) {
+    return [...(curveRows || [])].sort((a, b) => {
+        const ta = new Date(a?.dataTime).getTime()
+        const tb = new Date(b?.dataTime).getTime()
+        return (isNaN(ta) ? 0 : ta) - (isNaN(tb) ? 0 : tb)
+    })
+}
+
+function resolveRangeKind(startDate, endDate) {
+    const start = new Date(`${normalizeDateInput(startDate)} 00:00:00`)
+    const end = new Date(`${normalizeDateInput(endDate || startDate)} 00:00:00`)
+    if (isNaN(start.getTime()) || isNaN(end.getTime())) return 'day'
+    const diffDays = Math.floor((end.getTime() - start.getTime()) / (24 * 60 * 60 * 1000))
+    if (diffDays < 31) return 'minute'
+    if (diffDays < 180) return 'day'
+    return 'month'
+}
+
+function formatTimeLabelByKind(date, kind = 'day') {
+    const p = (n) => String(n).padStart(2, '0')
+    if (kind === 'minute') return `${date.getFullYear()}-${p(date.getMonth() + 1)}-${p(date.getDate())} ${p(date.getHours())}:${p(date.getMinutes())}`
+    if (kind === 'month') return `${date.getFullYear()}-${p(date.getMonth() + 1)}`
+    return `${date.getFullYear()}-${p(date.getMonth() + 1)}-${p(date.getDate())}`
+}
+
+function buildSortedLabels(labelSet, kind = 'day') {
+    const labels = Array.from(labelSet || [])
+    return labels.sort()
+}
+
+function normalizePointValue(raw) {
+    const num = toNumber(raw)
+    if (num != null) return num
+    return raw == null ? '' : raw
+}
+
+function resolveAliasByField(aliasMap, fieldName) {
+    const raw = String(fieldName || '').trim()
+    if (!raw) return ''
+    if (aliasMap[raw]) return aliasMap[raw]
+    const withoutStat = raw.replace(/_stat$/, '')
+    return aliasMap[withoutStat] || ''
+}
+
+function toFixedNumber(value, digits = 2) {
+    const num = toNumber(value)
+    if (num == null) return null
+    return Number(num.toFixed(digits))
+}
+
+function sortDailyAmmeterRows(rows = []) {
+    return [...(rows || [])].sort((a, b) => {
+        const ta = new Date(`${a?.dataTime || ''} 00:00:00`).getTime()
+        const tb = new Date(`${b?.dataTime || ''} 00:00:00`).getTime()
+        return (isNaN(ta) ? 0 : ta) - (isNaN(tb) ? 0 : tb)
+    })
+}
+
+function queryAllAmmeterDailyRows({siteId, startTime, endTime, pageSize = 500, pageNum = 1, rows = []}) {
+    return getAmmeterData({siteId, startTime, endTime, pageSize, pageNum}).then((response) => {
+        const currentRows = Array.isArray(response?.rows) ? response.rows : []
+        const allRows = rows.concat(currentRows)
+        const total = Number(response?.total) || 0
+        if (allRows.length >= total || currentRows.length < pageSize) {
+            return allRows
+        }
+        return queryAllAmmeterDailyRows({
+            siteId,
+            startTime,
+            endTime,
+            pageSize,
+            pageNum: pageNum + 1,
+            rows: allRows,
+        })
+    })
+}
+
+function queryMenuPointCurves({siteId, menuCode, startDate, endDate, mappingFilter}) {
+    return getProjectPointMapping(siteId).then((mappingResp) => {
+        const allMappings = Array.isArray(mappingResp?.data) ? mappingResp.data : []
+        let menuMappings = allMappings.filter(item => item?.menuCode === menuCode)
+        if (typeof mappingFilter === 'function') {
+            menuMappings = menuMappings.filter(mappingFilter)
+        }
+        const tasks = menuMappings.map((mapping) => {
+            const pointId = getDataPointFromMapping(mapping)
+            if (!pointId) return Promise.resolve(null)
+            return queryPointCurveByPointId({siteId, pointId, startDate, endDate})
+                .then(curve => ({
+                    deviceId: String(mapping?.deviceId || '').trim(),
+                    fieldName: getFieldNameByCode(mapping?.fieldCode),
+                    curve: sortCurveRows(curve || []),
+                }))
+                .catch(() => ({
+                    deviceId: String(mapping?.deviceId || '').trim(),
+                    fieldName: getFieldNameByCode(mapping?.fieldCode),
+                    curve: [],
+                }))
+        })
+        return Promise.all(tasks).then(rows => rows.filter(Boolean))
+    })
+}
+
+// 鐢甸噺鎸囨爣
+export function getElectricData({siteId, startDate, endDate}) {
+    return queryAllAmmeterDailyRows({
+        siteId,
+        startTime: startDate,
+        endTime: endDate,
+    }).then((rows) => {
+        const sortedRows = sortDailyAmmeterRows(rows)
+        const sevenDayDisChargeStats = sortedRows.map((item) => {
+            const chargedCap = toNumber(item?.activeTotalKwh)
+            const disChargedCap = toNumber(item?.reActiveTotalKwh)
+            const rowEffect = toNumber(item?.effect)
+            const dailyEfficiency = rowEffect != null
+                ? rowEffect
+                : (chargedCap > 0 && disChargedCap != null ? toFixedNumber((disChargedCap / chargedCap) * 100) : null)
+            return {
+                ammeterDate: item?.dataTime || '',
+                chargedCap: chargedCap == null ? '' : chargedCap,
+                disChargedCap: disChargedCap == null ? '' : disChargedCap,
+                dailyEfficiency: dailyEfficiency == null ? '' : dailyEfficiency,
+            }
+        })
+
+        const totalChargedCap = toFixedNumber(sevenDayDisChargeStats.reduce((acc, item) => acc + (toNumber(item.chargedCap) || 0), 0))
+        const totalDisChargedCap = toFixedNumber(sevenDayDisChargeStats.reduce((acc, item) => acc + (toNumber(item.disChargedCap) || 0), 0))
+        const efficiency = totalChargedCap > 0
+            ? toFixedNumber((totalDisChargedCap / totalChargedCap) * 100)
+            : 0
+
+        return {
+            data: {
+                totalChargedCap: totalChargedCap == null ? 0 : totalChargedCap,
+                totalDisChargedCap: totalDisChargedCap == null ? 0 : totalDisChargedCap,
+                efficiency: efficiency == null ? 0 : efficiency,
+                unit: '\u65e5',
+                sevenDayDisChargeStats,
+            }
+        }
+    })
+}
+
+//鑾峰彇pcs鍒楄〃
 export function getPcsNameList(siteId) {
     return request({
         url: `/ems/siteMonitor/getPcsNameList?siteId=${siteId}`,
@@ -173,33 +502,153 @@ export function getPcsNameList(siteId) {
     })
 }
 
-//pcs曲线
+// pcs鏇茬嚎
-export function getPCSData({siteId, startTime, endTime, dataType}) {
+export function getPCSData({siteId, startTime, endTime}) {
-    return request({
+    const kind = resolveRangeKind(startTime, endTime)
-        url: `/ems/statsReport/getPCSData?siteId=${siteId}&startDate=${startTime}&endDate=${endTime}&dataType=${dataType}`,
+    const aliasMap = {
-        method: 'get'
+        activePower_stat: 'activePower',
+        activePower: 'activePower',
+        reactivePower_stat: 'reactivePower',
+        reactivePower: 'reactivePower',
+        uCurrent: 'uCurrent',
+        vCurrent: 'vCurrent',
+        wCurrent: 'wCurrent',
+    }
+    return queryMenuPointCurves({
+        siteId,
+        menuCode: 'TJBB_PCSQX',
+        startDate: startTime,
+        endDate: endTime,
+    }).then((records) => {
+        const byDevice = new Map()
+        records.forEach((record) => {
+            const alias = resolveAliasByField(aliasMap, record.fieldName)
+            if (!alias) return
+            const deviceId = record.deviceId || ''
+            if (!byDevice.has(deviceId)) byDevice.set(deviceId, new Map())
+            const rowMap = byDevice.get(deviceId)
+            ;(record.curve || []).forEach((point) => {
+                const time = point?.dataTime ? new Date(point.dataTime) : null
+                if (!time || isNaN(time.getTime())) return
+                const label = formatTimeLabelByKind(time, kind)
+                if (!rowMap.has(label)) rowMap.set(label, {statisDate: label})
+                rowMap.get(label)[alias] = normalizePointValue(point?.pointValue)
+            })
+        })
+        const data = []
+        byDevice.forEach((rowMap, deviceId) => {
+            const labels = buildSortedLabels(new Set(Array.from(rowMap.keys())), kind)
+            data.push({
+                deviceId,
+                dataList: labels.map(label => rowMap.get(label)),
+            })
+        })
+        return {data}
     })
 }
 
-//电池堆曲线
+// 鐢垫睜鍫嗘洸绾?
-export function getStackData({siteId, startTime, endTime, dataType}) {
+export function getStackData({siteId, startTime, endTime}) {
-    return request({
+    const kind = resolveRangeKind(startTime, endTime)
-        url: `/ems/statsReport/getStackData?siteId=${siteId}&startDate=${startTime}&endDate=${endTime}&dataType=${dataType}`,
+    const aliasMap = {
-        method: 'get'
+        temp: 'temp',
+        voltage_stat: 'voltage',
+        voltage: 'voltage',
+        current: 'current',
+        soc_stat: 'soc',
+        soc: 'soc',
+    }
+    return queryMenuPointCurves({
+        siteId,
+        menuCode: 'TJBB_DCDQX',
+        startDate: startTime,
+        endDate: endTime,
+    }).then((records) => {
+        const byDevice = new Map()
+        records.forEach((record) => {
+            const alias = resolveAliasByField(aliasMap, record.fieldName)
+            if (!alias) return
+            const deviceId = record.deviceId || ''
+            if (!byDevice.has(deviceId)) byDevice.set(deviceId, new Map())
+            const rowMap = byDevice.get(deviceId)
+            ;(record.curve || []).forEach((point) => {
+                const time = point?.dataTime ? new Date(point.dataTime) : null
+                if (!time || isNaN(time.getTime())) return
+                const label = formatTimeLabelByKind(time, kind)
+                if (!rowMap.has(label)) rowMap.set(label, {statisDate: label})
+                rowMap.get(label)[alias] = normalizePointValue(point?.pointValue)
+            })
+        })
+        const data = []
+        byDevice.forEach((rowMap, deviceId) => {
+            const labels = buildSortedLabels(new Set(Array.from(rowMap.keys())), kind)
+            data.push({
+                deviceId,
+                dataList: labels.map(label => rowMap.get(label)),
+            })
+        })
+        return {data}
     })
 }
 
-//电池温度
+// 鐢垫睜娓╁害
 export function getClusterData({siteId, stackId, clusterId, dateTime, pageNum, pageSize}) {
-    return request({
+    const startDate = dateTime || normalizeDateInput('')
-        url: `/ems/statsReport/getClusterData?siteId=${siteId}&stackId=${stackId}&clusterId=${clusterId}&dateTime=${dateTime}&pageNum=${pageNum}&pageSize=${pageSize}`,
+    const endDate = dateTime || normalizeDateInput('')
-        method: 'get'
+    const kind = 'minute'
+    const aliasMap = {
+        maxTemp: 'maxTemp',
+        maxTempId: 'maxTempId',
+        minTemp: 'minTemp',
+        minTempId: 'minTempId',
+        maxVoltage: 'maxVoltage',
+        maxVoltageId: 'maxVoltageId',
+        minVoltage: 'minVoltage',
+        minVoltageId: 'minVoltageId',
+    }
+    const queryClusterCurves = (withClusterFilter) => queryMenuPointCurves({
+        siteId,
+        menuCode: 'TJBB_DCWD',
+        startDate,
+        endDate,
+        mappingFilter: withClusterFilter
+            ? (item) => {
+                if (!clusterId) return true
+                return String(item?.deviceId || '').trim() === String(clusterId || '').trim()
+            }
+            : undefined
+    })
+
+    return queryClusterCurves(true).then((records) => {
+        if (clusterId && (!records || records.length === 0)) {
+            return queryClusterCurves(false)
+        }
+        return records
+    }).then((records) => {
+        const rowMap = new Map()
+        records.forEach((record) => {
+            const alias = resolveAliasByField(aliasMap, record.fieldName)
+            if (!alias) return
+            ;(record.curve || []).forEach((point) => {
+                const time = point?.dataTime ? new Date(point.dataTime) : null
+                if (!time || isNaN(time.getTime())) return
+                const label = formatTimeLabelByKind(time, kind)
+                if (!rowMap.has(label)) rowMap.set(label, {statisDate: label})
+                rowMap.get(label)[alias] = normalizePointValue(point?.pointValue)
+            })
+        })
+        const labels = buildSortedLabels(new Set(Array.from(rowMap.keys())), kind)
+        const fullRows = labels.map(label => rowMap.get(label))
+        return {
+            rows: paginateRows(fullRows, pageNum, pageSize),
+            total: fullRows.length,
+        }
     })
 }
 
 
-// 实时运行
+// 瀹炴椂杩愯
-//储能
+//鍌ㄨ兘
 export function storagePower(siteId, startTime, endTime) {
     return request({
         url: `/ems/siteMonitor/runningGraph/storagePower?siteId=${siteId}&startDate=${startTime}&endDate=${endTime}`,
@@ -207,7 +656,7 @@ export function storagePower(siteId, startTime, endTime) {
     })
 }
 
-//poc温度
+//poc娓╁害
 export function pcsMaxTemp(siteId, startTime, endTime) {
     return request({
         url: `/ems/siteMonitor/runningGraph/pcsMaxTemp?siteId=${siteId}&startDate=${startTime}&endDate=${endTime}`,
@@ -215,7 +664,7 @@ export function pcsMaxTemp(siteId, startTime, endTime) {
     })
 }
 
-// 电池平均soc
+// 鐢垫睜骞冲潎soc
 export function batteryAveSoc(siteId, startTime, endTime) {
     return request({
         url: `/ems/siteMonitor/runningGraph/batteryAveSoc?siteId=${siteId}&startDate=${startTime}&endDate=${endTime}`,
@@ -223,7 +672,7 @@ export function batteryAveSoc(siteId, startTime, endTime) {
     })
 }
 
-// 电池平均温度
+// 鐢垫睜骞冲潎娓╁害
 export function batteryAveTemp(siteId, startTime, endTime) {
     return request({
         url: `/ems/siteMonitor/runningGraph/batteryAveTemp?siteId=${siteId}&startDate=${startTime}&endDate=${endTime}`,
@@ -231,15 +680,43 @@ export function batteryAveTemp(siteId, startTime, endTime) {
     })
 }
 
-// 功率曲线
+// 鍔熺巼鏇茬嚎
 export function getPowerData({siteId, startDate, endDate}) {
-    return request({
+    const kind = resolveRangeKind(startDate, endDate)
-        url: `/ems/statsReport/getPowerData?siteId=${siteId}&startDate=${startDate}&endDate=${endDate}`,
+    const aliasMap = {
-        method: 'get'
+        gridPower_stat: 'gridPower',
+        gridPower: 'gridPower',
+        loadPower_stat: 'loadPower',
+        loadPower: 'loadPower',
+        storagePower_stat: 'storagePower',
+        storagePower: 'storagePower',
+        pvPower_stat: 'pvPower',
+        pvPower: 'pvPower',
+    }
+    return queryMenuPointCurves({
+        siteId,
+        menuCode: 'TJBB_GLQX',
+        startDate,
+        endDate,
+    }).then((records) => {
+        const rowMap = new Map()
+        records.forEach((record) => {
+            const alias = resolveAliasByField(aliasMap, record.fieldName)
+            if (!alias) return
+            ;(record.curve || []).forEach((point) => {
+                const time = point?.dataTime ? new Date(point.dataTime) : null
+                if (!time || isNaN(time.getTime())) return
+                const label = formatTimeLabelByKind(time, kind)
+                if (!rowMap.has(label)) rowMap.set(label, {statisDate: label})
+                rowMap.get(label)[alias] = normalizePointValue(point?.pointValue)
+            })
+        })
+        const labels = buildSortedLabels(new Set(Array.from(rowMap.keys())), kind)
+        return {data: labels.map(label => rowMap.get(label))}
     })
 }
 
-//电表列表
+//鐢佃〃鍒楄〃
 export function getLoadNameList(siteId) {
     return request({
         url: `/ems/statsReport/getLoadNameList?siteId=${siteId}`,
@@ -247,15 +724,22 @@ export function getLoadNameList(siteId) {
     })
 }
 
-// 电表报表
+// 鐢佃〃鎶ヨ〃
 export function getAmmeterData({siteId, startTime, endTime, pageSize, pageNum}) {
     return request({
-        url: `/ems/statsReport/getAmmeterData?siteId=${siteId}&startTime=${startTime}&endTime=${endTime}&pageSize=${pageSize}&pageNum=${pageNum}`,
+        url: `/ems/statsReport/getAmmeterDataFromDaily`,
-        method: 'get'
+        method: 'get',
+        params: {
+            siteId,
+            startTime,
+            endTime,
+            pageSize,
+            pageNum,
+        }
     })
 }
 
-// 电价报表
+// 鐢典环鎶ヨ〃
 export function getAmmeterRevenueData(data) {
     return request({
         url: `/ems/statsReport/getAmmeterRevenueData`,
@@ -264,7 +748,23 @@ export function getAmmeterRevenueData(data) {
     })
 }
 
-//策略列表
+export function batchGetBizRemark(data) {
+    return request({
+        url: `/system/bizRemark/batchGet`,
+        method: 'post',
+        data
+    })
+}
+
+export function saveBizRemark(data) {
+    return request({
+        url: `/system/bizRemark/save`,
+        method: 'post',
+        data
+    })
+}
+
+//绛栫暐鍒楄〃
 export function strategyRunningList(siteId) {
     return request({
         url: `/system/strategyRunning/list?siteId=${siteId}`,
@@ -272,7 +772,7 @@ export function strategyRunningList(siteId) {
     })
 }
 
-//停止策略
+//鍋滄绛栫暐
 export function stopStrategyRunning(id) {
     return request({
         url: `/system/strategyRunning/stop?id=${id}`,
@@ -280,7 +780,7 @@ export function stopStrategyRunning(id) {
     })
 }
 
-// 获取所有主策略
+// 鑾峰彇鎵€鏈変富绛栫暐
 export function getMainStrategyList() {
     return request({
         url: `/system/strategyRunning/getMainStrategyList`,
@@ -288,7 +788,7 @@ export function getMainStrategyList() {
     })
 }
 
-//获取所有辅助策略
+//鑾峰彇鎵€鏈夎緟鍔╃瓥鐣?
 export function getAuxStrategyList() {
     return request({
         url: `/system/strategyRunning/getAuxStrategyList`,
@@ -296,7 +796,7 @@ export function getAuxStrategyList() {
     })
 }
 
-//配置策略
+//閰嶇疆绛栫暐
 export function configStrategy(data) {
     return request({
         url: `/system/strategyRunning/configStrategy`,
@@ -305,8 +805,25 @@ export function configStrategy(data) {
     })
 }
 
+// 鑾峰彇绛栫暐杩愯鍙傛暟閰嶇疆锛堟寜绔欑偣锛?
+export function getStrategyRuntimeConfig(siteId) {
+    return request({
+        url: `/system/strategyRuntimeConfig/getBySiteId?siteId=${siteId}`,
+        method: 'get'
+    })
+}
+
+// 淇濆瓨绛栫暐杩愯鍙傛暟閰嶇疆锛堟寜绔欑偣锛?
+export function saveStrategyRuntimeConfig(data) {
+    return request({
+        url: `/system/strategyRuntimeConfig/save`,
+        method: 'post',
+        data
+    })
+}
+
 //http://localhost:8089/strategy/temp/getTempNameList?strategyId=1&siteId=021_FXX_01
-//获取策略下的所有模板列表
+//鑾峰彇绛栫暐涓嬬殑鎵€鏈夋ā鏉垮垪琛?
 export function getTempNameList({siteId, strategyId}) {
     return request({
         url: `/strategy/temp/getTempNameList?siteId=${siteId}&strategyId=${strategyId}`,
@@ -314,7 +831,7 @@ export function getTempNameList({siteId, strategyId}) {
     })
 }
 
-//获取模板详情
+//鑾峰彇妯℃澘璇︽儏
 ///strategy/temp/list?templateId=1
 export function getStrategyTempDetail(templateId) {
     return request({
@@ -323,7 +840,7 @@ export function getStrategyTempDetail(templateId) {
     })
 }
 
-//新增模板
+//鏂板妯℃澘
 export function addStrategyTemp(data) {
     return request({
         url: `/strategy/temp`,
@@ -356,7 +873,7 @@ export function timeConfigList({siteId, strategyId}) {
     })
 }
 
-//保存时间配置
+//淇濆瓨鏃堕棿閰嶇疆
 // http://localhost:8089/strategy/timeConfig
 export function setTimeConfigList(data) {
     return request({
@@ -366,7 +883,7 @@ export function setTimeConfigList(data) {
     })
 }
 
-// 策略曲线图
+// 绛栫暐鏇茬嚎鍥?
 //http://localhost:8089/strategy/curve/curveList?strategyId=1&siteId=021_FXX_01
 export function curveList({siteId, strategyId}) {
     return request({
@@ -375,7 +892,7 @@ export function curveList({siteId, strategyId}) {
     })
 }
 
-//单站监控 首页 当日功率曲线
+//鍗曠珯鐩戞帶 棣栭〉 褰撴棩鍔熺巼鏇茬嚎
 export function getPointData({siteId, startDate, endDate}) {
     return request({
         url: `/ems/siteMonitor/getPointData?siteId=${siteId}&startDate=${startDate}&endDate=${endDate}`,

src/api/ems/search.js

@@ -29,4 +29,12 @@ export function getAllBatteryIdsBySites(data) {
     url: `/ems/generalQuery/getAllBatteryIdsBySites/${data}`,
     method: 'get',
   })
-}
+}
+
+// 综合查询-按站点获取配置设备列表
+export function getGeneralQueryDeviceList(siteId) {
+  return request({
+    url: `/ems/siteConfig/getDeviceList?siteId=${siteId}`,
+    method: 'get',
+  })
+}

src/api/ems/site.js

@@ -8,6 +8,33 @@ export function getSiteInfoList({siteName, startTime, endTime, pageSize, pageNum
     })
 }
 
+// 手动同步站点天气（收益报表）
+export function syncSiteWeatherByDateRange({siteId, startTime, endTime}) {
+    return request({
+        url: `/ems/statsReport/syncWeatherByDateRange`,
+        method: 'post',
+        params: {siteId, startTime, endTime}
+    })
+}
+
+// 新增站点
+export function addSite(data) {
+    return request({
+        url: `/ems/siteConfig/addSite`,
+        method: 'post',
+        data
+    })
+}
+
+// 编辑站点
+export function updateSite(data) {
+    return request({
+        url: `/ems/siteConfig/updateSite`,
+        method: 'post',
+        data
+    })
+}
+
 // 设备列表
 export function getDeviceInfoList(data) {
     return request({
@@ -102,6 +129,46 @@ export function getDeviceListBySiteAndCategory({siteId, deviceCategory}) {
     })
 }
 
+// 获取单站监控项目点位映射
+export function getSingleMonitorProjectPointMapping(siteId) {
+    return request({
+        url: `/ems/siteConfig/getSingleMonitorProjectPointMapping?siteId=${siteId}`,
+        method: 'get',
+    })
+}
+
+// 保存单站监控项目点位映射
+export function saveSingleMonitorProjectPointMapping(data) {
+    return request({
+        url: `/ems/siteConfig/saveSingleMonitorProjectPointMapping`,
+        method: 'post',
+        data,
+        headers: {
+            repeatSubmit: false
+        }
+    })
+}
+
+// 获取单站监控工作状态枚举映射（PCS）
+export function getSingleMonitorWorkStatusEnumMappings(siteId) {
+    return request({
+        url: `/ems/siteConfig/getSingleMonitorWorkStatusEnumMappings?siteId=${siteId}`,
+        method: 'get',
+    })
+}
+
+// 保存单站监控工作状态枚举映射（PCS）
+export function saveSingleMonitorWorkStatusEnumMappings(data) {
+    return request({
+        url: `/ems/siteConfig/saveSingleMonitorWorkStatusEnumMappings`,
+        method: 'post',
+        data,
+        headers: {
+            repeatSubmit: false
+        }
+    })
+}
+
 //新增设备保护
 export function addProtectPlan(data) {
     return request({
@@ -163,6 +230,256 @@ export function importPointList(data) {
     })
 }
 
+// 按站点导入模板点位配置
+export function importPointTemplateBySite(data) {
+    return request({
+        url: `/ems/pointConfig/importTemplateBySite`,
+        method: 'post',
+        data
+    })
+}
+
+// CSV导入点位配置
+export function importPointConfigCsv(data) {
+    return request({
+        url: `/ems/pointConfig/importCsv`,
+        method: 'post',
+        data,
+        headers: {
+            'Content-Type': 'multipart/form-data'
+        }
+    })
+}
+
+// 点位配置列表
+export function getPointMatchList(params) {
+    return request({
+        url: `/ems/pointConfig/list`,
+        method: 'get',
+        params
+    })
+}
+
+// 下载单体电池导入模板
+export function downloadSingleBatteryMonitorImportTemplate(siteId) {
+    return request({
+        url: `/ems/siteConfig/downloadSingleBatteryMonitorImportTemplate`,
+        method: 'get',
+        params: { siteId },
+        responseType: 'blob'
+    })
+}
+
+// 导入单体电池与监控点位映射
+export function importSingleBatteryMonitorMappings(data) {
+    return request({
+        url: `/ems/siteConfig/importSingleBatteryMonitorMappings`,
+        method: 'post',
+        data,
+        headers: {
+            'Content-Type': 'multipart/form-data'
+        }
+    })
+}
+
+// 点位配置详情
+export function getPointMatchDetail(id) {
+    return request({
+        url: `/ems/pointConfig/${id}`,
+        method: 'get',
+    })
+}
+
+// 新增点位配置
+export function addPointMatch(data) {
+    return request({
+        url: `/ems/pointConfig`,
+        method: 'post',
+        data
+    })
+}
+
+// 编辑点位配置
+export function updatePointMatch(data) {
+    return request({
+        url: `/ems/pointConfig`,
+        method: 'put',
+        data
+    })
+}
+
+// 删除点位配置
+export function deletePointMatch(ids) {
+    return request({
+        url: `/ems/pointConfig/${ids}`,
+        method: 'delete',
+    })
+}
+
+// 点位配置-批量获取最新值（新接口）
+export function getPointConfigLatestValues(data) {
+    return request({
+        url: `/ems/pointConfig/latestValues`,
+        method: 'post',
+        data,
+        headers: {
+            repeatSubmit: false
+        }
+    })
+}
+
+// 点位配置-曲线数据（新接口）
+export function getPointConfigCurve(data) {
+    return request({
+        url: `/ems/pointConfig/curve`,
+        method: 'post',
+        data,
+        headers: {
+            repeatSubmit: false
+        }
+    })
+}
+
+// 点位配置-生成最近7天数据
+export function generatePointConfigRecent7Days(data) {
+    return request({
+        url: `/ems/pointConfig/generateRecent7Days`,
+        method: 'post',
+        data,
+        headers: {
+            repeatSubmit: false
+        }
+    })
+}
+
+// 计算点配置列表
+export function getPointCalcConfigList(params) {
+    return request({
+        url: `/ems/pointCalcConfig/list`,
+        method: 'get',
+        params
+    })
+}
+
+// 计算点配置详情
+export function getPointCalcConfigDetail(id) {
+    return request({
+        url: `/ems/pointCalcConfig/${id}`,
+        method: 'get',
+    })
+}
+
+// 新增计算点配置
+export function addPointCalcConfig(data) {
+    return request({
+        url: `/ems/pointCalcConfig`,
+        method: 'post',
+        data
+    })
+}
+
+// 编辑计算点配置
+export function updatePointCalcConfig(data) {
+    return request({
+        url: `/ems/pointCalcConfig`,
+        method: 'put',
+        data
+    })
+}
+
+// 删除计算点配置
+export function deletePointCalcConfig(ids) {
+    return request({
+        url: `/ems/pointCalcConfig/${ids}`,
+        method: 'delete',
+    })
+}
+
+// 数据修正列表（ems_daily_energy_data）
+export function getDailyEnergyDataList(params) {
+    return request({
+        url: `/ems/dailyEnergyData/list`,
+        method: 'get',
+        params
+    })
+}
+
+// 数据修正详情
+export function getDailyEnergyDataDetail(id) {
+    return request({
+        url: `/ems/dailyEnergyData/${id}`,
+        method: 'get',
+    })
+}
+
+// 新增数据修正
+export function addDailyEnergyData(data) {
+    return request({
+        url: `/ems/dailyEnergyData`,
+        method: 'post',
+        data
+    })
+}
+
+// 编辑数据修正
+export function updateDailyEnergyData(data) {
+    return request({
+        url: `/ems/dailyEnergyData`,
+        method: 'put',
+        data
+    })
+}
+
+// 删除数据修正
+export function deleteDailyEnergyData(ids) {
+    return request({
+        url: `/ems/dailyEnergyData/${ids}`,
+        method: 'delete',
+    })
+}
+
+// 充放电修正列表（ems_daily_charge_data）
+export function getDailyChargeDataList(params) {
+    return request({
+        url: `/ems/dailyChargeData/list`,
+        method: 'get',
+        params
+    })
+}
+
+// 充放电修正详情
+export function getDailyChargeDataDetail(id) {
+    return request({
+        url: `/ems/dailyChargeData/${id}`,
+        method: 'get',
+    })
+}
+
+// 新增充放电修正
+export function addDailyChargeData(data) {
+    return request({
+        url: `/ems/dailyChargeData`,
+        method: 'post',
+        data
+    })
+}
+
+// 编辑充放电修正
+export function updateDailyChargeData(data) {
+    return request({
+        url: `/ems/dailyChargeData`,
+        method: 'put',
+        data
+    })
+}
+
+// 删除充放电修正
+export function deleteDailyChargeData(ids) {
+    return request({
+        url: `/ems/dailyChargeData/${ids}`,
+        method: 'delete',
+    })
+}
 
 //mqtt
 export function getMqttList({pageSize, pageNum, mqttTopic, topicName, siteId}) {
@@ -201,3 +518,11 @@ export function deleteMqtt(id) {
         method: 'delete',
     })
 }
+
+export function initializeSingleBatteryMonitorMappings(data) {
+    return request({
+        url: `/ems/siteConfig/initializeSingleBatteryMonitorMappings`,
+        method: 'post',
+        data
+    })
+}

src/assets/styles/common.scss

@@ -104,6 +104,10 @@
     .el-card__header {
       background-color: #b64040; //#fc6b69;
     }
+
+    .work-status {
+      color: #b64040 !important;;
+    }
   }
 
   //绿色背景颜色标题
@@ -111,6 +115,10 @@
     .el-card__header {
       background-color: #40b6a5; //#05aea3;
     }
+
+    .work-status {
+      color: #40b6a5 !important;
+    }
   }
 
   //灰色背景颜色标题
@@ -118,6 +126,10 @@
     .el-card__header {
       background-color: #666666;
     }
+
+    .work-status {
+      color: #666666 !important;;
+    }
   }
 }
 

src/components/BigDataPopup/index.vue

@@ -0,0 +1,137 @@
+<template>
+  <el-dialog
+    :fullscreen="true"
+    :append-to-body="true"
+    :visible.sync="show"
+    :show-close="false"
+    top="0"
+    custom-class="big-data-dialog"
+  >
+    <div class="swiper-container">
+      <div class="swiper-icon left-icon" v-show="imgIndex > 0">
+        <i class="el-icon-d-arrow-left icon" @click="toLeft"></i>
+      </div>
+      <div v-show="showRightIcon" class="swiper-icon right-icon">
+        <i class="el-icon-d-arrow-right icon" @click="toRight"></i>
+      </div>
+      <div
+        class="img-container"
+        :style="{ transform: 'translateX(' + imgIndex * -100 + 'vw)' }"
+      >
+        <img
+          v-for="index in maxImgNumber"
+          :key="'swiperImg' + index"
+          :src="require(`@/assets/images/ems/bigData-${index}.png`)"
+          alt=""
+        />
+      </div>
+    </div>
+    <div class="close-btn" @click="show = false">
+      <i class="el-icon-close"></i>
+    </div>
+  </el-dialog>
+</template>
+<style lang="scss" scoped>
+.close-btn {
+  position: absolute;
+  right: 10px;
+  top: 10px;
+  font-size: 23px;
+  line-height: 20px;
+  color: rgba(217, 242, 255, 1);
+  cursor: pointer;
+}
+.swiper-container {
+  height: 100%;
+  width: 100%;
+  overflow: hidden;
+  position: relative;
+  .swiper-icon {
+    color: rgba(217, 242, 255, 1);
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
+    z-index: 20;
+    cursor: pointer;
+    font-size: 30px;
+    padding: 20px;
+    background: transparent;
+    &.left-icon {
+      left: 20px;
+    }
+    &.right-icon {
+      right: 20px;
+    }
+    &:hover {
+      .icon {
+        opacity: 1;
+      }
+    }
+    .icon {
+      transition: all 0.6s;
+      opacity: 0;
+    }
+  }
+  .img-container {
+    height: 100%;
+    transition: all 1s;
+    display: flex;
+    flex-direction: row;
+    z-index: 0;
+    img {
+      width: 100vw;
+      height: 100vh;
+      display: block;
+      margin: 0;
+      flex-shrink: 0;
+    }
+  }
+}
+</style>
+<style lang="scss">
+.big-data-dialog {
+  .el-dialog__header {
+    display: none;
+  }
+
+  .el-dialog__body {
+    padding: 0;
+    margin: 0;
+    position: relative;
+  }
+}
+</style>
+<script>
+export default {
+  data() {
+    return {
+      show: false,
+      imgIndex: 0,
+      maxImgNumber: 3,
+    };
+  },
+  computed: {
+    showRightIcon() {
+      return this.imgIndex < this.maxImgNumber - 1;
+    },
+  },
+  watch: {
+    show: {
+      handler(newValue) {
+        if (!newValue) this.imgIndex = 0;
+      },
+      immediate: true,
+    },
+  },
+  methods: {
+    toLeft() {
+      if (this.imgIndex === 0) return;
+      this.imgIndex -= 1;
+    },
+    toRight() {
+      if (this.imgIndex >= this.maxImgNumber - 1) return;
+      this.imgIndex += 1;
+    },
+  },
+};
+</script>

src/components/Ems/DateRangeSelect/index.vue

@@ -1,36 +1,68 @@
 <template>
-    <div class="time-range">
+  <div class="time-range">
-        <el-date-picker
+    <el-date-picker
-            v-model="dateRange"
+        v-model="dateRange"
-            type="daterange"
+        :class="miniTimePicker ? 'mini-date-picker' : ''"
-            range-separator="至"
+        type="daterange"
-            start-placeholder="开始时间"
+        range-separator="至"
-            value-format="yyyy-MM-dd"
+        start-placeholder="开始时间"
-            :clearable="false"
+        value-format="yyyy-MM-dd"
-            :picker-options="pickerOptions"
+        :clearable="false"
-            end-placeholder="结束时间">
+        :picker-options="pickerOptions"
-            </el-date-picker>
+        end-placeholder="结束时间">
-            <el-button size="mini" style="margin-left: 10px;" :loading="loading" @click="reset">重置</el-button>
+    </el-date-picker>
-            <el-button type="primary" size="mini" :loading="loading" @click="search">搜索</el-button>
+    <template v-if="!showIcon">
-            <el-button type="primary" size="mini" :loading="loading" @click="timeLine('before')">上一时段</el-button>
+      <el-button size="mini" style="margin-left: 10px;" :loading="loading" @click="reset">重置</el-button>
-            <el-button type="primary" size="mini" :loading="loading" @click="timeLine('next')" :disabled="disabledNextBtn">下一时段</el-button>
+      <el-button type="primary" size="mini" :loading="loading" @click="search">搜索</el-button>
-        </div>
+      <el-button type="primary" size="mini" :loading="loading" @click="timeLine('before')">上一时段</el-button>
+      <el-button type="primary" size="mini" :loading="loading" @click="timeLine('next')" :disabled="disabledNextBtn">
+        下一时段
+      </el-button>
+    </template>
+    <template v-else>
+      <el-button class="btn-icon" icon="el-icon-refresh-right" circle size="mini" style="margin-left: 8px;"
+                 :loading="loading"
+                 @click="reset"></el-button>
+      <el-button class="btn-icon" type="primary" size="mini" icon="el-icon-search" circle :loading="loading"
+                 @click="search"></el-button>
+      <el-button class="btn-icon" type="primary" size="mini" icon="el-icon-d-arrow-left" circle :loading="loading"
+                 @click="timeLine('before')"></el-button>
+      <el-button class="btn-icon" type="primary" size="mini" icon="el-icon-d-arrow-right" circle :loading="loading"
+                 @click="timeLine('next')"
+                 :disabled="disabledNextBtn"></el-button>
+    </template>
+
+
+  </div>
 </template>
 
 <script>
 import {formatDate} from '@/filters/ems'
+
 export default {
-  computed:{
+  props: {
-    disabledNextBtn(){
+    showIcon: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    miniTimePicker: {
+      type: Boolean,
+      required: false,
+      default: false
+    }
+  },
+  computed: {
+    disabledNextBtn() {
       return new Date(this.dateRange[1]) >= new Date(this.defaultDateRange[1])
     }
   },
   data() {
     return {
-      loading:false,
+      loading: false,
-      dateRange:[],
+      dateRange: [],
-      defaultDateRange:[],
+      defaultDateRange: [],
-      pickerOptions:{
+      pickerOptions: {
         disabledDate(time) {
           return time.getTime() > Date.now();
         },
@@ -38,64 +70,81 @@ export default {
     }
   },
   methods: {
-    init(today=false){
+    init(today = false) {
-        const now = new Date(),formatNow = formatDate(now);
+      const now = new Date(), formatNow = formatDate(now);
-        const weekAgo = formatDate(today ? new Date(now.getTime()) : new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000))
+      const weekAgo = formatDate(today ? new Date(now.getTime()) : new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000))
-        this.dateRange = [weekAgo, formatNow];
+      this.dateRange = [weekAgo, formatNow];
-        this.defaultDateRange=[weekAgo, formatNow];
+      this.defaultDateRange = [weekAgo, formatNow];
-        this.$emit('updateDate',this.dateRange)
+      this.$emit('updateDate', this.dateRange)
     },
-    showBtnLoading(status){
+    showBtnLoading(status) {
-        this.loading = status
+      this.loading = status
     },
-    resetDate(){
+    resetDate() {
       this.dateRange = this.defaultDateRange
     },
     //重置 设置时间范围为初始化时间段
-    reset(){
+    reset() {
-        this.resetDate()
+      this.resetDate()
-        this.$emit('reset')
+      this.$emit('reset')
-        this.$emit('updateDate',this.dateRange)
+      this.$emit('updateDate', this.dateRange)
     },
     // 搜索
-    search(){
+    search() {
-      this.$emit('updateDate',this.dateRange)
+      this.$emit('updateDate', this.dateRange)
     },
-    timeLine(type){
+    timeLine(type) {
-      if(!this.dateRange || !this.dateRange[0] || !this.dateRange[1]) return
+      if (!this.dateRange || !this.dateRange[0] || !this.dateRange[1]) return
-      const nowStartTimes = new Date(this.dateRange[0]).getTime(),nowEndTimes = new Date(this.dateRange[1]).getTime(),maxTime = new Date(this.defaultDateRange[1]).getTime()
+      const nowStartTimes = new Date(this.dateRange[0]).getTime(), nowEndTimes = new Date(this.dateRange[1]).getTime(),
+          maxTime = new Date(this.defaultDateRange[1]).getTime()
       const nowDis = nowEndTimes - nowStartTimes//用户当前选择时间差 可能=0
       //baseTime,maxTime 毫秒数
-      const baseDis =  24 * 60 * 60 * 1000
+      const baseDis = 24 * 60 * 60 * 1000
       const calcDis = nowDis === 0 ? baseDis : nowDis
       let start = type === 'before' ? nowStartTimes - calcDis : nowStartTimes + calcDis
-      if(start>maxTime) start=maxTime
+      if (start > maxTime) start = maxTime
       let end = type === 'before' ? nowEndTimes - calcDis : nowEndTimes + calcDis
-      if(end>maxTime) end=maxTime
+      if (end > maxTime) end = maxTime
-      this.dateRange = [formatDate(start),formatDate(end)]
+      this.dateRange = [formatDate(start), formatDate(end)]
-      this.$emit('updateDate',this.dateRange)
+      this.$emit('updateDate', this.dateRange)
     },
   }
 }
 
 </script>
 <style lang="scss" scoped>
-.time-range{
+.time-range {
-    display: flex;
+  display: flex;
-    ::v-deep {
+
-        .el-range-editor--medium .el-range__icon, .el-range-editor--medium .el-range__close-icon{
+  ::v-deep {
-          line-height: 22px;
+
-        }
+    .el-range-editor--medium .el-range__icon, .el-range-editor--medium .el-range__close-icon {
-        .el-range-editor--medium.el-input__inner{
+      line-height: 22px;
-            height: 30px;
-        }
-        .el-range-editor--medium .el-range-separator{
-            line-height: 24px;
-        }
-        .el-button--mini{
-            padding:3px 10px;
-        }
     }
 
+    .el-range-editor--medium.el-input__inner {
+      height: 30px;
+    }
+
+    .el-range-editor--medium .el-range-separator {
+      line-height: 22px;
+    }
+
+    .el-button--mini {
+      padding: 3px 10px;
+    }
+
+    //  展示icon的小组件
+    .btn-icon.el-button--mini {
+      padding: 3px 8px;
+      margin-left: 6px;
+    }
+
+    //小宽度时间选择框
+    .mini-date-picker {
+      width: 250px !important;
+    }
+  }
+
 }
 </style>

src/components/Ems/SingleSquareBox/index.vue

@@ -2,7 +2,10 @@
 <template>
   <el-card shadow="always" class="single-square-box" :style="{background: 'linear-gradient(180deg, '+data.bgColor+' 0%,rgba(255,255,255,0) 100%)'}">
     <div class="single-square-box-title">{{ data.title }}</div>
-    <div class="single-square-box-value">{{ data.value | formatNumber }}</div>
+    <div class="single-square-box-value">
+      <i v-if="data.loading" class="el-icon-loading point-loading-icon"></i>
+      <span v-else>{{ data.value | formatNumber }}</span>
+    </div>
   </el-card>
 </template>
 
@@ -14,18 +17,29 @@
     color:#666666;
     text-align: left;
     .single-square-box-title{
-      font-size: 12px;
+      font-size: 10px;
-      line-height: 12px;
+      line-height: 10px;
-      padding-bottom: 12px;
+      padding-bottom: 8px;
     }
     .single-square-box-value{
-      font-size: 26px;
+      font-size: 18px;
-      line-height: 26px;
+      line-height: 18px;
       font-weight: 500;
     }
-    ::v-deep .el-card__body{
+    .point-loading-icon{
-      padding: 12px 10px;
+      color: #409eff;
+      display: inline-block;
+      transform-origin: center;
+      animation: pointLoadingSpinPulse 1.1s linear infinite;
     }
+    ::v-deep .el-card__body{
+      padding: 8px 7px;
+    }
+  }
+  @keyframes pointLoadingSpinPulse {
+    0% { opacity: 0.45; transform: rotate(0deg) scale(0.9); }
+    50% { opacity: 1; transform: rotate(180deg) scale(1.08); }
+    100% { opacity: 0.45; transform: rotate(360deg) scale(0.9); }
   }
 </style>
 <script>

src/components/Ems/ZdBaseInfo/index.vue

@@ -4,7 +4,10 @@
   <el-row type="flex" >
     <el-card shadow="hover" class="card common-card-container-body-no-padding" v-for="(item,index) in data" :key="index+'zdInfo'" :style="{borderBottomColor:item.color}">
       <div class="info">{{ item.title }}</div>
-      <div class="num">{{item.num | formatNumber}}</div>
+      <div class="num">
+        <i v-if="item.loading" class="el-icon-loading"></i>
+        <span v-else>{{item.num | formatNumber}}</span>
+      </div>
     </el-card>
   </el-row>
 </template>
@@ -18,30 +21,35 @@ export default {
         title:'站点总数（座）',
         num:'',
         color:'#FFBD00',
-        attr:'siteNum'
+        attr:'siteNum',
+        loading: true
       },{
         title:'装机功率（MW）',
         num:'',
         color:'#3C81FF',
-        attr:'installPower'
+        attr:'installPower',
+        loading: true
 
       },{
         title:'装机容量（MW）',
         num:'',
         color:'#5AC7C0',
-        attr:'installCapacity'
+        attr:'installCapacity',
+        loading: true
 
       },{
-        title:'总充电量（MWh）',
+        title:'总充电量（KWh）',
         num:'',
         color:'#A696FF',
-        attr:'totalChargedCap'
+        attr:'totalChargedCap',
+        loading: true
 
       },{
-        title:'总放电量（MWh）',
+        title:'总放电量（KWh）',
         num:'',
         color:'#A696FF',
-        attr:'totalDischargedCap'
+        attr:'totalDischargedCap',
+        loading: true
 
       }]
     }
@@ -50,6 +58,7 @@ export default {
     setData(res = {}){
       this.data.forEach((item)=>{
         item.num =res[item.attr]
+        item.loading = false
       })
     }
   },

src/components/Ems/ZdSelect/index.vue

@@ -2,8 +2,16 @@
 <template>
   <div class="zd-select-container">
     <el-form :inline="true">
-      <el-form-item label="站点选择">
+      <el-form-item :label="showLabel ? '站点选择' : ''" :class="{'no-label': !showLabel}">
-        <el-select v-model="id" placeholder="请选择换电站名称" :loading="loading" loading-text="正在加载数据" @change="onSubmit">
+        <el-select
+          v-model="id"
+          :size="size"
+          :placeholder="placeholder"
+          :loading="loading"
+          loading-text="正在加载数据"
+          :style="{width: selectWidth}"
+          @change="onSubmit"
+        >
           <el-option :label="item.siteName" :value="item.siteId" v-for="(item,index) in siteList" :key="index+'zdxeSelect'"></el-option>
         </el-select>
       </el-form-item>
@@ -15,7 +23,21 @@
 </template>
 
 <style scoped lang="scss">
-
+.zd-select-container {
+  .el-form {
+    display: inline-flex;
+    align-items: center;
+  }
+  .el-form-item {
+    margin-bottom: 0;
+  }
+  .no-label ::v-deep .el-form-item__label {
+    display: none;
+  }
+  .no-label ::v-deep .el-form-item__content {
+    margin-left: 0 !important;
+  }
+}
 </style>
 <script>
 import {getAllSites} from '@/api/ems/zddt'
@@ -31,6 +53,26 @@ import {mapGetters} from "vuex"
         type:String,
         default:'',
         required:false
+      },
+      showLabel: {
+        type: Boolean,
+        default: true,
+        required: false
+      },
+      size: {
+        type: String,
+        default: 'medium',
+        required: false
+      },
+      placeholder: {
+        type: String,
+        default: '请选择换电站名称',
+        required: false
+      },
+      selectWidth: {
+        type: String,
+        default: '220px',
+        required: false
       }
     },
     data() {
@@ -44,10 +86,23 @@ import {mapGetters} from "vuex"
     computed:{
       ...mapGetters(["zdList"]),
     },
+    watch: {
+      defaultSiteId(newVal) {
+        if (!newVal || !this.siteList || this.siteList.length === 0) {
+          return
+        }
+        if (this.siteList.find(item => item.siteId === newVal) && this.id !== newVal) {
+          this.id = newVal
+        }
+      }
+    },
     methods:{
       onSubmit(){
         this.$emit('submitSite',this.id)
       },
+      emitSitesLoaded() {
+        this.$emit('sitesLoaded', this.siteList || [])
+      },
       setDefaultSite(){
         const defaultSite = this.defaultSiteId
         if(defaultSite && this.siteList.find(item=>item.siteId === defaultSite)){
@@ -60,7 +115,7 @@ import {mapGetters} from "vuex"
       getList(){
        return getAllSites().then(response => {
           this.siteList = response.data || []
-          console.log("获取站点列表返回数据",response,this.siteList)
+          this.emitSitesLoaded()
           this.setDefaultSite()
         }).finally(() => {this.loading=false;this.searchLoading=false})
       }
@@ -71,15 +126,14 @@ import {mapGetters} from "vuex"
       this.$nextTick(()=>{
         if(this.getListByStore){
           if(this.zdList.length === 0){
-            this.getList().then(()=>{
+              this.getList().then(()=>{
-              this.$store.commit('SET_ZD_LIST', this.siteList)
+                this.$store.commit('SET_ZD_LIST', this.siteList)
-              console.log("从store中获取站点列表数据,但是store中的zdList=[]，所以从接口获取数据",this.zdList,this.siteList)
             })
           }else{
             this.siteList = this.zdList
+            this.emitSitesLoaded()
             this.loading=false
             this.searchLoading=false
-            console.log("从store中获取站点列表数据",this.zdList,this.siteList)
             this.setDefaultSite()
           }
         }else{

src/layout/components/Navbar.vue

@@ -1,22 +1,37 @@
 <template>
   <div class="navbar">
-    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
+               @toggleClick="toggleSideBar"/>
 
-    <breadcrumb v-if="!topNav" id="breadcrumb-container" class="breadcrumb-container" />
+    <breadcrumb v-if="!topNav" id="breadcrumb-container" class="breadcrumb-container"/>
-    <top-nav v-if="topNav" id="topmenu-container" class="topmenu-container" />
+    <top-nav v-if="topNav" id="topmenu-container" class="topmenu-container"/>
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
-        <search id="header-search" class="right-menu-item" />
+        <div class="big-data-container">
+          <i class="el-icon-s-marketing big-data-icon" @click.stop="showBigDataImg"></i>
+        </div>
+
+        <search id="header-search" class="right-menu-item"/>
 
 
-        <screenfull id="screenfull" class="right-menu-item hover-effect" />
+        <screenfull id="screenfull" class="right-menu-item hover-effect"/>
 
         <el-tooltip content="布局大小" effect="dark" placement="bottom">
-          <size-select id="size-select" class="right-menu-item hover-effect" />
+          <size-select id="size-select" class="right-menu-item hover-effect"/>
         </el-tooltip>
 
       </template>
+      <div v-if="device!=='mobile'" class="site-select-wrap">
+        <zd-select
+          :get-list-by-store="true"
+          :show-label="false"
+          size="mini"
+          select-width="220px"
+          :default-site-id="$route.query.siteId"
+          @submitSite="onSiteChange"
+        />
+      </div>
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover">
         <div class="avatar-wrapper">
@@ -32,22 +47,24 @@
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
-
       <div class="right-menu-item hover-effect setting" @click="setLayout" v-if="setting">
-        <svg-icon icon-class="more-up" />
+        <svg-icon icon-class="more-up"/>
       </div>
     </div>
+    <BigDataPopup ref="bigDataPopup"/>
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import {mapGetters} from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
 import TopNav from '@/components/TopNav'
 import Hamburger from '@/components/Hamburger'
 import Screenfull from '@/components/Screenfull'
 import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
+import BigDataPopup from '@/components/BigDataPopup'
+import ZdSelect from '@/components/Ems/ZdSelect/index.vue'
 
 export default {
   emits: ['setLayout'],
@@ -57,7 +74,9 @@ export default {
     Hamburger,
     Screenfull,
     SizeSelect,
-    Search
+    Search,
+    BigDataPopup,
+    ZdSelect
   },
   computed: {
     ...mapGetters([
@@ -78,6 +97,28 @@ export default {
     }
   },
   methods: {
+    onSiteChange(id) {
+      if (!id) {
+        return
+      }
+      const currentSite = (this.$store.getters.zdList || []).find(item => item.siteId === id)
+      const siteName = currentSite && currentSite.siteName ? currentSite.siteName : ''
+      localStorage.setItem('global_site_id', id)
+      if (id !== this.$route.query.siteId || siteName !== (this.$route.query.siteName || '')) {
+        this.$router.push({
+          path: this.$route.path,
+          query: {
+            ...this.$route.query,
+            siteId: id,
+            siteName
+          }
+        })
+      }
+      this.$store.dispatch('getSiteAlarmNum', id)
+    },
+    showBigDataImg() {
+      this.$refs.bigDataPopup.show = true
+    },
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
     },
@@ -93,7 +134,8 @@ export default {
         this.$store.dispatch('LogOut').then(() => {
           location.href = '/index'
         })
-      }).catch(() => {})
+      }).catch(() => {
+      })
     }
   }
 }
@@ -105,7 +147,7 @@ export default {
   overflow: hidden;
   position: relative;
   background: #fff;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+  box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
 
   .hamburger-container {
     line-height: 46px;
@@ -113,7 +155,7 @@ export default {
     float: left;
     cursor: pointer;
     transition: background .3s;
-    -webkit-tap-highlight-color:transparent;
+    -webkit-tap-highlight-color: transparent;
 
     &:hover {
       background: rgba(0, 0, 0, .025)
@@ -139,6 +181,33 @@ export default {
     height: 100%;
     line-height: 50px;
 
+    .site-select-wrap {
+      display: inline-flex;
+      align-items: center;
+      height: 100%;
+      padding: 0 10px 0 14px;
+      vertical-align: top;
+
+      ::v-deep .el-form-item__content {
+        line-height: 1;
+      }
+
+      ::v-deep .el-input__inner {
+        border-radius: 16px;
+      }
+    }
+
+    .big-data-container {
+      display: inline-block;
+      padding: 0 8px;
+      height: 100%;
+      font-size: 24px;
+      color: #5a5e66;
+      vertical-align: text-bottom;
+      cursor: pointer;
+    }
+
+
     &:focus {
       outline: none;
     }
@@ -177,7 +246,7 @@ export default {
           border-radius: 50%;
         }
 
-        .user-nickname{
+        .user-nickname {
           position: relative;
           bottom: 10px;
           font-size: 14px;
@@ -193,6 +262,7 @@ export default {
         }
       }
     }
+
   }
 }
 </style>

src/permission.js

@@ -10,11 +10,16 @@ import { isRelogin } from '@/utils/request'
 NProgress.configure({ showSpinner: false })
 
 const whiteList = ['/login', '/register']
+const GLOBAL_SITE_STORAGE_KEY = 'global_site_id'
 
 const isWhiteList = (path) => {
   return whiteList.some(pattern => isPathMatch(pattern, path))
 }
 
+const shouldAppendSiteId = (path) => {
+  return !['/login', '/register', '/404', '/401'].includes(path) && !path.startsWith('/redirect')
+}
+
 router.beforeEach((to, from, next) => {
   NProgress.start()
   if (getToken()) {
@@ -26,6 +31,24 @@ router.beforeEach((to, from, next) => {
     } else if (isWhiteList(to.path)) {
       next()
     } else {
+      const routeSiteId = to.query?.siteId
+      if (routeSiteId) {
+        localStorage.setItem(GLOBAL_SITE_STORAGE_KEY, routeSiteId)
+      } else {
+        const globalSiteId = localStorage.getItem(GLOBAL_SITE_STORAGE_KEY)
+        if (globalSiteId && shouldAppendSiteId(to.path)) {
+          next({
+            path: to.path,
+            query: {
+              ...to.query,
+              siteId: globalSiteId
+            },
+            hash: to.hash,
+            replace: true
+          })
+          return
+        }
+      }
       if (store.getters.roles.length === 0) {
         isRelogin.show = true
         // 判断当前用户是否已拉取完user_info信息

src/router/ems.js

@@ -9,13 +9,13 @@ export const dzjk = [
         redirect: '/dzjk/home',
         meta: {title: '单站监控', icon: 'dashboard',},
         alwaysShow: false,
-        name: 'Dzjk',
+        name: 'DzjkLocal',
         hidden: true,
         children: [
             {
                 path: '',
                 component: () => import('@/views/ems/dzjk/index'),
-                name: 'Dzjk',
+                name: 'DzjkRoot',
                 redirect: '/dzjk/home',
                 hidden: true,
                 children: [
@@ -193,7 +193,7 @@ export const dzjk = [
                                 component: () => import('@/views/ems/dzjk/tjbb/gltj/index.vue'),
                                 name: 'DzjkTjbbGltj',
                                 meta: {
-                                    title: '概率统计',
+                                    title: '运行统计',
                                     breadcrumb: false,
                                     activeMenu: '/dzjk',
                                     activeSecondMenuName: 'DzjkTjbb'
@@ -285,6 +285,28 @@ export const dzjk = [
                                     activeSecondMenuName: 'DzjkClpz'
                                 },
                             },
+                            {
+                                path: 'runtimeParam',
+                                component: () => import('@/views/ems/dzjk/clpz/runtimeParam/index.vue'),
+                                name: 'DzjkClpzRuntimeParam',
+                                meta: {
+                                    title: '运行参数',
+                                    breadcrumb: false,
+                                    activeMenu: '/dzjk',
+                                    activeSecondMenuName: 'DzjkClpz'
+                                },
+                            },
+                            {
+                                path: 'sbbh',
+                                component: () => import('@/views/ems/site/sbbh/index.vue'),
+                                name: 'DzjkClpzSbbh',
+                                meta: {
+                                    title: '设备保护',
+                                    breadcrumb: false,
+                                    activeMenu: '/dzjk',
+                                    activeSecondMenuName: 'DzjkClpz'
+                                },
+                            },
                             // {
                             //   path: 'xftg',
                             //   component: () => import('@/views/ems/dzjk/clpz/xftg/index.vue'),
@@ -300,6 +322,3 @@ export const dzjk = [
         ]
     }
 ]
-
-
-

src/router/index.js

@@ -89,6 +89,19 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/ems/site/zdlb',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'monitor-point-mapping',
+        component: () => import('@/views/ems/site/zdlb/MonitorPointMapping.vue'),
+        name: 'MonitorPointMapping',
+        meta: { title: '单站监控项目点位配置', activeMenu: '/dzjk/clpz/sbbh' }
+      }
+    ]
+  },
   // EMS管理系统routers
   ...dzjk
 ]

src/store/modules/ems.js

@@ -5,8 +5,18 @@ const ems = {
         dzjkAlarmLighting: false,//单站监控 告警统计红点标志
         zdList: [],
         zdDeviceCategoryOptions: {},//站点各个站点包含的设备种类 {021_DDS_01:["BATTERY","CLUSTER","STACK", "DH", "AMMETER", "PCS", "XF"],021_DDS_02:[]...}
-        workStatusOptions: {'0': '正常', '1': '异常', '2': '停止'},//工作状态
+        CLUSTERWorkStatusOptions: {'0': '静置', '1': '充电', '2': '放电', '3': '待机', '5': '运行', '9': "故障"},//电池簇工作状态
-        deviceStatusOptions: {'0': '离线', '1': '待机', '2': '运行', '3': '故障', '4': '停机'},//设备状态
+        PCSWorkStatusOptions: {'0': '运行', '1': '停机', '2': '故障', '3': '待机', '4': '充电', '5': '放电'},//PCS工作状态
+        STACKWorkStatusOptions: {
+            "0": "静置",
+            "1": "充电",
+            "2": "放电",
+            "3": "浮充",
+            '4': '待机',
+            '5': '运行',
+            '9': "故障"
+        },//STACKBMS总览工作状态
+        deviceStatusOptions: {'0': '离线', '1': '在线'},//设备状态
         gridStatusOptions: {'0': '并网', '1': '未并网'},//并网状态
         controlModeOptions: {'0': '远程', '1': '本地'},//控制模式
         warnOptions: {0: '正常', 1: '中断', 2: '不在线', 3: '异常'},//告警状态
@@ -17,7 +27,7 @@ const ems = {
         deviceTypeOptions: {'TCP': 'TCP', 'RTU': 'RTU'},//设备类型
         ticketStatusOptions: {1: '待处理', 2: '处理中', 3: '已处理'},//工单处理状态
         strategyStatusOptions: {'0': '未启用', '1': '已运行', '2': '已暂停', '3': '禁用', '4': '删除'},//策略状态
-        chargeStatusOptions: {'1': '充电', '2': '待机'},//冲放状态
+        chargeStatusOptions: {'1': '充电', '2': '待机', '3': '放电'},//冲放状态
         comparisonOperatorOptions: {'>': '>', '<': '<', '=': '=', '>=': '>=', '<=': '<='},
         relationWithPoint: {'||': '||', '&&': '&&'}
     },

src/store/modules/permission.js

@@ -47,9 +47,12 @@ const permission = {
           const asyncRoutes = filterDynamicRoutes(dynamicRoutes)
           rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
           router.addRoutes(asyncRoutes)
-          if(!hasDzjk){
+          // 后端已下发 dzjk 菜单时，移除本地静态 dzjk 路由，避免重名/重复注册
+          if (hasDzjk) {
             const index = constantRoutes.findIndex(i=>i.path.indexOf('dzjk')>-1)
-            constantRoutes.splice(index,1)
+            if (index > -1) {
+              constantRoutes.splice(index, 1)
+            }
           }
           commit('SET_ROUTES', rewriteRoutes)
           commit('SET_SIDEBAR_ROUTERS', constantRoutes.concat(sidebarRoutes))
@@ -121,11 +124,16 @@ export function filterDynamicRoutes(routes) {
 }
 
 export const loadView = (view) => {
+  const normalizedView = String(view || '')
+    .replace(/^\.\/+/, '')
+    .replace(/^\/+/, '')
+    .replace(/^@\/views\//, '')
+
   if (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'staging') {
-    return (resolve) => require([`@/views/${view}`], resolve)
+    return (resolve) => require([`@/views/${normalizedView}`], resolve)
   } else {
     // 使用 import 实现生产环境的路由懒加载
-    return () => import(`@/views/${view}`)
+    return () => import(`@/views/${normalizedView}`)
   }
 }
 

src/views/ems/dzjk/clpz/index.vue

@@ -50,4 +50,3 @@ export default {
   flex: 1;
 }
 </style>
-

src/views/ems/dzjk/clpz/runtimeParam/index.vue

@@ -0,0 +1,248 @@
+<template>
+  <div class="ems-dashboard-editor-container" v-loading="loading">
+    <el-card shadow="never" class="common-card-container">
+      <div slot="header" class="clearfix">
+        <span class="card-title">运行参数配置</span>
+        <span class="site-tag">站点：{{ siteId || '-' }}</span>
+      </div>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+        <el-row :gutter="20" class="runtime-grid">
+          <el-col :xs="24" :sm="24" :md="8">
+            <div class="group-card">
+              <div class="group-title">SOC上下限</div>
+              <el-form-item label="SOC下限(%)" prop="socDown">
+                <el-input-number v-model="form.socDown" :min="0" :max="100" :step="1" :precision="2" :controls="false" style="width: 160px;" />
+              </el-form-item>
+              <el-form-item label="SOC上限(%)" prop="socUp">
+                <el-input-number v-model="form.socUp" :min="0" :max="100" :step="1" :precision="2" :controls="false" style="width: 160px;" />
+              </el-form-item>
+            </div>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="8">
+            <div class="group-card">
+              <div class="group-title">防逆流参数</div>
+              <el-form-item label="防逆流阈值(kW)" prop="antiReverseThreshold">
+                <el-input-number v-model="form.antiReverseThreshold" :min="0" :step="1" :precision="2" :controls="false" style="width: 160px;" />
+              </el-form-item>
+              <el-form-item label="阈值上浮比例(%)" prop="antiReverseRangePercent">
+                <el-input-number v-model="form.antiReverseRangePercent" :min="0" :step="1" :precision="2" :controls="false" style="width: 160px;" />
+              </el-form-item>
+              <el-form-item label="恢复上限(kW)" prop="antiReverseUp">
+                <el-input-number v-model="form.antiReverseUp" :min="0" :step="1" :precision="2" :controls="false" style="width: 160px;" />
+              </el-form-item>
+              <el-form-item label="降功率比例(%)" prop="antiReversePowerDownPercent">
+                <el-input-number v-model="form.antiReversePowerDownPercent" :min="0" :max="100" :step="1" :precision="2" :controls="false" style="width: 160px;" />
+              </el-form-item>
+              <el-form-item label="硬停阈值(kW)" prop="antiReverseHardStopThreshold">
+                <el-input-number v-model="form.antiReverseHardStopThreshold" :min="0" :step="1" :precision="2" :controls="false" style="width: 160px;" />
+              </el-form-item>
+            </div>
+          </el-col>
+          <el-col :xs="24" :sm="24" :md="8">
+            <div class="group-card">
+              <div class="group-title">功率与保护</div>
+              <el-form-item label="设定功率倍率" prop="powerSetMultiplier">
+                <el-input-number v-model="form.powerSetMultiplier" :min="0.0001" :step="0.1" :precision="4" :controls="false" style="width: 160px;" />
+              </el-form-item>
+              <el-form-item label="保护介入" prop="protectInterveneEnable">
+                <el-switch v-model="form.protectInterveneEnable" :active-value="1" :inactive-value="0" />
+              </el-form-item>
+              <el-form-item label="一级降额比例(%)" prop="protectL1DeratePercent">
+                <el-input-number v-model="form.protectL1DeratePercent" :min="0" :max="100" :step="1" :precision="2" :controls="false" style="width: 160px;" />
+              </el-form-item>
+              <el-form-item label="释放稳定时长(s)" prop="protectRecoveryStableSeconds">
+                <el-input-number v-model="form.protectRecoveryStableSeconds" :min="0" :max="3600" :step="1" :precision="0" :controls="false" style="width: 160px;" />
+              </el-form-item>
+              <el-form-item label="三级锁存" prop="protectL3LatchEnable">
+                <el-switch v-model="form.protectL3LatchEnable" :active-value="1" :inactive-value="0" />
+              </el-form-item>
+              <el-form-item label="冲突策略" prop="protectConflictPolicy">
+                <el-select v-model="form.protectConflictPolicy" style="width: 160px;">
+                  <el-option label="最高等级优先" value="MAX_LEVEL_WIN" />
+                </el-select>
+              </el-form-item>
+            </div>
+          </el-col>
+        </el-row>
+        <div class="action-row">
+          <el-button type="primary" :loading="saveLoading" @click="handleSave">保存</el-button>
+          <el-button @click="init">重置</el-button>
+        </div>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import getQuerySiteId from '@/mixins/ems/getQuerySiteId'
+import { getStrategyRuntimeConfig, saveStrategyRuntimeConfig } from '@/api/ems/dzjk'
+
+const emptyForm = () => ({
+  siteId: '',
+  socDown: 0,
+  socUp: 100,
+  antiReverseThreshold: 30,
+  powerSetMultiplier: 10,
+  antiReverseRangePercent: 20,
+  antiReverseUp: 100,
+  antiReversePowerDownPercent: 10,
+  antiReverseHardStopThreshold: 20,
+  protectInterveneEnable: 1,
+  protectL1DeratePercent: 50,
+  protectRecoveryStableSeconds: 5,
+  protectL3LatchEnable: 1,
+  protectConflictPolicy: 'MAX_LEVEL_WIN'
+})
+
+export default {
+  name: 'DzjkClpzRuntimeParam',
+  mixins: [getQuerySiteId],
+  data() {
+    return {
+      loading: false,
+      saveLoading: false,
+      form: emptyForm(),
+      rules: {
+        socDown: [
+          { required: true, message: '请输入SOC下限', trigger: 'change' }
+        ],
+        socUp: [
+          { required: true, message: '请输入SOC上限', trigger: 'change' }
+        ],
+        antiReverseThreshold: [
+          { required: true, message: '请输入防逆流阈值', trigger: 'change' }
+        ],
+        powerSetMultiplier: [
+          { required: true, message: '请输入设定功率倍率', trigger: 'change' }
+        ],
+        antiReverseRangePercent: [
+          { required: true, message: '请输入防逆流阈值上浮比例', trigger: 'change' }
+        ],
+        antiReverseUp: [
+          { required: true, message: '请输入防逆流恢复上限', trigger: 'change' }
+        ],
+        antiReversePowerDownPercent: [
+          { required: true, message: '请输入防逆流降功率比例', trigger: 'change' }
+        ],
+        antiReverseHardStopThreshold: [
+          { required: true, message: '请输入防逆流硬停阈值', trigger: 'change' }
+        ],
+        protectInterveneEnable: [
+          { required: true, message: '请选择是否启用保护介入', trigger: 'change' }
+        ],
+        protectL1DeratePercent: [
+          { required: true, message: '请输入一级降额比例', trigger: 'change' }
+        ],
+        protectRecoveryStableSeconds: [
+          { required: true, message: '请输入释放稳定时长', trigger: 'change' }
+        ],
+        protectL3LatchEnable: [
+          { required: true, message: '请选择三级锁存开关', trigger: 'change' }
+        ],
+        protectConflictPolicy: [
+          { required: true, message: '请选择冲突策略', trigger: 'change' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init() {
+      if (!this.siteId) {
+        this.form = emptyForm()
+        return
+      }
+      this.loading = true
+      getStrategyRuntimeConfig(this.siteId).then(response => {
+        const data = response?.data || {}
+        this.form = {
+          ...emptyForm(),
+          ...data,
+          siteId: this.siteId
+        }
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    handleSave() {
+      if (!this.siteId) {
+        this.$message.error('缺少站点ID')
+        return
+      }
+      this.$refs.form.validate(valid => {
+        if (!valid) return
+        if (Number(this.form.socDown) > Number(this.form.socUp)) {
+          this.$message.error('SOC下限不能大于SOC上限')
+          return
+        }
+        if (Number(this.form.powerSetMultiplier) <= 0) {
+          this.$message.error('设定功率倍率必须大于0')
+          return
+        }
+        if (Number(this.form.protectL1DeratePercent) < 0 || Number(this.form.protectL1DeratePercent) > 100) {
+          this.$message.error('一级降额比例必须在0~100之间')
+          return
+        }
+        if (Number(this.form.protectRecoveryStableSeconds) < 0) {
+          this.$message.error('释放稳定时长不能小于0')
+          return
+        }
+        this.saveLoading = true
+        saveStrategyRuntimeConfig({ ...this.form, siteId: this.siteId }).then(response => {
+          if (response?.code === 200) {
+            this.$message.success('保存成功')
+            this.init()
+          }
+        }).finally(() => {
+          this.saveLoading = false
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.site-tag {
+  float: right;
+  color: #909399;
+  font-size: 13px;
+}
+
+.common-card-container {
+  border: none;
+  box-shadow: none !important;
+}
+
+.runtime-grid {
+  max-width: 1180px;
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.runtime-grid > .el-col {
+  display: flex;
+}
+
+.group-card {
+  border: none;
+  border-radius: 4px;
+  padding: 14px 14px 2px;
+  min-height: 330px;
+  width: 100%;
+  height: 100%;
+  margin-bottom: 12px;
+}
+
+.group-title {
+  font-size: 14px;
+  font-weight: 600;
+  color: #303133;
+  margin-bottom: 14px;
+}
+
+.action-row {
+  display: flex;
+  justify-content: center;
+  margin-top: 24px;
+}
+</style>

src/views/ems/dzjk/clpz/xftg/AddTemplate.vue

@@ -1,124 +1,221 @@
 <template>
-    <el-dialog :visible.sync="dialogTableVisible" class="ems-dialog" :title="mode === 'add'?'新增模板':`编辑模板` ">
+  <el-dialog :visible.sync="dialogTableVisible" class="ems-dialog add-template-dialog"
-      <el-form ref="addTempForm" :model="formData" :rules="rules" size="medium" label-width="100px">
+             :title="mode === 'add'?'新增模板':`编辑模板` ">
-        <el-form-item label="模板名称" prop="templateName">
+    <el-form ref="addTempForm" :model="formData" :rules="rules" size="medium" label-width="100px">
-          <el-input v-model="formData.templateName" placeholder="请输入" clearable :style="{width: '100%'}">
+      <el-form-item label="模板名称" prop="templateName">
-          </el-input>
+        <el-input v-model="formData.templateName" placeholder="请输入" clearable :style="{width: '100%'}">
-        </el-form-item>
+        </el-input>
-        <el-form-item label="soc限制" prop="sdcLimit" required>
+      </el-form-item>
-          <el-switch :active-value="1" :inactive-value="0" v-model="formData.sdcLimit"></el-switch>
+      <el-form-item label="soc限制" prop="sdcLimit" required>
-        </el-form-item>
+        <el-switch :active-value="1" :inactive-value="0" v-model="formData.sdcLimit"></el-switch>
-<!--        <template v-if="formData.sdcLimit === 1">-->
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" size="mini" @click="addTime">新增</el-button>
+    <!--      新增时间段表单-->
+    <el-collapse-transition>
+      <el-card v-show="showAddTime" shadow="always" class="common-card-container" style="margin-top:25px;">
+        <el-form class="add-time-form transition-box" ref="addTimeForm" :model="formInline" :rules="formInlineRule"
+                 label-width="100px" style="margin-top:25px">
+          <!--          <el-form-item label="开始时间" prop="startTime">-->
+          <!--            <el-time-select-->
+          <!--                placeholder="开始时间"-->
+          <!--                v-model="formInline.startTime"-->
+          <!--                :picker-options="{-->
+          <!--                start: '00:00',-->
+          <!--                step: '00:01',-->
+          <!--                end: '23:00',-->
+          <!--              }">-->
+          <!--            </el-time-select>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="结束时间" prop="endTime">-->
+          <!--            <el-time-select-->
+          <!--                placeholder="结束时间"-->
+          <!--                v-model="formInline.endTime"-->
+          <!--                :picker-options="{-->
+          <!--                start: '00:00',-->
+          <!--                step: '00:01',-->
+          <!--                end: '23:00',-->
+          <!--                minTime: formInline.startTime-->
+          <!--              }">-->
+          <!--            </el-time-select>-->
+          <!--          </el-form-item>-->
+          <el-form-item label="时间范围" prop="timeRange">
+            <el-time-picker
+                is-range
+                v-model="formInline.timeRange"
+                range-separator="至"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                placeholder="选择时间范围"
+                format="HH:mm"
+                value-format="HH:mm"
+                :style="{width: '100%'}">
+            </el-time-picker>
+          </el-form-item>
+          <el-form-item label="冲放功率" prop="chargeDischargePower">
+            <el-input v-model="formInline.chargeDischargePower" placeholder="请输入"
+                      :style="{width: '100%'}"></el-input>
+          </el-form-item>
           <el-form-item label="soc下限" prop="sdcDown">
-            <el-input v-model="formData.sdcDown" placeholder="请输入" clearable :style="{width: '100%'}"></el-input>
+            <el-input v-model="formInline.sdcDown" placeholder="请输入" clearable :style="{width: '100%'}"></el-input>
           </el-form-item>
           <el-form-item label="soc上限" prop="sdcUp">
-            <el-input v-model="formData.sdcUp" placeholder="请输入" clearable :style="{width: '100%'}"></el-input>
+            <el-input v-model="formInline.sdcUp" placeholder="请输入" clearable :style="{width: '100%'}"></el-input>
           </el-form-item>
-<!--        </template>-->
+          <el-form-item label="充电状态" prop="chargeStatus">
-      </el-form>
+            <el-select v-model="formInline.chargeStatus" placeholder="请选择" :style="{width: '100%'}">
-      <el-button type="primary" size="mini" @click="addTime">新增</el-button>
+              <el-option v-for="(value,key) in chargeStatusOptions" :key="key+'chargeStatusOptions'" :label="value"
-<!--      新增时间段表单-->
+                         :value="key"></el-option>
-      <el-collapse-transition>
+            </el-select>
-          <el-card v-show="showAddTime" shadow="always" class="common-card-container" style="margin-top:25px;">
+          </el-form-item>
-            <el-form class="add-time-form transition-box" ref="addTimeForm" :model="formInline" :rules="formInlineRule" label-width="100px" style="margin-top:25px">
+          <el-form-item>
-            <el-form-item label="开始时间" prop="startTime">
+            <el-button type="primary" size="mini" @click="saveTime">保存</el-button>
-              <el-time-select
+            <el-button size="mini" @click="cancelAddTime">取消</el-button>
-                placeholder="开始时间"
+          </el-form-item>
-                v-model="formInline.startTime"
+        </el-form>
-                :picker-options="{
+      </el-card>
-                start: '00:00',
+    </el-collapse-transition>
-                step: '01:00',
+    <el-table
-                end: '23:00',
-              }">
-              </el-time-select>
-            </el-form-item>
-            <el-form-item label="结束时间" prop="endTime">
-              <el-time-select
-                placeholder="结束时间"
-                v-model="formInline.endTime"
-                :picker-options="{
-                start: '00:00',
-                step: '01:00',
-                end: '23:00',
-                minTime: formInline.startTime
-              }">
-              </el-time-select>
-            </el-form-item>
-            <el-form-item label="冲放功率" prop="chargeDischargePower">
-              <el-input v-model="formInline.chargeDischargePower" placeholder="请输入"></el-input>
-            </el-form-item>
-            <el-form-item label="充电状态" prop="chargeStatus">
-              <el-select v-model="formInline.chargeStatus" placeholder="请选择">
-                <el-option v-for="(value,key) in chargeStatusOptions" :key="key+'chargeStatusOptions'" :label="value" :value="key"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" size="mini" @click="saveTime">保存</el-button>
-              <el-button size="mini" @click="cancelAddTime">取消</el-button>
-            </el-form-item>
-          </el-form>
-          </el-card>
-      </el-collapse-transition>
-      <el-table
         :data="tableData"
         border
         style="width: 100%;margin-top:25px">
-        <!--            todo 如果要在span-method中使用column.property 在表格中必须定义prop="xxx"属性-->
+      <el-table-column
-        <el-table-column
           prop="startTime"
           label="开始时间">
-        </el-table-column>
+        <template slot-scope="scope">
-        <el-table-column
+          <el-time-select
+            v-if="mode === 'edit'"
+            v-model="scope.row.startTime"
+            placeholder="开始时间"
+            :picker-options="{
+              start: '00:00',
+              step: '00:01',
+              end: '23:59'
+            }"
+            :style="{width: '100%'}"
+          />
+          <span v-else>{{ scope.row.startTime || '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
           prop="endTime"
           label="结束时间">
-        </el-table-column>
+        <template slot-scope="scope">
-        <el-table-column
+          <el-time-select
+            v-if="mode === 'edit'"
+            v-model="scope.row.endTime"
+            placeholder="结束时间"
+            :picker-options="{
+              start: '00:00',
+              step: '00:01',
+              end: '23:59',
+              minTime: scope.row.startTime
+            }"
+            :style="{width: '100%'}"
+          />
+          <span v-else>{{ scope.row.endTime || '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
           prop="chargeDischargePower"
           label="充放功率（kW）">
-        </el-table-column>
+        <template slot-scope="scope">
-        <el-table-column
+          <el-input
+            v-if="mode === 'edit'"
+            v-model.trim="scope.row.chargeDischargePower"
+            placeholder="请输入"
+            clearable
+            :style="{width: '100%'}"
+          />
+          <span v-else>{{ scope.row.chargeDischargePower || '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+          prop="sdcDown"
+          label="SOC下限">
+        <template slot-scope="scope">
+          <el-input
+            v-if="mode === 'edit'"
+            v-model.trim="scope.row.sdcDown"
+            placeholder="请输入"
+            clearable
+            :style="{width: '100%'}"
+          />
+          <span v-else>{{ scope.row.sdcDown === null || scope.row.sdcDown === undefined || scope.row.sdcDown === '' ? '-' : scope.row.sdcDown + '%' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+          prop="sdcUp"
+          label="SOC上限">
+        <template slot-scope="scope">
+          <el-input
+            v-if="mode === 'edit'"
+            v-model.trim="scope.row.sdcUp"
+            placeholder="请输入"
+            clearable
+            :style="{width: '100%'}"
+          />
+          <span v-else>{{ scope.row.sdcUp === null || scope.row.sdcUp === undefined || scope.row.sdcUp === '' ? '-' : scope.row.sdcUp + '%' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
           prop="chargeStatus"
           label="充电状态">
-          <template slot-scope="scope">
+        <template slot-scope="scope">
-            {{chargeStatusOptions[scope.row.chargeStatus]}}
+          <el-select
-          </template>
+            v-if="mode === 'edit'"
-        </el-table-column>
+            v-model="scope.row.chargeStatus"
-        <el-table-column
+            placeholder="请选择"
+            :style="{width: '100%'}"
+          >
+            <el-option
+              v-for="(value,key) in chargeStatusOptions"
+              :key="key+'chargeStatusEditOptions'"
+              :label="value"
+              :value="key"
+            />
+          </el-select>
+          <span v-else>{{ chargeStatusOptions[scope.row.chargeStatus] }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
           fixed="right"
           label="操作"
           width="120">
-          <template slot-scope="scope">
+        <template slot-scope="scope">
-            <el-button
+          <el-button
               @click.native.prevent="deleteRow(scope.$index, tableData)"
               type="warning"
               size="mini">
-              删除
+            删除
-            </el-button>
+          </el-button>
-          </template>
+        </template>
-        </el-table-column>
+      </el-table-column>
-      </el-table>
+    </el-table>
-      <div slot="footer">
+    <div slot="footer">
-        <el-button @click="closeDialog">取消</el-button>
+      <el-button @click="closeDialog">取消</el-button>
-        <el-button type="primary" @click="saveDialog">确定</el-button>
+      <el-button type="primary" @click="saveDialog">确定</el-button>
-      </div>
+    </div>
-    </el-dialog>
+  </el-dialog>
 </template>
 <script>
 import {mapState} from 'vuex'
-import {addStrategyTemp,editStrategyTemp,getStrategyTempDetail} from '@/api/ems/dzjk'
+import {addStrategyTemp, editStrategyTemp, getStrategyTempDetail} from '@/api/ems/dzjk'
+
 export default {
-  inject:['$home'],
+  inject: ['$home'],
   data() {
+    const now = new Date()
+    const year = now.getFullYear(), month = now.getMonth(), day = now.getDate()
+    const range = [new Date(year, month, day, 0), new Date(year, month, day, 23)]
     return {
-      mode:'',
+      mode: '',
-      editTempId:'',
+      editTempId: '',
-      dialogTableVisible:false,
+      dialogTableVisible: false,
+      secondRange: range,
       formData: {
         templateName: '',
         sdcLimit: false,
-        sdcDown: '',
-        sdcUp: '',
       },
       rules: {
         templateName: [{
@@ -126,45 +223,44 @@ export default {
           message: '请输入',
           trigger: 'blur'
         }],
-        sdcDown: [
-          {required: true,message: '请输入', trigger: 'blur'},
-          { pattern: /^(0|[1-9]\d*)(\.\d+)?$/, message: '请输入合法数字或小数' }
-        ],
-        sdcUp: [
-          {required: true,message: '请输入', trigger: 'blur'},
-          { pattern: /^(0|[1-9]\d*)(\.\d+)?$/, message: '请输入合法数字或小数' }
-        ],
       },
       showAddTime: false,
-      formInline:{
+      formInline: {
-        startTime:'',endTime:'',chargeDischargePower:'',chargeStatus:''
+        timeRange: range,
+        chargeDischargePower: '',
+        sdcDown: '',
+        sdcUp: '',
+        chargeStatus: ''
       },
-      formInlineRule:{
+      formInlineRule: {
-        startTime: [{
+        timeRange: [{
           required: true,
-          message: '请选择开始时间',
+          message: '请选择时间范围',
-          trigger: 'change'
-        }],
-        endTime: [{
-          required: true,
-          message: '请选择结束时间',
           trigger: 'change'
         }],
         chargeDischargePower: [{
-            required: true,
+          required: true,
-            message: '请输入冲放功率',
+          message: '请输入冲放功率',
-            trigger: 'blur'
+          trigger: 'blur'
-          },
+        },
-          { pattern: /^(0|[1-9]\d*)(\.\d+)?$/, message: '请输入合法数字或小数' }
+          {pattern: /^-?\d*\.?\d*$/, message: '请输入合法数字或小数'}
         ],
-        chargeStatus:[{
+        sdcDown: [
+          {required: true, message: '请输入', trigger: 'blur'},
+          {pattern: /^(0|[1-9]\d*)(\.\d+)?$/, message: '请输入合法数字或小数'}
+        ],
+        sdcUp: [
+          {required: true, message: '请输入', trigger: 'blur'},
+          {pattern: /^(0|[1-9]\d*)(\.\d+)?$/, message: '请输入合法数字或小数'}
+        ],
+        chargeStatus: [{
           required: true,
           message: '请选择充放状态',
-          trigger: ['blur','change']
+          trigger: ['blur', 'change']
-          }
+        }
         ]
       },
-      tableData:[],
+      tableData: [],
     }
   },
   computed: {
@@ -172,145 +268,183 @@ export default {
       chargeStatusOptions: state => state?.ems?.chargeStatusOptions || {},
     })
   },
-  watch: {
-    "formInline.startTime":{
-      handler(newVal){
-        if(newVal && this.formInline.endTime){
-          const endTime = parseInt((this.formInline.endTime).split(':')[0] || 0)
-          const startTime =parseInt(newVal.split(':')[0])
-          if(endTime<=startTime){
-            this.formInline.endTime = `${startTime+1 <=9 ? '0'+(startTime+1) : startTime+1}:00`
-          }
-        }
-      },
-      deep:true
-    },
-  },
   methods: {
-    changeSiteId(){
+    changeSiteId() {
-      this.dialogTableVisible=false
+      this.dialogTableVisible = false
-      this.mode=''
+      this.mode = ''
-      this.editTempId=''
+      this.editTempId = ''
-      this.formData={
+      this.formData = {
         templateName: '',
         sdcLimit: false,
-        sdcDown: '',
-        sdcUp: '',
-      }
-      this.formInline={
-        startTime:'',endTime:'',chargeDischargePower:'',chargeStatus:''
       }
+      this.formInline = {
+        timeRange: this.secondRange, chargeDischargePower: '', sdcDown: '', sdcUp: '', chargeStatus: ''
+      }//startTime: '', endTime: '',
       this.showAddTime = false
-      this.tableData=[]
+      this.tableData = []
     },
-    show({mode = 'add', editTempId = ''}){
+    show({mode = 'add', editTempId = ''}) {
       this.$nextTick(() => {
         this.dialogTableVisible = true
         this.mode = mode
-        this.editTempId=editTempId
+        this.editTempId = editTempId
-        if(mode === 'edit' && editTempId){
+        if (mode === 'edit' && editTempId) {
           getStrategyTempDetail(this.editTempId).then(response => {
-            const data=JSON.parse(JSON.stringify(response?.data || []));
+            const data = JSON.parse(JSON.stringify(response?.data || []));
-            if(data.length>0){
+            if (data.length > 0) {
-              const {templateName,sdcLimit,sdcDown,sdcUp} =JSON.parse(JSON.stringify( data[0]));
+              const {templateName, sdcLimit} = JSON.parse(JSON.stringify(data[0]));
-              this.formData.templateName=templateName
+              this.formData.templateName = templateName
-              this.formData.sdcLimit=sdcLimit
+              this.formData.sdcLimit = sdcLimit
-              this.formData.sdcDown=sdcDown
-              this.formData.sdcUp=sdcUp
             }
-            if(data.length === 1){
+            if (data.length === 1) {
-              const {startTime,endTime}=data;
+              const {startTime, endTime} = data[0];
-              if(!startTime || !endTime){
+              if (!startTime || !endTime) {
                 this.tableData = []
-              }else{
+              } else {
-                this.tableData= data
+                this.tableData = data
               }
-            }else{
+            } else {
-              this.tableData= data
+              this.tableData = data
             }
           })
         }
       })
     },
-    addTime(){
+    addTime() {
-      this.showAddTime=true
+      this.showAddTime = true
     },
-    cancelAddTime(){
+    cancelAddTime() {
       this.$refs.addTimeForm.resetFields()
-      this.showAddTime=false
+      this.showAddTime = false
-      this.formInline = {startTime:'',endTime:'',chargeDischargePower:'',chargeStatus:''}
+      this.formInline = {timeRange: this.secondRange, chargeDischargePower: '', sdcDown: '', sdcUp: '', chargeStatus: ''}//startTime: '', endTime: '',
     },
-    saveTime(){
+    saveTime() {
       //表单校验，校验成功，添加到tableData里
       this.$refs.addTimeForm.validate(valid => {
         if (!valid) return
-        this.tableData.push(JSON.parse(JSON.stringify(this.formInline)));
+        const {timeRange: [startTime, endTime], chargeDischargePower, sdcDown, sdcUp, chargeStatus} = this.formInline
-        this.$nextTick(() => {this.cancelAddTime()})
+
+        this.tableData.push({startTime, endTime, chargeDischargePower, sdcDown, sdcUp, chargeStatus})
+        this.$nextTick(() => {
+          this.cancelAddTime()
+        })
       })
     },
-    deleteRow(index){
+    deleteRow(index) {
-      this.tableData.splice(index,1)
+      this.tableData.splice(index, 1)
     },
     saveDialog() {
       this.$refs.addTempForm.validate(valid => {
         if (!valid) return
-        //校验时间选择范围是否冲突
+        const {templateName, sdcLimit} = this.formData
-          let status = true
+        const {siteId, updateStrategyId} = this.$home
-          this.tableData.forEach((outer,outerIndex)=>{
+        const tableData = this.tableData.map(item => ({
-            const {startTime, endTime}=outer
+          ...item,
-            const outerStart = parseInt(startTime),outerEnd = parseInt(endTime)
+          sdcDown: this.normalizeSocValue(item.sdcDown),
-            if(outerStart>outerEnd){
+          sdcUp: this.normalizeSocValue(item.sdcUp)
-              status = false
+        }))
-            }else{
+        if (!this.validateTableData(tableData)) return
-              this.tableData.forEach((inner,innerIndex)=>{
+        if (this.mode === 'edit') {
-                if(innerIndex !== outerIndex){
+          editStrategyTemp({
-                  const {startTime:innerStartTime, endTime:innerEndTime}=inner
+            siteId,
-                  const innerStart = parseInt(innerStartTime),innerEnd = parseInt(innerEndTime)
+            strategyId: updateStrategyId,
-                  if((innerStart<outerStart && innerEnd>outerEnd) || !((innerStart<outerStart && innerEnd<=outerStart) || (innerStart>=outerEnd && innerEnd>outerEnd))){
+            templateId: this.editTempId,
-                    status=false
+            templateName,
-                  }
+            sdcLimit,
-                }
+            timeConfigList: tableData
-              })
+          }).then(response => {
+            if (response?.code === 200) {
+              this.closeDialog()
+              this.$emit('update')
+              this.$emit('updateTimeSetting')
             }
           })
-          if(!status){
+        } else {
-            return this.$message.error('时间选择范围冲突');
+          addStrategyTemp({
-          }
+            siteId,
-          const {templateName,sdcLimit,sdcDown,sdcUp} = this.formData
+            strategyId: updateStrategyId,
-          const {siteId,updateStrategyId} =this.$home
+            templateName,
-          const {tableData} = this
+            sdcLimit,
-          if(this.mode==='edit'){
+            timeConfigList: tableData
-            editStrategyTemp({siteId,strategyId:updateStrategyId,templateId:this.editTempId,templateName,sdcLimit,sdcDown,sdcUp,timeConfigList:tableData}).then(response=>{
+          }).then(response => {
-              if(response?.code === 200){
+            if (response?.code === 200) {
-                this.closeDialog()
+              this.closeDialog()
-                this.$emit('update')
+              this.$emit('update')
-                this.$emit('updateTimeSetting')
+            }
-              }
+          })
-            })
+        }
-          }else{
-            addStrategyTemp({siteId,strategyId:updateStrategyId,templateName,sdcLimit,sdcDown,sdcUp,timeConfigList:tableData}).then(response=>{
-              if(response?.code === 200){
-                this.closeDialog()
-                this.$emit('update')
-              }
-            })
-          }
       })
     },
-    closeDialog(){
+    normalizeSocValue(value) {
+      if (value === null || value === undefined) return null
+      const normalized = String(value).replace('%', '').trim()
+      return normalized === '' ? null : normalized
+    },
+    toMinutes(timeValue) {
+      if (!timeValue || String(timeValue).indexOf(':') < 0) return -1
+      const [h, m] = String(timeValue).split(':')
+      const hour = Number(h), minute = Number(m)
+      if (!Number.isInteger(hour) || !Number.isInteger(minute)) return -1
+      if (hour < 0 || hour > 23 || minute < 0 || minute > 59) return -1
+      return hour * 60 + minute
+    },
+    validateTableData(list = []) {
+      const numberPattern = /^-?\d+(\.\d+)?$/
+      const socPattern = /^(0|[1-9]\d*)(\.\d+)?$/
+      for (let i = 0; i < list.length; i++) {
+        const row = list[i]
+        const rowNo = i + 1
+        if (!row.startTime || !row.endTime) {
+          this.$message.error(`第${rowNo}行：开始时间和结束时间不能为空`)
+          return false
+        }
+        const startMinute = this.toMinutes(row.startTime)
+        const endMinute = this.toMinutes(row.endTime)
+        if (startMinute < 0 || endMinute < 0 || startMinute >= endMinute) {
+          this.$message.error(`第${rowNo}行：时间范围不合法`)
+          return false
+        }
+        if (!numberPattern.test(String(row.chargeDischargePower ?? '').trim())) {
+          this.$message.error(`第${rowNo}行：充放功率格式不正确`)
+          return false
+        }
+        if (!socPattern.test(String(row.sdcDown ?? '').trim())) {
+          this.$message.error(`第${rowNo}行：SOC下限格式不正确`)
+          return false
+        }
+        if (!socPattern.test(String(row.sdcUp ?? '').trim())) {
+          this.$message.error(`第${rowNo}行：SOC上限格式不正确`)
+          return false
+        }
+        if (Number(row.sdcDown) > Number(row.sdcUp)) {
+          this.$message.error(`第${rowNo}行：SOC下限不能大于SOC上限`)
+          return false
+        }
+        if (row.chargeStatus === undefined || row.chargeStatus === null || row.chargeStatus === '') {
+          this.$message.error(`第${rowNo}行：请选择充电状态`)
+          return false
+        }
+      }
+      return true
+    },
+    closeDialog() {
       // 清空所有数据
       this.$refs.addTempForm.resetFields()
-      this.formData={
+      this.formData = {
         templateName: '',
-          sdcLimit:0,
+        sdcLimit: 0,
-          sdcDown: '',
-          sdcUp: '',
       }
-      this.tableData=[]
+      this.tableData = []
       this.cancelAddTime()
-      this.dialogTableVisible=false
+      this.dialogTableVisible = false
     }
   }
 }
 
 </script>
+<style lang="scss" scoped>
+.add-template-dialog {
+  max-height: 90vh;
+  overflow-y: auto;
+}
+</style>

src/views/ems/dzjk/clpz/xftg/TempTable.vue

@@ -39,14 +39,14 @@
             prop="sdcDown"
             label="SOC下限">
             <template slot-scope="scope">
-              {{scope.row.sdcDown ? scope.row. sdcDown + '%' : '-'}}
+              {{scope.row.sdcDown === null || scope.row.sdcDown === undefined || scope.row.sdcDown === '' ? '-' : scope.row.sdcDown + '%'}}
             </template>
           </el-table-column>
           <el-table-column
             prop="sdcUp"
             label="SOC上限">
             <template slot-scope="scope">
-              {{scope.row.sdcUp ? scope.row.sdcUp + '%' : '-'}}
+              {{scope.row.sdcUp === null || scope.row.sdcUp === undefined || scope.row.sdcUp === '' ? '-' : scope.row.sdcUp + '%'}}
             </template>
           </el-table-column>
           <el-table-column
@@ -92,7 +92,7 @@ export default {
       activeBtn:'',
       tempList:[],
       tableData:[],
-      mixinPrototype:['templateName','sdcLimit','sdcDown','sdcUp']
+      mixinPrototype:['templateName','sdcLimit']
     }
   },
   computed:{

src/views/ems/dzjk/gzgj/index.vue

@@ -1,27 +1,30 @@
-
 <template>
-  <el-card  v-loading="loading" gshadow="always" class="common-card-container common-card-container-no-title-bg">
+  <el-card v-loading="loading" gshadow="always" class="common-card-container common-card-container-no-title-bg">
     <!--    搜索栏-->
     <el-form :inline="true" class="select-container">
       <el-form-item label="设备清单">
-        <el-select v-model="search.deviceId" clearable placeholder="请选择" :loading="loading" loading-text="正在加载数据">
+        <el-select v-model="search.deviceId" clearable placeholder="请选择" :loading="loading"
-          <el-option :label="item.deviceName" :value="item.deviceId" v-for="(item,key) in deviceOptions" :key="key+'deviceIdOptions'"></el-option>
+                   loading-text="正在加载数据">
+          <el-option :label="item.deviceName" :value="item.deviceId" v-for="(item,key) in deviceOptions"
+                     :key="key+'deviceIdOptions'"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="告警等级">
-        <el-select v-model="search.alarmLevel" clearable placeholder="请选择" :loading="loading" loading-text="正在加载数据">
+        <el-select v-model="search.alarmLevel" clearable placeholder="请选择" :loading="loading"
-          <el-option :label="value" :value="key" v-for="(value,key) in $store.state.ems.alarmLevelOptions" :key="key+'alarmLevelOptions'"></el-option>
+                   loading-text="正在加载数据" style="width: 130px">
+          <el-option :label="value" :value="key" v-for="(value,key) in $store.state.ems.alarmLevelOptions"
+                     :key="key+'alarmLevelOptions'"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="时间选择">
         <el-date-picker
-          v-model="dateRange"
+            v-model="dateRange"
-          type="daterange"
+            type="daterange"
-          range-separator="至"
+            range-separator="至"
-          start-placeholder="开始时间"
+            start-placeholder="开始时间"
-          :picker-options="pickerOptions"
+            :picker-options="pickerOptions"
-          :default-value="defaultDateRange"
+            :default-value="defaultDateRange"
-          end-placeholder="结束时间">
+            end-placeholder="结束时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -36,7 +39,9 @@
       <el-row style="">
         <el-col :xs="24" :sm="24" :lg="24">
           <el-button-group class="ems-btns-group">
-            <el-button v-for="(item,index) in btnList" :key="index+'dtdcBtns'" :class="{'activeBtn' : activeBtn === item.id}" @click="changeDataType(item.id)">{{item.name}}</el-button>
+            <el-button v-for="(item,index) in btnList" :key="index+'dtdcBtns'"
+                       :class="{'activeBtn' : activeBtn === item.id}" @click="changeDataType(item.id)">{{ item.name }}
+            </el-button>
           </el-button-group>
         </el-col>
       </el-row>
@@ -47,64 +52,77 @@
           stripe
           max-height="500"
           style="width: 100%;margin-top:25px;">
-          <el-table-column
+        <el-table-column
             prop="deviceName"
             label="设备名称">
-          </el-table-column>
+        </el-table-column>
-          <el-table-column
+        <el-table-column
             label="告警等级"
-          >
+        >
-            <template slot-scope="scope">
+          <template slot-scope="scope">
-              <span>{{$store.state.ems.alarmLevelOptions[scope.row.alarmLevel]}}</span>
+            <span>{{ $store.state.ems.alarmLevelOptions[scope.row.alarmLevel] }}</span>
-            </template>
+          </template>
-          </el-table-column>
+        </el-table-column>
-          <el-table-column
+        <el-table-column
             prop="alarmContent"
             show-overflow-tooltip
             label="告警内容">
-          </el-table-column>
+        </el-table-column>
-          <el-table-column
+        <el-table-column
             prop="alarmStartTime"
             label="告警发生时间">
-            <template slot-scope="scope">
+          <template slot-scope="scope">
-              <span>{{formatDate(scope.row.alarmStartTime,true)}}</span>
+            <span>{{ formatDate(scope.row.alarmStartTime, true) }}</span>
-            </template>
+          </template>
-          </el-table-column>
+        </el-table-column>
-          <el-table-column
+        <el-table-column
             prop="alarmEndTime"
             label="告警结束时间">
-            <template slot-scope="scope">
+          <template slot-scope="scope">
-              <span>{{formatDate(scope.row.alarmEndTime,true)}}</span>
+            <span>{{ formatDate(scope.row.alarmEndTime, true) }}</span>
-            </template>
+          </template>
-          </el-table-column>
+        </el-table-column>
-          <el-table-column
+        <el-table-column
             label="状态">
-            <template slot-scope="scope">
+          <template slot-scope="scope">
-              <span :class="['0','2'].includes(scope.row.status) ? 'warning-status' : ''">{{$store.state.ems.alarmStatusOptions[scope.row.status]}}</span>
+            <span
-            </template>
+                :class="['0','2'].includes(scope.row.status) ? 'warning-status' : ''">{{
-          </el-table-column>
+                $store.state.ems.alarmStatusOptions[scope.row.status]
-          <el-table-column
+              }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
             label="工单"
             fixed="right"
-            width="250"
+            width="320"
-          >
+        >
-            <template slot-scope="scope">
+          <template slot-scope="scope">
-              <el-button type="text" size="mini"  v-if="scope.row.ticketNo" @click="toTicket">已生成工单(工单号:{{scope.row.ticketNo}})</el-button>
+            <el-button type="text" size="mini" v-if="scope.row.ticketNo" @click="toTicket">
-              <el-button type="primary" size="mini" v-else @click="createTicket(scope.row.id)">生成工单</el-button>
+              已生成工单(工单号:{{ scope.row.ticketNo }})
-            </template>
+            </el-button>
-          </el-table-column>
+            <el-button type="primary" size="mini" v-else @click="createTicket(scope.row.id)">生成工单</el-button>
-        </el-table>
+            <el-button
+                v-if="scope.row.status !== '1'"
+                type="success"
+                size="mini"
+                style="margin-left: 8px;"
+                @click="closeAlarmRecord(scope.row.id)">
+              确认关闭
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
       <el-pagination
-        v-show="tableData.length>0"
+          v-show="tableData.length>0"
-        background
+          background
-        @size-change="handleSizeChange"
+          @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
+          @current-change="handleCurrentChange"
-        :current-page="pageNum"
+          :current-page="pageNum"
-        :page-size="pageSize"
+          :page-size="pageSize"
-        :page-sizes="[10, 20, 30, 40]"
+          :page-sizes="[10, 20, 30, 40]"
-        layout="total, sizes, prev, pager, next, jumper"
+          layout="total, sizes, prev, pager, next, jumper"
-        :total="totalSize"
+          :total="totalSize"
-        style="margin-top:15px;text-align: center"
+          style="margin-top:15px;text-align: center"
       >
       </el-pagination>
     </div>
@@ -113,117 +131,147 @@
 
 
 <script>
-import {getAlarmDetailList,createTicketNo} from'@/api/ems/dzjk'
+import {closeAlarm, createTicketNo, getAlarmDetailList} from '@/api/ems/dzjk'
-import {getDeviceList} from'@/api/ems/site'
+import {getDeviceList} from '@/api/ems/site'
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import { formatDate } from '@/filters/ems'
+import {formatDate} from '@/filters/ems'
+
 export default {
-  name:'DzjkGzgj',
+  name: 'DzjkGzgj',
-  mixins:[getQuerySiteId],
+  mixins: [getQuerySiteId],
   data() {
     return {
-      loading:false,
+      loading: false,
-      btnList:[
+      btnList: [
-        {name:'未处理告警',id:'today'},
+        {name: '未处理告警', id: 'today'},
-        {name:'历史告警',id:'history'},
+        {name: '历史告警', id: 'history'},
       ],
-      deviceOptions:[],//设备列表
+      deviceOptions: [],//设备列表
-      pickerOptions:{
+      pickerOptions: {
         disabledDate(time) {
           return time.getTime() > Date.now();
         },
       },
-      defaultDateRange:[],//默认展示的时间
+      defaultDateRange: [],//默认展示的时间
-      dateRange:[],//alarmStartTime,alarmEndTime
+      dateRange: [],//alarmStartTime,alarmEndTime
-      activeBtn:'today',
+      activeBtn: 'today',
-      search:{deviceId:'',alarmLevel:''},
+      search: {deviceId: '', alarmLevel: ''},
       // 表格、分页
-      tableData:[],
+      tableData: [],
-      pageSize:10,//分页栏当前每个数据总数
+      pageSize: 10,//分页栏当前每个数据总数
-      pageNum:1,//分页栏当前页数
+      pageNum: 1,//分页栏当前页数
-      totalSize:0,//table表格数据总数
+      totalSize: 0,//table表格数据总数
     }
   },
-  methods:{
+  methods: {
     formatDate,
-    toTicket(){
+    toTicket() {
-      this.$router.push({path:'/ticket'})
+      this.$router.push({path: '/ticket'})
     },
     //生成工单
-    createTicket(id){
+    createTicket(id) {
       this.loading = true
-      createTicketNo({id}).then(response=>{
+      createTicketNo({id}).then(response => {
         response?.data && this.toTicket()
-      }).finally(()=>{this.loading = false})
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    //确认关闭告警
+    closeAlarmRecord(id) {
+      this.$confirm('确认关闭该故障告警吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.loading = true
+        closeAlarm({id}).then(() => {
+          this.$message.success('关闭成功')
+          this.getData()
+        }).finally(() => {
+          this.loading = false
+        })
+      }).catch(() => {
+      })
     },
     // 判断是否是同一天
     isSameDay(day1, day2) {
-      const date1 = new Date(day1),date2 = new Date(day2)
+      const date1 = new Date(day1), date2 = new Date(day2)
       return date1.getFullYear() === date2.getFullYear() &&
-        date1.getMonth() === date2.getMonth() &&
+          date1.getMonth() === date2.getMonth() &&
-        date1.getDate() === date2.getDate();
+          date1.getDate() === date2.getDate();
     },
     // 分页
     handleSizeChange(val) {
       this.pageSize = val;
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         this.getData()
       })
     },
     handleCurrentChange(val) {
       this.pageNum = val
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         this.getData()
       })
     },
     // 搜索
-    onSearch(){
+    onSearch() {
-      this.pageNum =1//每次搜索从1开始搜索
+      this.pageNum = 1//每次搜索从1开始搜索
       this.getData()
     },
     // 重置
-    onReset(){
+    onReset() {
-      this.search={deviceId:'',alarmLevel:''}
+      this.search = {deviceId: '', alarmLevel: ''}
-      this.dateRange=[]
+      this.dateRange = []
-      this.pageNum =1//每次搜索从1开始搜索
+      this.pageNum = 1//每次搜索从1开始搜索
       this.getData()
     },
     // 切换今日、历史告警
-    changeDataType(id){
+    changeDataType(id) {
-      if(id !== this.activeBtn){
+      if (id !== this.activeBtn) {
         console.log('点击了不同的菜单，更新数据')
-        this.activeBtn=id;
+        this.activeBtn = id;
         this.getData()
       }
     },
     // 获取数据
-    getData(){
+    getData() {
-      this.$store.dispatch('getSiteAlarmNum',this.siteId)
+      this.$store.dispatch('getSiteAlarmNum', this.siteId)
-      this.loading=true
+      this.loading = true
-      const {deviceId,alarmLevel} = this.search
+      const {deviceId, alarmLevel} = this.search
-      const {siteId,pageNum,pageSize,activeBtn} =this
+      const {siteId, pageNum, pageSize, activeBtn} = this
-      const [alarmStartTime='',alarmEndTime='']=(this.dateRange || [])
+      const [alarmStartTime = '', alarmEndTime = ''] = (this.dateRange || [])
       let status = activeBtn === 'today' ? '0' : '1,2'
-      getAlarmDetailList({status,deviceId,alarmLevel,siteId,pageSize,pageNum,alarmStartTime:formatDate(alarmStartTime),alarmEndTime:formatDate(alarmEndTime)}).then(response => {
+      getAlarmDetailList({
-        this.tableData=response?.rows || [];
+        status,
+        deviceId,
+        alarmLevel,
+        siteId,
+        pageSize,
+        pageNum,
+        alarmStartTime: formatDate(alarmStartTime),
+        alarmEndTime: formatDate(alarmEndTime)
+      }).then(response => {
+        this.tableData = response?.rows || [];
         this.totalSize = response?.total || 0
-      }).finally(() => {this.loading=false})
+      }).finally(() => {
+        this.loading = false
+      })
     },
-    getDeviceOptions(){
+    getDeviceOptions() {
       getDeviceList(this.siteId).then(response => {
         this.deviceOptions = JSON.parse(JSON.stringify(response?.data || []))
       })
     },
-    init(){
+    init() {
       this.getDeviceOptions()
       this.onReset()
     },
   },
-  mounted(){
+  mounted() {
     const now = new Date();
     const lastMonth = new Date(now.getFullYear(), now.getMonth() - 1, 1);
     this.defaultDateRange = [lastMonth, now];
   }
 }
 </script>
-

src/views/ems/dzjk/home/ActiveChart.vue

@@ -1,30 +1,44 @@
-
 <template>
-    <el-card shadow="always" class="common-card-container common-card-container-body-no-padding time-range-card">
+  <el-card shadow="always" class="common-card-container common-card-container-body-no-padding time-range-card">
-      <div slot="header" class="time-range-header">
+    <div slot="header" class="time-range-header">
-        <span class="card-title">当日功率曲线</span>
+      <span class="card-title">当日功率曲线</span>
-        <date-range-select ref="dateRangeSelect" @updateDate="updateDate"/>
+      <date-range-select ref="dateRangeSelect" :showIcon="true" :mini-time-picker="true" @updateDate="updateDate"/>
-      </div>
+    </div>
-      <div style="height: 310px" id="activeChart"></div>
+    <div class="card-main">
-    </el-card>
+      <div id="activeChart" class="active-chart-canvas"></div>
+    </div>
+  </el-card>
 </template>
 
 <script>
 import * as echarts from 'echarts'
 import resize from '@/mixins/ems/resize'
 import DateRangeSelect from '@/components/Ems/DateRangeSelect/index.vue'
-import { getPointData } from '@/api/ems/dzjk'
+import {getPointConfigCurve} from '@/api/ems/site'
 import intervalUpdate from "@/mixins/ems/intervalUpdate";
 
 export default {
-  mixins: [resize,intervalUpdate],
+  mixins: [resize, intervalUpdate],
   components: {DateRangeSelect},
+  props: {
+    displayData: {
+      type: Array,
+      default: () => []
+    }
+  },
   data() {
     return {
       chart: null,
-      timeRange:[],
+      timeRange: [],
-      siteId:'',
+      siteId: '',
-      isInit:true
+      isInit: true
+    }
+  },
+  watch: {
+    displayData() {
+      if (this.siteId && this.timeRange.length === 2) {
+        this.getGVQXData()
+      }
     }
   },
   mounted() {
@@ -41,23 +55,46 @@ export default {
   },
   methods: {
     // 更新时间范围 重置图表
-    updateDate(data){
+    updateDate(data) {
-      this.timeRange=data
+      this.timeRange = data
       !this.isInit && this.getGVQXData()
       this.isInit = false
     },
-    getGVQXData(){
+    getGVQXData() {
-      this.showLoading()
+      const {siteId, timeRange} = this
-      const {siteId,timeRange}=this
+      const displayData = this.displayData || []
-      getPointData({siteId,startDate:timeRange[0],endDate:timeRange[1]}).then(response => {
+      const sectionRows = displayData.filter(item =>
-        this.setOption(response?.data || [])
+        item && item.sectionName === '当日功率曲线' && item.useFixedDisplay !== 1 && item.dataPoint
-      }).finally(()=>this.hideLoading())
+      )
+      const tasks = sectionRows.map(row => {
+        const pointId = String(row.dataPoint || '').trim()
+        if (!pointId) return Promise.resolve(null)
+        return getPointConfigCurve({
+          siteId,
+          pointId,
+          pointType: 'data',
+          rangeType: 'custom',
+          startTime: this.normalizeDateTime(timeRange[0], false),
+          endTime: this.normalizeDateTime(timeRange[1], true)
+        }).then(curveResponse => {
+          const list = curveResponse?.data || []
+          return {
+            name: row.fieldName || row.fieldCode || pointId,
+            data: list
+              .map(item => [this.parseToTimestamp(item.dataTime), Number(item.pointValue)])
+              .filter(item => item[0] && !Number.isNaN(item[1]))
+          }
+        }).catch(() => null)
+      })
+      Promise.all(tasks).then(series => {
+        this.setOption((series || []).filter(Boolean))
+      })
     },
-    init(siteId){
+    init(siteId) {
       //初始化 清空数据
       this.siteId = siteId
       this.isInit = true
-      this.timeRange=[]
+      this.timeRange = []
       this.$refs.dateRangeSelect.init(true)
       this.getGVQXData()
       this.updateInterval(this.getGVQXData)
@@ -65,18 +102,18 @@ export default {
     initChart() {
       this.chart = echarts.init(document.querySelector('#activeChart'))
     },
-    showLoading(){
+    normalizeDateTime(value, endOfDay) {
-      this.chart && this.chart.showLoading()
+      const raw = String(value || '').trim()
+      if (!raw) return ''
+      if (raw.includes(' ')) return raw
+      return `${raw} ${endOfDay ? '23:59:59' : '00:00:00'}`
     },
-    hideLoading(){
+    parseToTimestamp(value) {
-      this.chart && this.chart.hideLoading()
+      if (!value) return null
+      const t = new Date(value).getTime()
+      return Number.isNaN(t) ? null : t
     },
-    setOption(data) {
+    setOption(seriesData = []) {
-      const source = [['日期','电网功率','负载功率','储能功率','光伏功率','soc平均值','soh平均值','电池平均温度平均值']]
-      console.log('source.slice(1)',source[0].slice(1))
-      this.chart && data.forEach((item)=>{
-        source.push([item.statisDate,item.gridPower,item.loadPower,item.storagePower,item.pvPower,item.avgSoc,item.avgSoh,item.avgTemp])
-      })
       this.chart.setOption({
         grid: {
           containLabel: true
@@ -87,29 +124,28 @@ export default {
         },
         tooltip: {
           trigger: 'axis',
-          axisPointer: { // 坐标轴指示器，坐标轴触发有效
+          axisPointer: { type: 'cross' }
-            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
-          }
         },
-        textStyle:{
+        textStyle: {
-          color:"#333333",
+          color: "#333333",
         },
         xAxis: {
-          type: 'category',
+          type: 'time',
         },
-        yAxis: [
+        yAxis: [{
-          {
+          type: 'value',
-            type: 'value',
+        }],
-          },
+        series: seriesData.map((item) => {
-          {
-            type: 'value',
-          },
-        ],
-        dataset:{source},
-        series: source[0].slice(1).map((item,index)=>{
           return {
+            name: item.name,
             type: 'line',
-            yAxisIndex:index<=4 ? 0 : 1
+            showSymbol: false,
+            symbolSize: 2,
+            smooth: true,
+            areaStyle: {
+              opacity: 0.5,
+            },
+            data: item.data
           }
         })
       })
@@ -120,3 +156,12 @@ export default {
 
 </script>
 
+<style scoped lang="scss">
+.card-main {
+  padding: 0 16px 12px;
+}
+
+.active-chart-canvas {
+  height: 310px;
+}
+</style>

src/views/ems/dzjk/home/WeekChart.vue

@@ -1,27 +1,64 @@
-
 <template>
-      <el-card shadow="always" class="common-card-container common-card-container-body-no-padding time-range-card">
+  <el-card shadow="always" class="common-card-container common-card-container-body-no-padding time-range-card">
-        <div slot="header" class="time-range-header">
+    <div slot="header" class="time-range-header">
-          <span class="card-title">一周充放曲线</span>
+      <span class="card-title">{{ cardTitle }}</span>
-          <date-range-select ref="dateRangeSelect" @updateDate="updateDate"/>
+      <date-range-select ref="dateRangeSelect" :showIcon="true" :mini-time-picker="true" @updateDate="updateDate" />
-        </div>
+    </div>
-        <div style="height: 310px" id="weekChart"></div>
+    <div class="card-main">
-      </el-card>
+      <div ref="weekChartRef" class="week-chart-canvas"></div>
+    </div>
+  </el-card>
 </template>
 
 <script>
 import * as echarts from 'echarts'
 import resize from '@/mixins/ems/resize'
 import DateRangeSelect from '@/components/Ems/DateRangeSelect/index.vue'
-import {getSevenChargeData} from '@/api/ems/dzjk'
+import { getPointConfigCurve } from '@/api/ems/site'
+
+const DAY = 24 * 60 * 60 * 1000
+const TEXT = {
+  cardTitle: '\u4e00\u5468\u5145\u653e\u67f1\u72b6\u56fe',
+  sectionName: '\u4e00\u5468\u5145\u653e\u66f2\u7ebf',
+  empty: '\u6682\u65e0\u6570\u636e',
+  date: '\u65e5\u671f',
+  charge: '\u5145\u7535\u91cf',
+  discharge: '\u653e\u7535\u91cf',
+  yAxis: '\u5145\u7535\u91cf/\u653e\u7535\u91cf\uff08kWh\uff09',
+  xAxis: '\u5355\u4f4d\uff1a\u65e5'
+}
+
+function createEmptySummary() {
+  return {
+    totalChargedCap: '',
+    totalDisChargedCap: '',
+    efficiency: ''
+  }
+}
+
 export default {
   mixins: [resize],
-  components: {DateRangeSelect},
+  components: { DateRangeSelect },
+  props: {
+    displayData: {
+      type: Array,
+      default: () => []
+    }
+  },
   data() {
     return {
       chart: null,
-      timeRange:[],
+      timeRange: [],
-      siteId:'',
+      siteId: '',
+      summary: createEmptySummary(),
+      cardTitle: TEXT.cardTitle
+    }
+  },
+  watch: {
+    displayData() {
+      if (this.siteId && this.timeRange.length === 2) {
+        this.getWeekKData()
+      }
     }
   },
   mounted() {
@@ -37,85 +74,298 @@ export default {
     this.chart = null
   },
   methods: {
-    // 更新时间范围 重置图表
+    updateDate(data) {
-    updateDate(data){
+      this.timeRange = data
-      this.timeRange=data
       this.getWeekKData()
     },
-    getWeekKData(){
+    getWeekKData() {
-      this.showLoading()
+      const { siteId, timeRange } = this
-      const {siteId,timeRange}=this
+      const displayData = this.displayData || []
-      this.hideLoading()
+      const sectionRows = displayData.filter(item =>
-      getSevenChargeData({siteId,startDate:timeRange[0],endDate:timeRange[1]}).then(response => {
+        item && item.sectionName === TEXT.sectionName && item.useFixedDisplay !== 1 && item.dataPoint
-        this.setOption(response?.data || [])
+      )
-      }).finally(()=>this.hideLoading())
+      const tasks = sectionRows.map(row => {
+        const pointId = String(row.dataPoint || '').trim()
+        if (!pointId) return Promise.resolve(null)
+        return getPointConfigCurve({
+          siteId,
+          pointId,
+          pointType: 'data',
+          rangeType: 'custom',
+          startTime: this.normalizeDateTime(timeRange[0], false),
+          endTime: this.normalizeDateTime(timeRange[1], true)
+        }).then(curveResponse => {
+          const list = curveResponse?.data || []
+          return {
+            name: row.fieldName || row.fieldCode || pointId,
+            fieldCode: row.fieldCode || '',
+            data: list
+              .map(item => [this.parseToTimestamp(item.dataTime), Number(item.pointValue)])
+              .filter(item => item[0] && !Number.isNaN(item[1]))
+          }
+        }).catch(() => null)
+      })
+      Promise.all(tasks).then(series => {
+        this.setOption((series || []).filter(Boolean))
+      })
     },
-    init(siteId){
+    init(siteId) {
-      //初始化 清空数据
       this.siteId = siteId
-      this.timeRange=[]
+      this.timeRange = []
-      this.deviceId=''
+      this.summary = createEmptySummary()
       this.$refs.dateRangeSelect.init()
     },
     initChart() {
-      this.chart = echarts.init(document.querySelector('#weekChart'))
+      this.chart = echarts.init(this.$refs.weekChartRef)
     },
-    showLoading(){
+    normalizeDateTime(value, endOfDay) {
-      this.chart && this.chart.showLoading()
+      const raw = String(value || '').trim()
+      if (!raw) return ''
+      if (raw.includes(' ')) return raw
+      return `${raw} ${endOfDay ? '23:59:59' : '00:00:00'}`
     },
-    hideLoading(){
+    parseToTimestamp(value) {
-      this.chart && this.chart.hideLoading()
+      if (!value) return null
+      const t = new Date(value).getTime()
+      return Number.isNaN(t) ? null : t
     },
-    setOption(data,unit) {
+    startOfDay(timestamp) {
-      const source = [['日期','充电量','放电量']]
+      const date = new Date(timestamp)
-      data.forEach(item=>{
+      date.setHours(0, 0, 0, 0)
-        source.push([item.ammeterDate, item.chargedCap,item.disChargedCap])
+      return date.getTime()
+    },
+    formatNumber(value) {
+      const num = Number(value)
+      if (Number.isNaN(num)) return '--'
+      return num.toLocaleString('zh-CN', {
+        minimumFractionDigits: 0,
+        maximumFractionDigits: 2
       })
-      this.chart && this.chart.setOption({
+    },
-        color:['#4472c4','#70ad47'],//所有充放电颜色保持统一
+    formatDateLabel(timestamp) {
+      const date = new Date(timestamp)
+      const month = String(date.getMonth() + 1).padStart(2, '0')
+      const day = String(date.getDate()).padStart(2, '0')
+      return `${month}-${day}`
+    },
+    formatTooltipDate(timestamp) {
+      const date = new Date(timestamp)
+      const year = date.getFullYear()
+      const month = String(date.getMonth() + 1).padStart(2, '0')
+      const day = String(date.getDate()).padStart(2, '0')
+      return `${year}-${month}-${day}`
+    },
+    buildDatasetSource(labels = [], chargeData = [], dischargeData = []) {
+      const source = [[TEXT.date, TEXT.charge, TEXT.discharge]]
+      labels.forEach((label, index) => {
+        source.push([
+          label,
+          Number(chargeData[index]?.value || 0),
+          Number(dischargeData[index]?.value || 0)
+        ])
+      })
+      return source
+    },
+    resolveSeriesType(item = {}) {
+      const text = `${item?.name || ''} ${item?.fieldCode || ''}`.toLowerCase()
+      if (text.includes('\u653e') || text.includes('discharge') || text.includes('discharged')) {
+        return 'discharge'
+      }
+      if (text.includes('\u5145') || text.includes('charge') || text.includes('charged')) {
+        return 'charge'
+      }
+      return ''
+    },
+    buildDailyChartData(seriesData = []) {
+      const normalizedRange = this.timeRange || []
+      const startTime = this.parseToTimestamp(this.normalizeDateTime(normalizedRange[0], false))
+      const endTime = this.parseToTimestamp(this.normalizeDateTime(normalizedRange[1], true))
+      if (!startTime || !endTime || endTime < startTime) {
+        return {
+          labels: [],
+          chargeData: [],
+          dischargeData: [],
+          summary: createEmptySummary()
+        }
+      }
+
+      const bucketStarts = []
+      for (let cursor = this.startOfDay(startTime); cursor <= this.startOfDay(endTime); cursor += DAY) {
+        bucketStarts.push(cursor)
+      }
+
+      const chargeMap = {}
+      const dischargeMap = {}
+
+      ;(seriesData || []).forEach(item => {
+        const seriesType = this.resolveSeriesType(item)
+        if (!seriesType) return
+
+        ;(item?.data || []).forEach(([timestamp, pointValue]) => {
+          if (!timestamp || Number.isNaN(pointValue)) return
+          if (timestamp < startTime || timestamp > endTime) return
+
+          const bucketStart = this.startOfDay(timestamp)
+          const normalizedValue = Math.abs(Number(pointValue) || 0)
+          if (seriesType === 'charge') {
+            chargeMap[bucketStart] = (chargeMap[bucketStart] || 0) + normalizedValue
+          } else if (seriesType === 'discharge') {
+            dischargeMap[bucketStart] = (dischargeMap[bucketStart] || 0) + normalizedValue
+          }
+        })
+      })
+
+      const labels = []
+      const chargeData = []
+      const dischargeData = []
+
+      bucketStarts.forEach(bucketStart => {
+        const chargedCap = Number(chargeMap[bucketStart] || 0)
+        const disChargedCap = Number(dischargeMap[bucketStart] || 0)
+
+        labels.push(this.formatDateLabel(bucketStart))
+        chargeData.push({
+          value: chargedCap,
+          bucketStart
+        })
+        dischargeData.push({
+          value: disChargedCap,
+          bucketStart
+        })
+      })
+
+      const totalChargedCap = chargeData.reduce((sum, item) => sum + Number(item.value || 0), 0)
+      const totalDisChargedCap = dischargeData.reduce((sum, item) => sum + Number(item.value || 0), 0)
+      const efficiency = totalChargedCap > 0
+        ? Number(((totalDisChargedCap / totalChargedCap) * 100).toFixed(2))
+        : 0
+
+      return {
+        labels,
+        chargeData,
+        dischargeData,
+        summary: {
+          totalChargedCap,
+          totalDisChargedCap,
+          efficiency
+        }
+      }
+    },
+    renderEmptyState(message = TEXT.empty) {
+      if (!this.chart) return
+      this.chart.clear()
+      this.chart.setOption({
+        graphic: {
+          type: 'text',
+          left: 'center',
+          top: 'middle',
+          style: {
+            text: message,
+            fill: '#909399',
+            fontSize: 14
+          }
+        }
+      })
+    },
+    setOption(seriesData = []) {
+      if (!this.chart) return
+
+      const { labels, chargeData, dischargeData, summary } = this.buildDailyChartData(seriesData)
+      const hasValue = chargeData.some(item => Number(item?.value || 0) > 0) || dischargeData.some(item => Number(item?.value || 0) > 0)
+
+      if (!labels.length || !hasValue) {
+        this.summary = createEmptySummary()
+        this.renderEmptyState()
+        return
+      }
+
+      this.summary = summary
+      const source = this.buildDatasetSource(labels, chargeData, dischargeData)
+
+      this.chart.clear()
+      this.chart.setOption({
+        color: ['#4472c4', '#70ad47'],
         tooltip: {
           trigger: 'axis',
-          axisPointer: { // 坐标轴指示器，坐标轴触发有效
+          axisPointer: {
-            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+            type: 'shadow'
-          }
+          },
-        },
+          formatter: (params = []) => {
-        grid: {
+            if (!params.length) return ''
-          containLabel: true
+            const dataIndex = Number(params[0]?.dataIndex)
+            const bucketStart = chargeData[dataIndex]?.bucketStart
+            const lines = [this.formatTooltipDate(bucketStart)]
+            params.forEach(item => {
+              const rawValue = Array.isArray(item?.value) ? item.value[item.seriesIndex + 1] : item?.value
+              const value = Number(rawValue || 0)
+              lines.push(`${item.marker}${item.seriesName}: ${this.formatNumber(value)}kWh`)
+            })
+            return lines.join('<br/>')
+          },
+          extraCssText: 'max-width: 420px; white-space: normal;'
         },
         legend: {
           left: 'center',
-          bottom: '15',
+          bottom: 15
         },
-        xAxis: {
+        grid: {
-          type: 'category',
+          top: 40,
-          name:unit,
+          containLabel: true,
-          nameLocation:'center'
+          left: 20,
+          right: 20,
+          bottom: 60
         },
         yAxis: [{
           type: 'value',
-          name:'充电量/放电量kWh',
+          name: TEXT.yAxis,
           axisLine: {
-            lineStyle:{
+            lineStyle: {
-              color: '#333333',
+              color: '#333333'
             },
-            onZero:false
+            onZero: false
           }
         }],
-        dataset:{
+        xAxis: [{
+          type: 'category',
+          name: TEXT.xAxis,
+          nameLocation: 'center',
+          nameGap: 30,
+          axisTick: {
+            show: false
+          },
+          axisLabel: {
+            interval: 0
+          }
+        }],
+        dataset: {
           source
         },
         series: [
           {
-            yAxisIndex:0,
+            name: TEXT.charge,
             type: 'bar',
+            color: '#4472c4',
+            barMaxWidth: 22
           },
           {
-            yAxisIndex:0,
+            name: TEXT.discharge,
             type: 'bar',
-          },
+            color: '#70ad47',
+            barMaxWidth: 22
+          }
         ]
       })
     }
   }
 }
 </script>
+
+<style scoped lang="scss">
+.card-main {
+  padding: 0 16px 12px;
+}
+
+.week-chart-canvas {
+  height: 310px;
+}
+</style>

src/views/ems/dzjk/home/index.vue

@@ -1,167 +1,686 @@
 <template>
-  <div v-loading="loading">
+  <div>
     <el-row style="background: #fff" class="row-container" :gutter="15">
-      <el-col v-if="tableData.length > 0" :xs="24" :sm="24" :lg="24">
+      <el-col :xs="24" :sm="24" :lg="5">
-        <alarm-table :tableData="tableData" />
+        <!--      站点信息-->
-      </el-col>
-      <el-col :xs="24" :sm="24" :lg="6">
         <el-card
-          shadow="always"
+            shadow="always"
-          class="common-card-container common-card-container-body-no-padding"
+            class="common-card-container common-card-container-body-no-padding"
         >
           <div slot="header">
             <span class="card-title">站点信息</span>
+            <div class="alarm-msg" v-if="tableData.length > 0" @click="toAlarm">
+              <i class="el-icon-message-solid"></i> 设备告警
+            </div>
           </div>
           <div
-            style="box-sizing: border-box; height: 250px; padding: 20px 15px"
+              style="box-sizing: border-box; height: 218px; padding: 20px 15px"
           >
-            <el-descriptions class="home-normal-info" :column="1">
+            <!--            地址、运行时间-->
-              <el-descriptions-item
+            <div class="site-info site-info-address">
-                size="mini"
+              <div class="title">
-                v-for="(item, index) in singleZdInfo"
+                <i class="el-icon-location"></i>
-                :key="index + 'singleZdInfo'"
+              </div>
-                :label="item.title"
+              <div class="value">
-                >{{ info[item.attr] | formatNumber }}</el-descriptions-item
+                <i v-if="isBaseInfoLoading" class="el-icon-loading"></i>
-              >
+                <span v-else>{{ info.siteAddress || '-' }}</span>
-            </el-descriptions>
+              </div>
-          </div>
+            </div>
-        </el-card>
+            <div class="site-info">
-      </el-col>
+              <div class="title">
-      <el-col :xs="24" :sm="24" :lg="8">
+                <i class="el-icon-date"></i>
-        <el-card
+              </div>
-          shadow="always"
+              <div class="value">
-          class="common-card-container common-card-container-body-no-padding"
+                <i v-if="isBaseInfoLoading" class="el-icon-loading"></i>
-        >
+                <span v-else>{{ info.runningTime || '-' }}</span>
-          <div slot="header">
+              </div>
-            <span class="card-title">总累计运行数据</span>
+            </div>
-          </div>
+            <!--      装机功率、容量      -->
-          <div
+            <el-row :gutter="10" style="margin-top:20px;">
-            style="box-sizing: border-box; height: 250px; padding: 20px 15px"
-          >
-            <el-row :gutter="20">
               <el-col
-                :span="12"
+                  :span="12"
-                v-for="(item, index) in sjglData"
+                  class="sjgl-col power-col"
-                :key="index + 'sjglData'"
-                class="sjgl-data"
               >
-                <div class="sjgl-title">{{ item.title }}</div>
+                <div class="sjgl-wrapper">
-                <div class="sjgl-value">
+                  <div class="sjgl-title">装机功率(MWh)</div>
-                  {{ runningInfo[item.attr] | formatNumber }}
+                  <div class="sjgl-value">
+                    <i v-if="isBaseInfoLoading" class="el-icon-loading"></i>
+                    <span v-else>{{ info.installPower | formatNumber }}</span>
+                  </div>
+                </div>
+              </el-col>
+              <el-col
+                  :span="12"
+                  class="sjgl-col power-col"
+              >
+                <div class="sjgl-wrapper">
+                  <div class="sjgl-title">装机容量(MWh)</div>
+                  <div class="sjgl-value">
+                    <i v-if="isBaseInfoLoading" class="el-icon-loading"></i>
+                    <span v-else>{{ info.installCapacity | formatNumber }}</span>
+                  </div>
                 </div>
               </el-col>
             </el-row>
           </div>
         </el-card>
       </el-col>
-      <el-col :xs="24" :sm="24" :lg="10">
+      <!--      总累计运行数据-->
-        <cl-info :info="runningInfo.strategyTempInfo" />
+      <el-col :xs="24" :sm="24" :lg="19">
+        <el-card
+            shadow="always"
+            class="common-card-container common-card-container-body-no-padding"
+        >
+          <div slot="header">
+            <span class="card-title">总累计运行数据</span>
+            <div class="total-count">
+              <span class="title pointer-field" @click="handleTotalRevenueClick">总收入</span>
+              <span
+                class="value pointer-field"
+                :class="{ 'field-disabled': !hasPointId(totalRevenueDisplayItem) }"
+                @click="handleTotalRevenueClick"
+              >
+                <i v-if="isRunningInfoLoading" class="el-icon-loading"></i>
+                <span v-else>{{ totalRevenueDisplayValue | formatNumber }}</span>
+              </span>
+              <span class="unit">元</span>
+            </div>
+          </div>
+          <div
+              style="box-sizing: border-box; height: 218px; padding: 20px 15px"
+          >
+            <el-row :gutter="10">
+              <el-col
+                  :span="6"
+                  v-for="(item, index) in runningDataCards"
+                  :key="index + 'sjglData'"
+                  class="sjgl-col"
+              >
+                <div
+                  class="sjgl-wrapper pointer-field"
+                  :class="{ 'field-disabled': !hasPointId(item.raw) }"
+                  @click="handleRunningFieldClick(item)"
+                >
+                  <div class="sjgl-title">{{ item.title }}</div>
+                  <div class="sjgl-value" :style="{color:item.color}">
+                    <i v-if="item.loading" class="el-icon-loading"></i>
+                    <span v-else>{{ item.value | formatNumber }}</span>
+                  </div>
+                </div>
+              </el-col>
+            </el-row>
+          </div>
+        </el-card>
       </el-col>
-      <el-col :xs="24" :sm="24" :lg="24">
+      <el-col :xs="24" :sm="24" :lg="12">
-        <week-chart ref="weekChart" />
+        <week-chart ref="weekChart" :display-data="runningDisplayData"/>
       </el-col>
-      <el-col :xs="24" :sm="24" :lg="24">
+      <el-col :xs="24" :sm="24" :lg="12">
-        <active-chart ref="activeChart" />
+        <active-chart ref="activeChart" :display-data="runningDisplayData"/>
       </el-col>
     </el-row>
+
+    <el-dialog
+      :visible.sync="curveDialogVisible"
+      :title="curveDialogTitle"
+      width="1000px"
+      append-to-body
+      class="ems-dialog"
+      :close-on-click-modal="false"
+      destroy-on-close
+      @opened="handleCurveDialogOpened"
+      @closed="handleCurveDialogClosed"
+    >
+      <div class="curve-tools">
+        <el-date-picker
+          v-model="curveCustomRange"
+          type="datetimerange"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          range-separator="至"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          style="width: 440px"
+        />
+        <el-button type="primary" size="mini" :loading="curveLoading" @click="loadCurveData">查询</el-button>
+      </div>
+      <div v-loading="curveLoading" ref="curveChartRef" style="height: 380px;"></div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { getSingleSiteBaseInfo } from "@/api/ems/zddt";
+import * as echarts from "echarts";
-import { getDzjkHomeView } from "@/api/ems/dzjk";
+import {getSingleSiteBaseInfo} from "@/api/ems/zddt";
+import {getAmmeterData, getDzjkHomeTotalView, getProjectDisplayData} from "@/api/ems/dzjk";
+import {getPointConfigCurve} from "@/api/ems/site";
 import WeekChart from "./WeekChart.vue";
 import ActiveChart from "./ActiveChart.vue";
 import AlarmTable from "./AlarmTable.vue";
 import ClInfo from "./ClInfo.vue";
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import intervalUpdate from "@/mixins/ems/intervalUpdate";
+
 export default {
   name: "DzjkSbjkHome",
-  components: { WeekChart, ActiveChart, AlarmTable, ClInfo },
+  components: {WeekChart, ActiveChart, AlarmTable, ClInfo},
   mixins: [getQuerySiteId, intervalUpdate],
   data() {
     return {
       loading: false,
-      singleZdInfo: [
+      baseInfoLoading: false,
-        {
+      runningInfoLoading: false,
-          title: "电站位置",
+      runningUpdateSpinning: false,
-          attr: "siteAddress",
+      runningUpdateTimer: null,
-        },
+      curveDialogVisible: false,
-        {
+      curveDialogTitle: "点位曲线",
-          title: "投运时间",
+      curveChart: null,
-          attr: "runningTime",
+      curveLoading: false,
-        },
+      curveCustomRange: [],
-        {
+      curveQuery: {
-          title: "装机功率(MW)",
+        siteId: "",
-          attr: "installPower",
+        pointId: "",
-        },
+        pointType: "data",
-        {
+        rangeType: "custom",
-          title: "装机容量(MW)",
+        startTime: "",
-          attr: "installCapacity",
+        endTime: "",
-        },
+      },
-      ],
+      fallbackSjglData: [
-      sjglData: [
         {
           title: "今日充电量（kWh）",
           attr: "dayChargedCap",
+          color: '#4472c4'
         },
         {
           title: "今日放电量（kWh）",
           attr: "dayDisChargedCap",
+          color: '#70ad47'
         },
         {
           title: "总充电量（kWh）",
           attr: "totalChargedCap",
+          color: '#4472c4'
+        },
+        {
+          title: "今日实时收入（元）",
+          attr: "dayRevenue",
+          color: '#f67438'
+        },
+        {
+          title: "昨日充电量（kWh）",
+          attr: "yesterdayChargedCap",
+          color: '#4472c4'
+        },
+        {
+          title: "昨日放电量（kWh）",
+          attr: "yesterdayDisChargedCap",
+          color: '#70ad47'
         },
         {
           title: "总放电量（kWh）",
           attr: "totalDischargedCap",
+          color: '#70ad47'
         },
         {
-          title: "总收入（元）",
+          title: "昨日实时收入（元）",
-          attr: "totalRevenue",
+          attr: "yesterdayRevenue",
-        },
+          color: '#f67438'
-        {
-          title: "当日实时收入（元）",
-          attr: "dayRevenue",
         },
       ],
       info: {}, //基本信息
       runningInfo: {}, //总累计运行数据+报警表格
+      runningDisplayData: [], //单站监控项目配置展示数据
+      ammeterDailySummary: {},
     };
   },
   computed: {
+    isBaseInfoLoading() {
+      return false;
+    },
+    isRunningInfoLoading() {
+      const state = this.$data || {};
+      return !!(state.runningInfoLoading || state.runningUpdateSpinning || state.loading);
+    },
     tableData() {
-      console.log(
-        "this.runningInfo?.siteMonitorHomeAlarmVo ",
-        this.runningInfo?.siteMonitorHomeAlarmVo
-      );
       return this.runningInfo?.siteMonitorHomeAlarmVo || [];
     },
+    totalRunningSectionData() {
+      return (this.runningDisplayData || []).filter(item => item.sectionName === "总累计运行数据");
+    },
+    totalRevenueDisplayItem() {
+      const sectionData = this.totalRunningSectionData || [];
+      const byFieldCode = sectionData.find(item => item.fieldCode === "totalRevenue");
+      if (byFieldCode) {
+        return byFieldCode;
+      }
+      return sectionData.find(item => item.fieldName === "总收入");
+    },
+    totalRevenueDisplayValue() {
+      return this.totalRevenueDisplayItem ? this.totalRevenueDisplayItem.fieldValue : this.runningInfo.totalRevenue;
+    },
+    runningDataCards() {
+      const sectionData = this.totalRunningSectionData || [];
+      if (sectionData.length > 0) {
+        const revenueFieldCode = this.totalRevenueDisplayItem ? this.totalRevenueDisplayItem.fieldCode : "";
+        return sectionData
+            .filter(item => item.fieldCode !== revenueFieldCode)
+            .map((item, index) => ({
+              title: item.fieldName,
+              value: this.getRunningCardValue(item),
+              color: this.getCardColor(index),
+              loading: this.isRunningInfoLoading,
+              raw: item,
+            }));
+      }
+      return this.fallbackSjglData.map(item => ({
+        title: item.title,
+        value: this.getRunningCardValue(item),
+        color: item.color,
+        loading: this.isRunningInfoLoading,
+        raw: item,
+      }));
+    },
+  },
+  beforeDestroy() {
+    if (this.runningUpdateTimer) {
+      clearTimeout(this.runningUpdateTimer);
+      this.runningUpdateTimer = null;
+    }
+    if (this.curveChart) {
+      this.curveChart.dispose();
+      this.curveChart = null;
+    }
   },
   methods: {
+    hasPointId(item) {
+      return !!String(item?.dataPoint || "").trim();
+    },
+    handleTotalRevenueClick() {
+      const item = this.totalRevenueDisplayItem;
+      const pointId = String(item?.dataPoint || "").trim();
+      if (!pointId) {
+        this.$message.warning("该字段未配置点位，无法查询曲线");
+        return;
+      }
+      this.openCurveDialog({
+        pointId,
+        title: item?.fieldName || "总收入",
+      });
+    },
+    handleRunningFieldClick(card) {
+      const item = card?.raw || {};
+      const pointId = String(item?.dataPoint || "").trim();
+      if (!pointId) {
+        this.$message.warning("该字段未配置点位，无法查询曲线");
+        return;
+      }
+      this.openCurveDialog({
+        pointId,
+        title: card?.title || item?.fieldName || item?.fieldCode || pointId,
+      });
+    },
+    openCurveDialog({pointId, title}) {
+      const range = this.getDefaultCurveRange();
+      this.curveCustomRange = range;
+      this.curveDialogTitle = `点位曲线 - ${title || pointId}`;
+      this.curveQuery = {
+        siteId: this.siteId,
+        pointId,
+        pointType: "data",
+        rangeType: "custom",
+        startTime: range[0],
+        endTime: range[1],
+      };
+      this.curveDialogVisible = true;
+    },
+    handleCurveDialogOpened() {
+      if (!this.curveChart && this.$refs.curveChartRef) {
+        this.curveChart = echarts.init(this.$refs.curveChartRef);
+      }
+      this.loadCurveData();
+    },
+    handleCurveDialogClosed() {
+      if (this.curveChart) {
+        this.curveChart.dispose();
+        this.curveChart = null;
+      }
+      this.curveLoading = false;
+    },
+    getDefaultCurveRange() {
+      const end = new Date();
+      const start = new Date(end.getTime() - 24 * 60 * 60 * 1000);
+      return [this.formatDateTime(start), this.formatDateTime(end)];
+    },
+    formatDateTime(date) {
+      const d = new Date(date);
+      const pad = (num) => String(num).padStart(2, "0");
+      return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`;
+    },
+    formatCurveTime(value) {
+      if (value === undefined || value === null || value === "") {
+        return "";
+      }
+      const raw = String(value).trim();
+      const normalized = raw
+        .replace("T", " ")
+        .replace(/\.\d+/, "")
+        .replace(/Z$/, "")
+        .replace(/([+-]\d{2}:?\d{2})$/, "")
+        .trim();
+      const matched = normalized.match(/^(\d{4}-\d{2}-\d{2})\s+(\d{2}:\d{2})/);
+      if (matched) {
+        return `${matched[1]} ${matched[2]}`;
+      }
+      return normalized.slice(0, 16);
+    },
+    loadCurveData() {
+      if (!this.curveQuery.siteId || !this.curveQuery.pointId) {
+        this.$message.warning("点位信息不完整，无法查询曲线");
+        return;
+      }
+      if (!this.curveCustomRange || this.curveCustomRange.length !== 2) {
+        this.$message.warning("请选择查询时间范围");
+        return;
+      }
+      this.curveQuery.startTime = this.curveCustomRange[0];
+      this.curveQuery.endTime = this.curveCustomRange[1];
+      const query = {
+        siteId: this.curveQuery.siteId,
+        pointId: this.curveQuery.pointId,
+        pointType: "data",
+        rangeType: "custom",
+        startTime: this.curveQuery.startTime,
+        endTime: this.curveQuery.endTime,
+      };
+      this.curveLoading = true;
+      getPointConfigCurve(query).then((response) => {
+        const rows = response?.data || [];
+        this.renderCurveChart(rows);
+      }).catch(() => {
+        this.renderCurveChart([]);
+      }).finally(() => {
+        this.curveLoading = false;
+      });
+    },
+    renderCurveChart(rows = []) {
+      if (!this.curveChart) return;
+      const xData = rows.map(item => this.formatCurveTime(item.dataTime));
+      const yData = rows.map(item => item.pointValue);
+      this.curveChart.clear();
+      this.curveChart.setOption({
+        legend: {},
+        grid: {
+          containLabel: true,
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            type: "cross",
+          },
+        },
+        textStyle: {
+          color: "#333333",
+        },
+        xAxis: {
+          type: "category",
+          data: xData,
+        },
+        yAxis: {
+          type: "value",
+        },
+        dataZoom: [
+          {
+            type: "inside",
+            start: 0,
+            end: 100,
+          },
+          {
+            start: 0,
+            end: 100,
+          },
+        ],
+        series: [
+          {
+            name: this.curveDialogTitle,
+            type: "line",
+            data: yData,
+            connectNulls: true,
+          },
+        ],
+      });
+      if (!rows.length) {
+        this.$message.warning("当前时间范围暂无曲线数据");
+      }
+    },
+    setBaseInfoLoading(loading) {
+      if (Object.prototype.hasOwnProperty.call(this.$data, "baseInfoLoading")) {
+        this.baseInfoLoading = loading;
+        return;
+      }
+      this.$set(this.$data, "baseInfoLoading", loading);
+    },
+    setRunningInfoLoading(loading) {
+      if (Object.prototype.hasOwnProperty.call(this.$data, "runningInfoLoading")) {
+        this.runningInfoLoading = loading;
+        return;
+      }
+      this.$set(this.$data, "runningInfoLoading", loading);
+    },
+    getCardColor(index) {
+      const colors = ['#4472c4', '#70ad47', '#4472c4', '#f67438', '#4472c4', '#70ad47', '#70ad47', '#f67438'];
+      return colors[index % colors.length];
+    },
+    formatDateOnly(date) {
+      const value = new Date(date);
+      if (isNaN(value.getTime())) {
+        return "";
+      }
+      const pad = (num) => String(num).padStart(2, "0");
+      return `${value.getFullYear()}-${pad(value.getMonth() + 1)}-${pad(value.getDate())}`;
+    },
+    normalizeDateOnly(value) {
+      if (!value) {
+        return "";
+      }
+      const raw = String(value).trim();
+      const matched = raw.match(/\d{4}-\d{2}-\d{2}/);
+      if (matched) {
+        return matched[0];
+      }
+      return this.formatDateOnly(raw);
+    },
+    toDisplayNumber(value) {
+      if (value === null || value === undefined || value === "") {
+        return value;
+      }
+      const num = Number(value);
+      return Number.isNaN(num) ? value : num;
+    },
+    getAmmeterSummaryAttr(item) {
+      const fieldCode = String(item?.fieldCode || item?.attr || "").trim();
+      const fieldName = String(item?.fieldName || item?.title || "").trim();
+      if (["dayChargedCap", "今日充电量（kWh）"].includes(fieldCode) || fieldName === "今日充电量（kWh）") {
+        return "dayChargedCap";
+      }
+      if (["dayDisChargedCap", "今日放电量（kWh）"].includes(fieldCode) || fieldName === "今日放电量（kWh）") {
+        return "dayDisChargedCap";
+      }
+      if (["yesterdayChargedCap", "昨日充电量（kWh）"].includes(fieldCode) || fieldName === "昨日充电量（kWh）") {
+        return "yesterdayChargedCap";
+      }
+      if (["yesterdayDisChargedCap", "昨日放电量（kWh）"].includes(fieldCode) || fieldName === "昨日放电量（kWh）") {
+        return "yesterdayDisChargedCap";
+      }
+      if (["totalChargedCap", "总充电量（kWh）"].includes(fieldCode) || fieldName === "总充电量（kWh）") {
+        return "totalChargedCap";
+      }
+      if (["totalDischargedCap", "总放电量（kWh）"].includes(fieldCode) || fieldName === "总放电量（kWh）") {
+        return "totalDischargedCap";
+      }
+      return "";
+    },
+    getRunningCardValue(item) {
+      const summaryAttr = this.getAmmeterSummaryAttr(item);
+      if (summaryAttr) {
+        const summaryValue = this.ammeterDailySummary?.[summaryAttr];
+        if (summaryValue !== undefined && summaryValue !== null && summaryValue !== "") {
+          return summaryValue;
+        }
+      }
+      const rawValue = item?.fieldValue !== undefined ? item.fieldValue : this.runningInfo?.[item?.attr];
+      return this.toDisplayNumber(rawValue);
+    },
+    queryAllAmmeterDailyRows({ startTime = "", endTime = "", pageSize = 500, pageNum = 1, rows = [] } = {}) {
+      return getAmmeterData({
+        siteId: this.siteId,
+        startTime,
+        endTime,
+        pageSize,
+        pageNum,
+      }).then((response) => {
+        const currentRows = Array.isArray(response?.rows) ? response.rows : [];
+        const allRows = rows.concat(currentRows);
+        const total = Number(response?.total) || 0;
+        if (allRows.length >= total || currentRows.length < pageSize) {
+          return allRows;
+        }
+        return this.queryAllAmmeterDailyRows({
+          startTime,
+          endTime,
+          pageSize,
+          pageNum: pageNum + 1,
+          rows: allRows,
+        });
+      });
+    },
+    getAmmeterDailySummary() {
+      const today = new Date();
+      const yesterday = new Date(today);
+      yesterday.setDate(yesterday.getDate() - 1);
+      const startTime = this.formatDateOnly(yesterday);
+      const endTime = this.formatDateOnly(today);
+      return Promise.all([
+        this.queryAllAmmeterDailyRows({
+          startTime,
+          endTime,
+          pageSize: 20,
+          pageNum: 1,
+        }),
+        this.queryAllAmmeterDailyRows(),
+      ]).then(([recentRows, allRows]) => {
+        const rowMap = recentRows.reduce((result, row) => {
+          const dateKey = this.normalizeDateOnly(row?.dataTime);
+          if (dateKey) {
+            result[dateKey] = row;
+          }
+          return result;
+        }, {});
+        const todayKey = this.formatDateOnly(today);
+        const yesterdayKey = this.formatDateOnly(yesterday);
+        const todayRow = rowMap[todayKey] || {};
+        const yesterdayRow = rowMap[yesterdayKey] || {};
+        const totalChargedCap = allRows.reduce((result, row) => {
+          return result + (Number(row?.activeTotalKwh) || 0);
+        }, 0);
+        const totalDischargedCap = allRows.reduce((result, row) => {
+          return result + (Number(row?.reActiveTotalKwh) || 0);
+        }, 0);
+        return {
+          dayChargedCap: this.toDisplayNumber(todayRow.activeTotalKwh),
+          dayDisChargedCap: this.toDisplayNumber(todayRow.reActiveTotalKwh),
+          yesterdayChargedCap: this.toDisplayNumber(yesterdayRow.activeTotalKwh),
+          yesterdayDisChargedCap: this.toDisplayNumber(yesterdayRow.reActiveTotalKwh),
+          totalChargedCap: this.toDisplayNumber(totalChargedCap),
+          totalDischargedCap: this.toDisplayNumber(totalDischargedCap),
+        };
+      }).catch(() => ({}));
+    },
+    toAlarm() {
+      this.$router.push({path: "/dzjk/gzgj", query: this.$route.query});
+    },
     getBaseInfo() {
       return getSingleSiteBaseInfo(this.siteId).then((response) => {
         this.info = response?.data || {};
       });
     },
     getRunningInfo() {
-      return getDzjkHomeView(this.siteId).then((response) => {
+      const hasOldData = Object.keys(this.runningInfo || {}).length > 0 || (this.runningDisplayData || []).length > 0;
-        this.runningInfo = response?.data || {};
+      if (!hasOldData) {
+        this.setRunningInfoLoading(true);
+      }
+      return Promise.all([
+        getDzjkHomeTotalView(this.siteId),
+        getProjectDisplayData(this.siteId),
+        this.getAmmeterDailySummary(),
+      ]).then(([homeResponse, displayResponse, ammeterDailySummary]) => {
+        const nextRunningInfo = homeResponse?.data || {};
+        const nextRunningDisplayData = displayResponse?.data || [];
+        const changed = hasOldData && this.hasTotalRunningChanged(nextRunningInfo, nextRunningDisplayData, ammeterDailySummary || {});
+        this.runningInfo = nextRunningInfo;
+        this.runningDisplayData = nextRunningDisplayData;
+        this.ammeterDailySummary = ammeterDailySummary || {};
+        if (changed) {
+          this.triggerRunningUpdateSpinner();
+        }
+      }).finally(() => {
+        if (!hasOldData) {
+          this.setRunningInfoLoading(false);
+        }
       });
     },
+    triggerRunningUpdateSpinner() {
+      if (this.runningUpdateTimer) {
+        clearTimeout(this.runningUpdateTimer);
+      }
+      this.runningUpdateSpinning = true;
+      this.runningUpdateTimer = setTimeout(() => {
+        this.runningUpdateSpinning = false;
+        this.runningUpdateTimer = null;
+      }, 800);
+    },
+    hasTotalRunningChanged(nextRunningInfo, nextRunningDisplayData, nextAmmeterDailySummary = {}) {
+      const oldSnapshot = this.getTotalRunningSnapshot(this.runningInfo, this.runningDisplayData, this.ammeterDailySummary || {});
+      const newSnapshot = this.getTotalRunningSnapshot(nextRunningInfo, nextRunningDisplayData, nextAmmeterDailySummary);
+      return JSON.stringify(oldSnapshot) !== JSON.stringify(newSnapshot);
+    },
+    getTotalRunningSnapshot(runningInfo, runningDisplayData, ammeterDailySummary = {}) {
+      const snapshot = {};
+      const sectionData = (runningDisplayData || []).filter(item => item.sectionName === "总累计运行数据");
+      if (sectionData.length > 0) {
+        sectionData.forEach(item => {
+          const key = item.fieldCode || item.fieldName;
+          if (!key) return;
+          const summaryAttr = this.getAmmeterSummaryAttr(item);
+          const value = summaryAttr ? ammeterDailySummary?.[summaryAttr] : item.fieldValue;
+          snapshot[`cfg:${key}`] = this.normalizeRunningCompareValue(value);
+        });
+        return snapshot;
+      }
+      this.fallbackSjglData.forEach(item => {
+        const summaryAttr = this.getAmmeterSummaryAttr(item);
+        const value = summaryAttr
+          ? ammeterDailySummary?.[summaryAttr]
+          : runningInfo?.[item.attr];
+        snapshot[`fallback:${item.attr}`] = this.normalizeRunningCompareValue(value);
+      });
+      snapshot["fallback:totalRevenue"] = this.normalizeRunningCompareValue(runningInfo?.totalRevenue);
+      return snapshot;
+    },
+    normalizeRunningCompareValue(value) {
+      if (value === null || value === undefined) return "";
+      if (typeof value === "number") return Number.isNaN(value) ? "" : value;
+      const text = String(value).trim();
+      if (text === "") return "";
+      const num = Number(text);
+      return Number.isNaN(num) ? text : num;
+    },
     init() {
-      this.loading = true;
       // 功率曲线
       this.$refs.activeChart.init(this.siteId);
       // 一周冲放曲线
       this.$refs.weekChart.init(this.siteId);
       // 静态信息  this.getBaseInfo()
       // 总累计运行数据+故障告警 this.getRunningInfo()
-      Promise.all([this.getBaseInfo(), this.getRunningInfo()]).finally(() => {
+      Promise.all([this.getBaseInfo(), this.getRunningInfo()]);
-        this.loading = false;
-      });
       // 一分钟循环一次总累计运行数据
       this.updateInterval(this.getRunningInfo);
     },
@@ -170,6 +689,89 @@ export default {
 </script>
 
 <style scoped lang="scss">
+//设备告警
+.alarm-msg {
+  background: #ff4949;
+  padding: 2px 5px;
+  font-size: 10px;
+  font-weight: bolder;
+  border-radius: 3px;
+  line-height: 20px;
+  cursor: pointer;
+  color: #fff;
+  position: absolute;
+  right: 10px;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+//基本信息-地址 运行️时间
+.site-info {
+  display: flex;
+  font-size: 12px;
+  line-height: 20px;
+  margin-bottom: 10px;
+  align-items: center;
+
+  &.site-info-address {
+    height: 40px;
+  }
+
+  .title {
+    color: #1791ff;
+    font-size: 18px;
+    line-height: 20px;
+    margin-right: 7px;
+  }
+
+  .value {
+    color: #000;
+    font-size: 12px;
+    max-height: 40px;
+    overflow: hidden;
+  }
+}
+
+//总收入
+.total-count {
+  position: absolute;
+  right: 10px;
+  top: 50%;
+  transform: translateY(-50%);
+  font-size: 12px;
+  font-weight: bolder;
+  color: #333;
+  line-height: 14px;
+
+  .unit {
+    font-style: italic;
+  }
+
+  .value {
+    font-size: 22px;
+    font-weight: bolder;
+    color: #ed2f1d;
+    font-style: italic;
+    padding: 0 5px;
+  }
+}
+
+.pointer-field {
+  cursor: pointer;
+}
+
+.field-disabled {
+  cursor: not-allowed;
+  opacity: 0.75;
+}
+
+.curve-tools {
+  margin-bottom: 10px;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
 .row-container {
   & > .el-col {
     margin-bottom: 20px;
@@ -177,25 +779,47 @@ export default {
 }
 
 //数据概览
-.sjgl-data {
+.sjgl-col {
-  text-align: center;
+  .sjgl-wrapper {
-  &:nth-child(1),
+    text-align: left;
+    padding: 15px 20px;
+    background-color: #f2f7fb;
+  }
+
+  &.power-col {
+    .sjgl-wrapper {
+      padding: 10px;
+
+      .sjgl-value {
+        color: #c44444;
+      }
+    }
+  }
+
+  &:nth-child(4),
   &:nth-child(2),
   &:nth-child(3),
   &:nth-child(4) {
-    margin-bottom: 25px;
+    margin-bottom: 10px;
   }
+
   .sjgl-title {
-    color: #666666;
+    color: #717171;
     line-height: 14px;
+    font-weight: bold;
   }
+
   .sjgl-value {
     color: rgba(51, 51, 51, 1);
-    font-size: 26px;
+    font-size: 22px;
     line-height: 26px;
-    font-weight: 500;
+    font-weight: bolder;
+    font-style: italic;
     margin-top: 14px;
-    word-wrap: break-word;
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
   }
 }
 </style>
@@ -203,10 +827,12 @@ export default {
 <style lang="scss">
 .home-normal-info {
   font-size: 12px;
+
   .el-descriptions-item__container {
     .el-descriptions-item__label {
       color: #666666;
     }
+
     .el-descriptions-item__content {
       color: #333333;
     }

src/views/ems/dzjk/index.vue

@@ -2,7 +2,6 @@
 
 <template>
   <div class="ems-dashboard-editor-container">
-  <zd-select :get-list-by-store="true" :default-site-id="$route.query.siteId" @submitSite="submitSite"/>
   <el-menu
     class="ems-second-menu"
     :default-active="$route.meta.activeSecondMenuName"
@@ -28,11 +27,8 @@
 <script>
 import { dzjk } from '@/router/ems'
 const childrenRoute = dzjk[0].children[0].children//获取到单站监控下面的字路由
-console.log('childrenRoute',childrenRoute)
-import ZdSelect from '@/components/Ems/ZdSelect/index.vue'
 import {mapState} from "vuex";
 export default {
-  components:{ZdSelect},
   data(){
     return {
       childrenRoute,
@@ -44,18 +40,6 @@ export default {
       dzjkAlarmLighting:state=>state.ems.dzjkAlarmLighting
     })
   },
-  methods:{
-    submitSite(id){
-      if(id !== this.$route.query.siteId){
-        // console.log('单站监控选择了其他的站点id=',id,'并更新页面地址参数')
-        this.$router.push({query:{...this.$route.query,siteId:id}})
-      }else{
-        // console.log('单站监控选择了相同的其他的站点id=',id,'页面地址不发生改变')
-      }
-      //获取告警列表数据
-      this.$store.dispatch('getSiteAlarmNum',id)
-    }
-  },
   beforeRouteLeave(to,from, next){
     //从单站监控下面的所有子页面跳出时会触发
     // 清空store中的zdList 保障下次进入到单站监控会重新调用接口获取数据
@@ -66,6 +50,9 @@ export default {
 </script>
 
 <style scoped lang="scss">
+  .ems-dashboard-editor-container{
+    padding-top: 12px;
+  }
   .dzjk-ems-content-container{
     margin-top:0;
     min-height: 60vh;

src/views/ems/dzjk/sbjk/RealTimeBaseInfo.vue

@@ -2,8 +2,14 @@
 <template>
   <!--  6个方块-->
   <el-row :gutter="10">
-    <el-col :xs="12" :sm="8" :lg="4" style="margin-bottom: 10px;" class="single-square-box-container" v-for="(item,index) in singleZdSqaure" :key="index+'singleSquareBox'">
+    <el-col :xs="12" :sm="8" :lg="4" style="margin-bottom: 10px;" class="single-square-box-container" v-for="(item,index) in displaySquares" :key="index+'singleSquareBox'">
-      <single-square-box :data="{...item,value:formatNumber(data[item.attr])}" ></single-square-box>
+      <div
+        class="square-click-wrapper"
+        :class="{ 'field-disabled': !item.pointId }"
+        @click="handleSquareClick(item)"
+      >
+        <single-square-box :data="{...item,value:item.value,loading:item.valueLoading}" ></single-square-box>
+      </div>
     </el-col>
   </el-row>
 </template>
@@ -11,52 +17,74 @@
 
 <script>
 import SingleSquareBox from "@/components/Ems/SingleSquareBox/index.vue";
-import {formatNumber} from '@/filters/ems'
 export default {
   components:{SingleSquareBox},
   props:{
-    data:{
+    displayData: {
-      type:Object,
+      type: Array,
-      required:false,
+      required: false,
-      default:()=>{return {}}
+      default: () => [],
+    },
+    loading: {
+      type: Boolean,
+      required: false,
+      default: false,
     },
   },
-  methods:{formatNumber},
+  computed: {
-  data() {
+    displaySquares() {
-    return {
+      const sourceList = (this.displayData || []).filter((item) => {
-      // 单个电站 四个方块数据
+        if (!item) return false;
-      singleZdSqaure:[{
+        return item.menuCode === "SBJK_SSYX" || item.sectionName === "运行概览";
-        title:'实时有功功率（kW）',
+      });
-        value:'',
+      const sourceMap = {};
-        bgColor:'#FFF2CB',
+      sourceList.forEach((item) => {
-        attr:'totalActivePower'
+        if (!item) return;
-      },{
+        const key = this.getFieldName(item.fieldCode);
-        title:'实时无功功率（kVar）',
+        if (key) {
-        value:'',
+          sourceMap[key] = item;
-        bgColor:'#CBD6FF',
+        }
-        attr:'totalReactivePower'
+      });
-      },{
+      const defaults = [
-        title:'电池堆SOC',
+        {fieldCode: "totalActivePower", fieldName: "实时有功功率（kW）"},
-        value:'',
+        {fieldCode: "totalReactivePower", fieldName: "实时无功功率（kVar）"},
-        bgColor:'#DCCBFF',
+        {fieldCode: "soc", fieldName: "电池堆SOC"},
-        attr:'soc'
+        {fieldCode: "soh", fieldName: "电池堆SOH"},
-      },{
+        {fieldCode: "dayChargedCap_rt", fieldName: "今日充电量（kWh）"},
-        title:'电池堆SOH',
+        {fieldCode: "dayDisChargedCap_rt", fieldName: "今日放电量（kWh）"},
-        value:'',
+      ];
-        bgColor:'#FFD4CB',
+      return defaults.map((def, index) => {
-        attr:'soh'
+        const row = sourceMap[def.fieldCode] || {};
-      },{
+        const pointId = String(row.dataPoint || "").trim();
-        title:'今日充电量（kWh）',
+        return {
-        value:'',
+          title: row.fieldName || def.fieldName,
-        bgColor:'#FFD6F8',
+          value: row.fieldValue,
-        attr:'dayChargedCap'
+          valueLoading: this.loading && this.isEmptyValue(row.fieldValue),
-      },{
+          bgColor: this.getBgColor(index),
-        title:'今日放电量（kWh）',
+          pointId,
-        value:'',
+          fieldCode: row.fieldCode || def.fieldCode,
-        bgColor:'#E1FFCA',
+          raw: row,
-        attr:'dayDisChargedCap'
+        };
-      }]
+      });
-    }
+    },
+  },
+  methods: {
+    handleSquareClick(item) {
+      this.$emit("field-click", item || {});
+    },
+    getFieldName(fieldCode) {
+      const raw = String(fieldCode || "").trim();
+      if (!raw) return "";
+      const index = raw.lastIndexOf("__");
+      return index >= 0 ? raw.slice(index + 2) : raw;
+    },
+    getBgColor(index) {
+      const bgColors = ['#FFF2CB', '#CBD6FF', '#DCCBFF', '#FFD4CB', '#FFD6F8', '#E1FFCA'];
+      return bgColors[index % bgColors.length];
+    },
+    isEmptyValue(value) {
+      return value === undefined || value === null || value === "" || value === "-";
+    },
   },
 
 }
@@ -70,4 +98,13 @@ export default {
     width: fit-content;
   }
 }
+
+.square-click-wrapper {
+  cursor: pointer;
+}
+
+.square-click-wrapper.field-disabled {
+  cursor: not-allowed;
+  opacity: 0.8;
+}
 </style>

src/views/ems/dzjk/sbjk/bmsdcc/index.vue

@@ -1,15 +1,36 @@
 <template>
-  <div v-loading="loading">
+  <div>
-    <div v-for="(baseInfo,index) in baseInfoList" :key="index+'bmsdccContainer'" style="margin-bottom:25px;">
+    <div class="pcs-tags">
+      <el-tag
+        size="small"
+        :type="selectedClusterId ? 'info' : 'primary'"
+        :effect="selectedClusterId ? 'plain' : 'dark'"
+        class="pcs-tag-item"
+        @click="handleTagClick('')"
+      >
+        全部
+      </el-tag>
+      <el-tag
+        v-for="(item, index) in clusterDeviceList"
+        :key="index + 'clusterTag'"
+        size="small"
+        :type="selectedClusterId === (item.deviceId || item.id) ? 'primary' : 'info'"
+        :effect="selectedClusterId === (item.deviceId || item.id) ? 'dark' : 'plain'"
+        class="pcs-tag-item"
+        @click="handleTagClick(item.deviceId || item.id || '')"
+      >
+        {{ item.deviceName || item.name || item.deviceId || item.id || 'BMS电池簇' }}
+      </el-tag>
+    </div>
+    <div v-for="(baseInfo,index) in filteredBaseInfoList" :key="index+'bmsdccContainer'" style="margin-bottom:25px;">
       <el-card shadow="always"
                class="sbjk-card-container common-card-container-body-no-padding common-card-container-no-title-bg"
-               :class="{
+               :class="handleCardClass(baseInfo)">
-        'warning-card-container':baseInfo.workStatus && baseInfo.workStatus !== '0',
-        'running-card-container':baseInfo.workStatus === '0'
-      }">
         <div slot="header">
           <span
-              class="large-title">{{ baseInfo.parentDeviceName ? `${baseInfo.parentDeviceName} -> ` : '' }}{{ baseInfo.deviceName }}</span>
+              class="large-title">{{
+              baseInfo.parentDeviceName ? `${baseInfo.parentDeviceName} -> ` : ''
+            }}{{ baseInfo.deviceName }}</span>
           <div class="info">
             <div>数据更新时间：{{ baseInfo.dataUpdateTime || '-' }}</div>
           </div>
@@ -17,7 +38,7 @@
             <el-button type="primary" round size="small" style="margin-right:20px;"
                        @click="pointDetail(baseInfo,'point')">详细
             </el-button>
-            <el-badge :value="baseInfo.alarmNum || 0" class="item">
+            <el-badge :hidden="!baseInfo.alarmNum" :value="baseInfo.alarmNum || 0" class="item">
               <i
                   class="el-icon-message-solid alarm-icon"
                   @click="pointDetail(baseInfo,'alarmPoint')"
@@ -27,18 +48,36 @@
         </div>
         <div class="descriptions-main">
           <el-descriptions direction="vertical" :column="3" :colon="false">
-            <el-descriptions-item labelClassName="descriptions-label"
+            <el-descriptions-item
-                                  :contentClassName="`descriptions-direction ${baseInfo.workStatus === '0' ? 'save' :'danger'}`"
+                contentClassName="descriptions-direction work-status"
-                                  :span="1" label="工作状态">
+                :span="1" label="工作状态">
-              {{ $store.state.ems.workStatusOptions[baseInfo.workStatus] }}
+              <span
+                class="pointer"
+                :class="{ 'field-disabled': !hasFieldPointId(baseInfo, 'workStatus') }"
+                @click="handleFieldClick(baseInfo, 'workStatus', '工作状态')"
+              >
+                {{ formatDictValue(clusterWorkStatusOptions, baseInfo.workStatus) }}
+              </span>
             </el-descriptions-item>
-            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"
+            <el-descriptions-item contentClassName="descriptions-direction"
                                   :span="1" label="与PCS通信">
-              {{ $store.state.ems.communicationStatusOptions[baseInfo.pcsCommunicationStatus] }}
+              <span
+                class="pointer"
+                :class="{ 'field-disabled': !hasFieldPointId(baseInfo, 'pcsCommunicationStatus') }"
+                @click="handleFieldClick(baseInfo, 'pcsCommunicationStatus', '与PCS通信')"
+              >
+                {{ formatDictValue(clusterPcsCommunicationStatusOptions, baseInfo.pcsCommunicationStatus) }}
+              </span>
             </el-descriptions-item>
-            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"
+            <el-descriptions-item contentClassName="descriptions-direction"
                                   :span="1" label="与EMS通信">
-              {{ $store.state.ems.communicationStatusOptions[baseInfo.emsCommunicationStatus] }}
+              <span
+                class="pointer"
+                :class="{ 'field-disabled': !hasFieldPointId(baseInfo, 'emsCommunicationStatus') }"
+                @click="handleFieldClick(baseInfo, 'emsCommunicationStatus', '与EMS通信')"
+              >
+                {{ formatDictValue(clusterEmsCommunicationStatusOptions, baseInfo.emsCommunicationStatus) }}
+              </span>
             </el-descriptions-item>
           </el-descriptions>
         </div>
@@ -47,8 +86,14 @@
             <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"
                                   v-for="(item,index) in infoData" :key="index+'pcsInfoData'" :span="1"
                                   :label="item.label">
-                <span class="pointer" @click="showChart(item.pointName || '',baseInfo.deviceId)">
+                <span
-                {{ baseInfo[item.attr] | formatNumber }} <span v-if="item.unit" v-html="item.unit"></span>
+                  class="pointer"
+                  :class="{ 'field-disabled': !hasFieldPointId(baseInfo, item.attr) }"
+                  @click="handleFieldClick(baseInfo, item.attr, item.label)"
+                >
+                <i v-if="isPointLoading(baseInfo[item.attr])" class="el-icon-loading point-loading-icon"></i>
+                <span v-else>{{ displayValue(baseInfo[item.attr]) | formatNumber }}</span>
+                <span v-if="item.unit" v-html="item.unit"></span>
               </span>
             </el-descriptions-item>
           </el-descriptions>
@@ -57,7 +102,11 @@
             <div class="process-line-bg">
               <div class="process-line" :style="{height:baseInfo.currentSoc+'%'}"></div>
             </div>
-            <div class="process pointer" @click="showChart( '当前SOC',baseInfo.deviceId)">当前SOC :
+            <div
+              class="process pointer"
+              :class="{ 'field-disabled': !hasFieldPointId(baseInfo, 'currentSoc') }"
+              @click="handleFieldClick(baseInfo, 'currentSoc', '当前SOC')"
+            >当前SOC :
               {{ baseInfo.currentSoc }}%
             </div>
           </div>
@@ -80,7 +129,10 @@
           >
             <template slot-scope="scope">
               <span class="pointer"
-                    @click="showChart( tablePointNameMap[scope.row.dataName+scope.column.label],baseInfo.deviceId)">{{ scope.row.avgData }}</span>
+                    :class="{ 'field-disabled': !hasTableFieldPointId(baseInfo, scope.row.dataName, scope.column.label) }"
+                    @click="handleTableFieldClick(baseInfo, scope.row.dataName, scope.column.label)">{{
+                  scope.row.avgData
+                }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -88,7 +140,10 @@
               label="单体最小值">
             <template slot-scope="scope">
               <span class="pointer"
-                    @click="showChart( tablePointNameMap[scope.row.dataName+scope.column.label],baseInfo.deviceId)">{{ scope.row.minData }}</span>
+                    :class="{ 'field-disabled': !hasTableFieldPointId(baseInfo, scope.row.dataName, scope.column.label) }"
+                    @click="handleTableFieldClick(baseInfo, scope.row.dataName, scope.column.label)">{{
+                  scope.row.minData
+                }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -100,7 +155,10 @@
               label="单体最大值">
             <template slot-scope="scope">
               <span class="pointer "
-                    @click="showChart( tablePointNameMap[scope.row.dataName+scope.column.label],baseInfo.deviceId)">{{ scope.row.maxData }}</span>
+                    :class="{ 'field-disabled': !hasTableFieldPointId(baseInfo, scope.row.dataName, scope.column.label) }"
+                    @click="handleTableFieldClick(baseInfo, scope.row.dataName, scope.column.label)">{{
+                  scope.row.maxData
+                }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -110,27 +168,89 @@
         </el-table>
       </el-card>
     </div>
-    <el-empty v-show="baseInfoList.length<=0" :image-size="200"></el-empty>
-    <point-chart ref="pointChart" :site-id="siteId"/>
     <point-table ref="pointTable"/>
+    <el-dialog
+      :visible.sync="curveDialogVisible"
+      :title="curveDialogTitle"
+      width="1000px"
+      append-to-body
+      class="ems-dialog"
+      :close-on-click-modal="false"
+      destroy-on-close
+      @opened="handleCurveDialogOpened"
+      @closed="handleCurveDialogClosed"
+    >
+      <div class="curve-tools">
+        <el-date-picker
+          v-model="curveCustomRange"
+          type="datetimerange"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          range-separator="至"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          style="width: 440px"
+        />
+        <el-button type="primary" size="mini" :loading="curveLoading" @click="loadCurveData">查询</el-button>
+      </div>
+      <div v-loading="curveLoading" ref="curveChartRef" style="height: 380px;"></div>
+    </el-dialog>
   </div>
 
 </template>
 
 <script>
-import pointChart from "./../PointChart.vue";
+import * as echarts from "echarts";
 import PointTable from "@/views/ems/site/sblb/PointTable.vue";
-import {getBMSBatteryCluster} from '@/api/ems/dzjk'
+import {getProjectDisplayData, getStackNameList, getClusterNameList} from '@/api/ems/dzjk'
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import intervalUpdate from "@/mixins/ems/intervalUpdate";
+import {mapState} from "vuex";
+import {getPointConfigCurve, getSingleMonitorWorkStatusEnumMappings} from "@/api/ems/site";
 
 export default {
   name: 'DzjkSbjkBmsdcc',
   mixins: [getQuerySiteId, intervalUpdate],
-  components: {PointTable, pointChart},
+  components: {PointTable},
+  computed: {
+    ...mapState({
+      CLUSTERWorkStatusOptions: state => state?.ems?.CLUSTERWorkStatusOptions || {},
+    }),
+    clusterWorkStatusOptions() {
+      return this.getEnumOptions("CLUSTER", "workStatus", this.CLUSTERWorkStatusOptions || {});
+    },
+    clusterPcsCommunicationStatusOptions() {
+      return this.getEnumOptions("CLUSTER", "pcsCommunicationStatus", (this.$store.state.ems && this.$store.state.ems.communicationStatusOptions) || {});
+    },
+    clusterEmsCommunicationStatusOptions() {
+      return this.getEnumOptions("CLUSTER", "emsCommunicationStatus", (this.$store.state.ems && this.$store.state.ems.communicationStatusOptions) || {});
+    },
+    filteredBaseInfoList() {
+      if (!this.selectedClusterId) {
+        return this.baseInfoList || [];
+      }
+      return (this.baseInfoList || []).filter(item => item.deviceId === this.selectedClusterId);
+    },
+  },
   data() {
     return {
       loading: false,
+      displayData: [],
+      clusterDeviceList: [],
+      siteEnumOptionMap: {},
+      selectedClusterId: "",
+      curveDialogVisible: false,
+      curveDialogTitle: "点位曲线",
+      curveChart: null,
+      curveLoading: false,
+      curveCustomRange: [],
+      curveQuery: {
+        siteId: "",
+        pointId: "",
+        pointType: "data",
+        rangeType: "custom",
+        startTime: "",
+        endTime: "",
+      },
       unitObj: {
         '电压': 'V',
         '温度': '&#8451;',
@@ -147,7 +267,15 @@ export default {
         'SOC单体平均值': '当前SOC',
         'SOC单体最大值': '最高单体SOC',
       },
-      baseInfoList: [],
+      baseInfoList: [{
+        siteId: "",
+        deviceId: "",
+        parentDeviceName: "",
+        deviceName: "BMS电池簇",
+        dataUpdateTime: "-",
+        alarmNum: 0,
+        batteryDataList: [],
+      }],
       infoData: [
         {label: '簇电压', attr: 'clusterVoltage', unit: 'V', pointName: '簇电压'},
         {label: '可充电量', attr: 'chargeableCapacity', unit: 'kWh', pointName: '可充电量'},
@@ -162,31 +290,414 @@ export default {
     }
   },
   methods: {
+    displayValue(value) {
+      return value === undefined || value === null || value === "" ? "-" : value;
+    },
+    isPointLoading(value) {
+      return this.loading && (value === undefined || value === null || value === "" || value === "-");
+    },
+    normalizeDictKey(value) {
+      const raw = String(value == null ? "" : value).trim();
+      if (!raw) return "";
+      if (/^-?\d+(\.0+)?$/.test(raw)) {
+        return String(parseInt(raw, 10));
+      }
+      return raw;
+    },
+    formatDictValue(options, value) {
+      const dict = (options && typeof options === "object") ? options : {};
+      const key = this.normalizeDictKey(value);
+      if (!key) return "-";
+      return dict[key] || key;
+    },
+    buildEnumScopeKey(deviceCategory, matchField) {
+      return `${String(deviceCategory || "").trim()}|${String(matchField || "").trim()}`;
+    },
+    buildSiteEnumOptionMap(mappings = []) {
+      return (mappings || []).reduce((acc, item) => {
+        const scopeKey = this.buildEnumScopeKey(item?.deviceCategory, item?.matchField);
+        const dataEnumCode = this.normalizeDictKey(item?.dataEnumCode);
+        const enumCode = this.normalizeDictKey(item?.enumCode);
+        const enumName = String(item?.enumName || "").trim();
+        const optionKey = dataEnumCode || enumCode;
+        if (!scopeKey || !optionKey || !enumName) {
+          return acc;
+        }
+        if (!acc[scopeKey]) {
+          acc[scopeKey] = {};
+        }
+        acc[scopeKey][optionKey] = enumName;
+        return acc;
+      }, {});
+    },
+    loadSiteEnumOptions() {
+      if (!this.siteId) {
+        this.siteEnumOptionMap = {};
+        return Promise.resolve({});
+      }
+      return getSingleMonitorWorkStatusEnumMappings(this.siteId).then(response => {
+        const optionMap = this.buildSiteEnumOptionMap(response?.data || []);
+        this.siteEnumOptionMap = optionMap;
+        return optionMap;
+      }).catch(() => {
+        this.siteEnumOptionMap = {};
+        return {};
+      });
+    },
+    getEnumOptions(deviceCategory, matchField, fallback = {}) {
+      const scopeKey = this.buildEnumScopeKey(deviceCategory, matchField);
+      const siteOptions = this.siteEnumOptionMap[scopeKey];
+      if (siteOptions && Object.keys(siteOptions).length > 0) {
+        return siteOptions;
+      }
+      return fallback || {};
+    },
+    handleCardClass(item) {
+      const workStatus = this.normalizeDictKey((item && item.workStatus) || "");
+      const statusOptions = (this.clusterWorkStatusOptions && typeof this.clusterWorkStatusOptions === "object")
+        ? this.clusterWorkStatusOptions
+        : {};
+      const hasStatus = Object.prototype.hasOwnProperty.call(statusOptions, workStatus);
+      return !hasStatus ? "timing-card-container" : workStatus === '9' ? 'warning-card-container' : 'running-card-container';
+    },
     // 查看设备电位表格
     pointDetail(row, dataType) {
       const {siteId, deviceId} = row
       this.$refs.pointTable.showTable({siteId, deviceId, deviceCategory: 'CLUSTER'}, dataType)
     },
-    showChart(pointName, deviceId) {
+    hasFieldPointId(baseInfo, fieldName) {
-      pointName && this.$refs.pointChart.showChart({pointName, deviceCategory: 'CLUSTER', deviceId})
+      const row = this.getFieldRow(baseInfo, fieldName);
+      return !!String(row?.dataPoint || "").trim();
     },
-    updateData() {
+    hasTableFieldPointId(baseInfo, dataName, columnLabel) {
-      this.loading = true
+      const pointName = this.tablePointNameMap[String(dataName || "") + String(columnLabel || "")];
-      getBMSBatteryCluster(this.siteId).then(response => {
+      if (!pointName) {
-        this.baseInfoList = JSON.parse(JSON.stringify(response?.data || []));
+        return false;
+      }
+      return this.hasFieldPointId(baseInfo, pointName);
+    },
+    getFieldRow(baseInfo, fieldName) {
+      const key = String(fieldName || "").trim();
+      const map = baseInfo?._fieldRowMap || {};
+      return map[key] || null;
+    },
+    handleFieldClick(baseInfo, fieldName, title) {
+      const row = this.getFieldRow(baseInfo, fieldName);
+      const pointId = String(row?.dataPoint || "").trim();
+      this.openCurveDialogByPointId(pointId, title || fieldName);
+    },
+    handleTableFieldClick(baseInfo, dataName, columnLabel) {
+      const pointName = this.tablePointNameMap[String(dataName || "") + String(columnLabel || "")];
+      if (!pointName) {
+        this.$message.warning("该字段未配置点位，无法查询曲线");
+        return;
+      }
+      this.handleFieldClick(baseInfo, pointName, pointName);
+    },
+    openCurveDialogByPointId(pointId, title) {
+      const normalizedPointId = String(pointId || "").trim();
+      if (!normalizedPointId) {
+        this.$message.warning("该字段未配置点位，无法查询曲线");
+        return;
+      }
+      const range = this.getDefaultCurveRange();
+      this.curveCustomRange = range;
+      this.curveDialogTitle = `点位曲线 - ${title || normalizedPointId}`;
+      this.curveQuery = {
+        siteId: this.siteId,
+        pointId: normalizedPointId,
+        pointType: "data",
+        rangeType: "custom",
+        startTime: range[0],
+        endTime: range[1],
+      };
+      this.curveDialogVisible = true;
+    },
+    handleCurveDialogOpened() {
+      if (!this.curveChart && this.$refs.curveChartRef) {
+        this.curveChart = echarts.init(this.$refs.curveChartRef);
+      }
+      this.loadCurveData();
+    },
+    handleCurveDialogClosed() {
+      if (this.curveChart) {
+        this.curveChart.dispose();
+        this.curveChart = null;
+      }
+      this.curveLoading = false;
+    },
+    getDefaultCurveRange() {
+      const end = new Date();
+      const start = new Date(end.getTime() - 24 * 60 * 60 * 1000);
+      return [this.formatDateTime(start), this.formatDateTime(end)];
+    },
+    formatDateTime(date) {
+      const d = new Date(date);
+      const p = (n) => String(n).padStart(2, "0");
+      return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}:${p(d.getSeconds())}`;
+    },
+    formatCurveTime(value) {
+      if (value === undefined || value === null || value === "") {
+        return "";
+      }
+      const raw = String(value).trim();
+      const normalized = raw
+        .replace("T", " ")
+        .replace(/\.\d+/, "")
+        .replace(/Z$/, "")
+        .replace(/([+-]\d{2}:?\d{2})$/, "")
+        .trim();
+      const matched = normalized.match(/^(\d{4}-\d{2}-\d{2})\s+(\d{2}:\d{2})/);
+      if (matched) {
+        return `${matched[1]} ${matched[2]}`;
+      }
+      return normalized.slice(0, 16);
+    },
+    loadCurveData() {
+      if (!this.curveQuery.siteId || !this.curveQuery.pointId) {
+        this.$message.warning("点位信息不完整，无法查询曲线");
+        return;
+      }
+      if (!this.curveCustomRange || this.curveCustomRange.length !== 2) {
+        this.$message.warning("请选择查询时间范围");
+        return;
+      }
+      this.curveQuery.startTime = this.curveCustomRange[0];
+      this.curveQuery.endTime = this.curveCustomRange[1];
+      const query = {
+        siteId: this.curveQuery.siteId,
+        pointId: this.curveQuery.pointId,
+        pointType: "data",
+        rangeType: "custom",
+        startTime: this.curveQuery.startTime,
+        endTime: this.curveQuery.endTime,
+      };
+      this.curveLoading = true;
+      getPointConfigCurve(query).then((response) => {
+        const rows = response?.data || [];
+        this.renderCurveChart(rows);
+      }).catch(() => {
+        this.renderCurveChart([]);
       }).finally(() => {
-        this.loading = false
+        this.curveLoading = false;
-      })
+      });
+    },
+    renderCurveChart(rows = []) {
+      if (!this.curveChart) return;
+      const xData = rows.map(item => this.formatCurveTime(item.dataTime));
+      const yData = rows.map(item => item.pointValue);
+      this.curveChart.clear();
+      this.curveChart.setOption({
+        legend: {},
+        grid: {
+          containLabel: true,
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            type: "cross",
+          },
+        },
+        textStyle: {
+          color: "#333333",
+        },
+        xAxis: {
+          type: "category",
+          data: xData,
+        },
+        yAxis: {
+          type: "value",
+        },
+        dataZoom: [
+          {
+            type: "inside",
+            start: 0,
+            end: 100,
+          },
+          {
+            start: 0,
+            end: 100,
+          },
+        ],
+        series: [
+          {
+            name: this.curveDialogTitle,
+            type: "line",
+            data: yData,
+            connectNulls: true,
+          },
+        ],
+      });
+      if (!rows.length) {
+        this.$message.warning("当前时间范围暂无曲线数据");
+      }
+    },
+    handleTagClick(deviceId) {
+      this.selectedClusterId = deviceId || "";
     },
     init() {
       this.updateData()
       this.updateInterval(this.updateData)
+    },
+    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;
+    },
+    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;
+      }, {});
+    },
+    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;
+    },
+    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 = [];
+        });
+    },
+    buildBaseInfoList() {
+      const devices = (this.clusterDeviceList && this.clusterDeviceList.length > 0)
+        ? this.clusterDeviceList
+        : [{deviceId: this.siteId, deviceName: 'BMS电池簇', parentDeviceName: ''}];
+      this.baseInfoList = devices.map(device => ({
+        ...(() => {
+          const id = device.deviceId || device.id || this.siteId;
+          const infoMap = this.getFieldMap(this.getModuleRows('SBJK_BMSDCC', '簇信息'), id);
+          const statusMap = this.getFieldMap(this.getModuleRows('SBJK_BMSDCC', '状态'), id);
+          const currentSoc = Number(infoMap.currentSoc);
+          return {
+            ...infoMap,
+            workStatus: statusMap.workStatus,
+            pcsCommunicationStatus: statusMap.pcsCommunicationStatus,
+            emsCommunicationStatus: statusMap.emsCommunicationStatus,
+            currentSoc: isNaN(currentSoc) ? 0 : currentSoc,
+            _fieldRowMap: {
+              ...this.getFieldRowMap(this.getModuleRows('SBJK_BMSDCC', '簇信息'), id),
+              ...this.getFieldRowMap(this.getModuleRows('SBJK_BMSDCC', '状态'), id),
+              ...this.getFieldRowMap(this.getModuleRows('SBJK_BMSDCC', '单体数据'), id),
+            },
+          };
+        })(),
+        siteId: this.siteId,
+        deviceId: device.deviceId || device.id || this.siteId,
+        parentDeviceName: device.parentDeviceName || '',
+        deviceName: device.deviceName || device.name || device.deviceId || device.id || 'BMS电池簇',
+        dataUpdateTime: this.getLatestTime('SBJK_BMSDCC'),
+        alarmNum: 0,
+        batteryDataList: [],
+      }));
+    },
+    updateData() {
+      this.loading = true
+      // 先渲染卡片框架，字段值走单点位 loading
+      this.buildBaseInfoList();
+      Promise.all([
+        getProjectDisplayData(this.siteId),
+        this.getClusterDeviceList(),
+        this.loadSiteEnumOptions(),
+      ]).then(([response]) => {
+        this.displayData = response?.data || [];
+        this.buildBaseInfoList();
+      }).finally(() => {
+        this.loading = false
+      })
     }
-  }
+  },
+  beforeDestroy() {
+    if (this.curveChart) {
+      this.curveChart.dispose();
+      this.curveChart = null;
+    }
+  },
 }
 </script>
 
 <style scoped lang="scss">
+.pcs-tags {
+  margin: 0 0 12px;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  justify-content: flex-start;
+  align-items: center;
+}
+
+.pcs-tag-item {
+  cursor: pointer;
+}
+
 ::v-deep {
   //描述列表样式
   .descriptions-main {
@@ -232,4 +743,16 @@ export default {
   }
 }
 
+.point-loading-icon {
+  color: #409eff;
+  display: inline-block;
+  transform-origin: center;
+  animation: pointLoadingSpinPulse 1.1s linear infinite;
+}
+@keyframes pointLoadingSpinPulse {
+  0% { opacity: 0.45; transform: rotate(0deg) scale(0.9); }
+  50% { opacity: 1; transform: rotate(180deg) scale(1.08); }
+  100% { opacity: 0.45; transform: rotate(360deg) scale(0.9); }
+}
+
 </style>

src/views/ems/dzjk/sbjk/bmszl/index.vue

@@ -1,11 +1,32 @@
 <template>
-  <div v-loading="loading">
+  <div>
-    <div v-for="(baseInfo,index) in baseInfoList" :key="index+'bmszlContainer'" style="margin-bottom:25px;">
+    <div class="pcs-tags">
-      <el-card :class="{
+      <el-tag
-        'warning-card-container':baseInfo.workStatus && baseInfo.workStatus !== '0',
+        size="small"
-        'running-card-container':baseInfo.workStatus === '0'
+        :type="selectedStackId ? 'info' : 'primary'"
-      }" class="sbjk-card-container common-card-container-body-no-padding common-card-container-no-title-bg"
+        :effect="selectedStackId ? 'plain' : 'dark'"
-               shadow="always">
+        class="pcs-tag-item"
+        @click="handleTagClick('')"
+      >
+        全部
+      </el-tag>
+      <el-tag
+        v-for="(item, index) in stackDeviceList"
+        :key="index + 'stackTag'"
+        size="small"
+        :type="selectedStackId === (item.deviceId || item.id) ? 'primary' : 'info'"
+        :effect="selectedStackId === (item.deviceId || item.id) ? 'dark' : 'plain'"
+        class="pcs-tag-item"
+        @click="handleTagClick(item.deviceId || item.id || '')"
+      >
+        {{ item.deviceName || item.name || item.deviceId || item.id || 'BMS总览' }}
+      </el-tag>
+    </div>
+    <div v-for="(baseInfo,index) in filteredBaseInfoList" :key="index+'bmszlContainer'" style="margin-bottom:25px;">
+      <el-card
+          :class="handleCardClass(baseInfo)"
+          class="sbjk-card-container common-card-container-body-no-padding common-card-container-no-title-bg"
+          shadow="always">
         <div slot="header">
           <span class="large-title">{{ baseInfo.deviceName }}</span>
           <div class="info">
@@ -15,7 +36,7 @@
             <el-button type="primary" round size="small" style="margin-right:20px;"
                        @click="pointDetail(baseInfo,'point')">详细
             </el-button>
-            <el-badge :value="baseInfo.alarmNum || 0" class="item">
+            <el-badge :hidden="!baseInfo.alarmNum" :value="baseInfo.alarmNum || 0" class="item">
               <i
                   class="el-icon-message-solid alarm-icon"
                   @click="pointDetail(baseInfo,'alarmPoint')"
@@ -26,17 +47,23 @@
         <div class="descriptions-main">
           <el-descriptions :colon="false" :column="3" direction="vertical">
             <el-descriptions-item
-                :contentClassName="`descriptions-direction ${baseInfo.workStatus === '0' ? 'save' :'danger'}`" :span="1"
+                contentClassName="descriptions-direction work-status"
                 label="工作状态" labelClassName="descriptions-label">
-              {{ $store.state.ems.workStatusOptions[baseInfo.workStatus] }}
+              <span class="pointer" @click="handleStatusFieldClick(baseInfo, 'workStatus', '工作状态')">
+                {{ formatDictValue(stackWorkStatusOptions, baseInfo.workStatus) }}
+              </span>
             </el-descriptions-item>
             <el-descriptions-item :span="1" contentClassName="descriptions-direction" label="与PCS通信"
                                   labelClassName="descriptions-label">
-              {{ $store.state.ems.communicationStatusOptions[baseInfo.pcsCommunicationStatus] }}
+              <span class="pointer" @click="handleStatusFieldClick(baseInfo, 'pcsCommunicationStatus', '与PCS通信')">
+                {{ formatDictValue(stackPcsCommunicationStatusOptions, baseInfo.pcsCommunicationStatus) }}
+              </span>
             </el-descriptions-item>
             <el-descriptions-item :span="1" contentClassName="descriptions-direction" label="与EMS通信"
                                   labelClassName="descriptions-label">
-              {{ $store.state.ems.communicationStatusOptions[baseInfo.emsCommunicationStatus] }}
+              <span class="pointer" @click="handleStatusFieldClick(baseInfo, 'emsCommunicationStatus', '与EMS通信')">
+                {{ formatDictValue(stackEmsCommunicationStatusOptions, baseInfo.emsCommunicationStatus) }}
+              </span>
             </el-descriptions-item>
           </el-descriptions>
         </div>
@@ -45,8 +72,10 @@
             <el-descriptions-item v-for="(item,index) in infoData" :key="index+'pcsInfoData'" :label="item.label"
                                   :span="1" contentClassName="descriptions-direction"
                                   labelClassName="descriptions-label">
-              <span class="pointer" @click="showChart(item.pointName || '',baseInfo.deviceId)">
+              <span class="pointer" @click="handleStackFieldClick(baseInfo, item)">
-                {{ baseInfo[item.attr] | formatNumber }}<span v-if="item.unit" v-html="item.unit"></span>
+                <i v-if="isPointLoading(baseInfo[item.attr])" class="el-icon-loading point-loading-icon"></i>
+                <span v-else>{{ displayValue(baseInfo[item.attr]) | formatNumber }}</span>
+                <span v-if="item.unit" v-html="item.unit"></span>
               </span>
             </el-descriptions-item>
           </el-descriptions>
@@ -55,155 +84,520 @@
             <div class="process-line-bg">
               <div :style="{height:baseInfo.stackSoc+'%'}" class="process-line"></div>
             </div>
-            <div class="process pointer" @click="showChart('当前SOC',baseInfo.deviceId)">当前SOC :
+            <div class="process pointer" @click="handleStackSocClick(baseInfo)">当前SOC :
               {{ baseInfo.stackSoc }}%
             </div>
           </div>
         </div>
-        <el-table
-            :data="baseInfo.batteryDataList"
-            class="common-table"
-            max-height="500"
-            stripe
-            style="width: 100%;margin-top:25px;">
-          <el-table-column
-              label="簇号"
-              prop="clusterId">
-          </el-table-column>
-          <el-table-column
-              label="簇电压"
-          >
-            <template slot-scope="scope">
-              <span class="pointer"
-                    @click="showChart('簇电压',scope.row.clusterId,'CLUSTER')">{{ scope.row.clusterVoltage }} V</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-              label="簇电流">
-            <template slot-scope="scope">
-              <span class="pointer"
-                    @click="showChart('簇电流',scope.row.clusterId,'CLUSTER')">{{ scope.row.clusterCurrent }} A</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-              label="簇SOC">
-            <template slot-scope="scope">
-              <span class="pointer"
-                    @click="showChart('当前SOC',scope.row.clusterId,'CLUSTER')">{{ scope.row.currentSoc }} %</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-              label="单体最高电压"
-              prop="maxVoltage">
-            <template slot-scope="scope">
-              <span class="pointer"
-                    @click="showChart('最高单体电压',scope.row.clusterId,'CLUSTER')">{{ scope.row.maxCellVoltage }} V</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-              label="电池号码"
-              prop="maxCellVoltageId">
-          </el-table-column>
-          <el-table-column
-              label="单体最低电压"
-              prop="minVoltage">
-            <template slot-scope="scope">
-              <span class="pointer"
-                    @click="showChart('最低单体电压',scope.row.clusterId,'CLUSTER')">{{ scope.row.minCellVoltage }} V</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-              label="电池号码"
-              prop="minCellVoltageId">
-          </el-table-column>
-          <el-table-column
-              label="单体最高温度">
-            <template slot-scope="scope">
-              <span class="pointer"
-                    @click="showChart('最高单体温度',scope.row.clusterId,'CLUSTER')">{{ scope.row.maxCellTemp }} &#8451;</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-              label="电池号码"
-              prop="maxCellTempId">
-          </el-table-column>
-          <el-table-column
-              label="单体最低温度"
-              prop="minTemperature">
-            <template slot-scope="scope">
-              <span class="pointer"
-                    @click="showChart('最低单体温度',scope.row.clusterId,'CLUSTER')">{{ scope.row.minCellTemp }} &#8451;</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-              label="电池号码"
-              prop="minCellTempId">
-          </el-table-column>
-
-        </el-table>
       </el-card>
     </div>
-    <el-empty v-show="baseInfoList.length<=0" :image-size="200"></el-empty>
+    <el-dialog
-    <point-chart ref="pointChart" :site-id="siteId"/>
+      :visible.sync="curveDialogVisible"
+      :title="curveDialogTitle"
+      width="1000px"
+      append-to-body
+      class="ems-dialog"
+      :close-on-click-modal="false"
+      destroy-on-close
+      @opened="handleCurveDialogOpened"
+      @closed="handleCurveDialogClosed"
+    >
+      <div class="curve-tools">
+        <el-date-picker
+          v-model="curveCustomRange"
+          type="datetimerange"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          range-separator="至"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          style="width: 440px"
+        />
+        <el-button type="primary" size="mini" :loading="curveLoading" @click="loadCurveData">查询</el-button>
+      </div>
+      <div v-loading="curveLoading" ref="curveChartRef" style="height: 380px;"></div>
+    </el-dialog>
     <point-table ref="pointTable"/>
   </div>
 </template>
 
 <script>
-import {getBMSOverView} from '@/api/ems/dzjk'
+import * as echarts from "echarts";
+import {getProjectDisplayData, getStackNameList} from '@/api/ems/dzjk'
+import {getPointConfigCurve, getSingleMonitorWorkStatusEnumMappings} from "@/api/ems/site";
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import intervalUpdate from "@/mixins/ems/intervalUpdate";
-import pointChart from "./../PointChart.vue";
 import PointTable from "@/views/ems/site/sblb/PointTable.vue";
+import {mapState} from "vuex";
 
 export default {
   name: 'DzjkSbjkBmszl',
-  components: {pointChart, PointTable},
+  components: {PointTable},
   mixins: [getQuerySiteId, intervalUpdate],
+  computed: {
+    ...mapState({
+      STACKWorkStatusOptions: state => state?.ems?.STACKWorkStatusOptions || {},
+    }),
+    stackWorkStatusOptions() {
+      return this.getEnumOptions("STACK", "workStatus", this.STACKWorkStatusOptions || {});
+    },
+    stackPcsCommunicationStatusOptions() {
+      return this.getEnumOptions("STACK", "pcsCommunicationStatus", (this.$store.state.ems && this.$store.state.ems.communicationStatusOptions) || {});
+    },
+    stackEmsCommunicationStatusOptions() {
+      return this.getEnumOptions("STACK", "emsCommunicationStatus", (this.$store.state.ems && this.$store.state.ems.communicationStatusOptions) || {});
+    },
+    filteredBaseInfoList() {
+      if (!this.selectedStackId) {
+        return this.baseInfoList || [];
+      }
+      return (this.baseInfoList || []).filter(item => item.deviceId === this.selectedStackId);
+    },
+  },
   data() {
     return {
       loading: false,
-      baseInfoList: [],
+      displayData: [],
+      stackDeviceList: [],
+      siteEnumOptionMap: {},
+      selectedStackId: "",
+      curveDialogVisible: false,
+      curveDialogTitle: "点位曲线",
+      curveChart: null,
+      curveLoading: false,
+      curveCustomRange: [],
+      curveQuery: {
+        siteId: "",
+        pointId: "",
+        pointType: "data",
+        rangeType: "custom",
+        startTime: "",
+        endTime: "",
+      },
+      baseInfoList: [{
+        siteId: "",
+        deviceId: "",
+        deviceName: "BMS总览",
+        dataUpdateTime: "-",
+        alarmNum: 0,
+        batteryDataList: [],
+      }],
       infoData: [
-        {label: '电池堆总电压', attr: 'stackVoltage', unit: 'V', pointName: '电池堆电压'},
+        {label: '电池堆总电压', attr: 'stackVoltage', unit: 'V'},
-        {label: '可充电量', attr: 'availableChargeCapacity', unit: 'kWh', pointName: '可充电量'},
+        {label: '可充电量', attr: 'availableChargeCapacity', unit: 'kWh'},
-        {label: '累计充电量', attr: 'totalChargeCapacity', unit: 'kWh', pointName: '累计充电量'},
+        {label: '累计充电量', attr: 'totalChargeCapacity', unit: 'kWh'},
-        {label: '电池堆总电流', attr: 'stackCurrent', unit: 'A', pointName: '电池堆总电流'},
+        {label: '电池堆总电流', attr: 'stackCurrent', unit: 'A'},
-        {label: '可放电量', attr: 'availableDischargeCapacity', unit: 'kWh', pointName: '可放电量'},
+        {label: '可放电量', attr: 'availableDischargeCapacity', unit: 'kWh'},
-        {label: '累计放电量', attr: 'totalDischargeCapacity', unit: 'kWh', pointName: '累计放电量'},
+        {label: '累计放电量', attr: 'totalDischargeCapacity', unit: 'kWh'},
-        {label: 'SOH', attr: 'stackSoh', unit: '%', pointName: 'SOH'},
+        {label: 'SOH', attr: 'stackSoh', unit: '%'},
-        {label: '平均温度', attr: 'operatingTemp', unit: '&#8451;', pointName: '平均温度'},
+        {label: '平均温度', attr: 'operatingTemp', unit: '&#8451;'},
-        {label: '绝缘电阻', attr: 'stackInsulationResistance', unit: '&Omega;', pointName: '绝缘电阻'},
+        {label: '绝缘电阻', attr: 'stackInsulationResistance', unit: '&Omega;'},
       ]
     }
   },
   methods: {
+    displayValue(value) {
+      return value === undefined || value === null || value === "" ? "-" : value;
+    },
+    isPointLoading(value) {
+      return this.loading && (value === undefined || value === null || value === "" || value === "-");
+    },
+    normalizeDictKey(value) {
+      const raw = String(value == null ? "" : value).trim();
+      if (!raw) return "";
+      if (/^-?\d+(\.0+)?$/.test(raw)) {
+        return String(parseInt(raw, 10));
+      }
+      return raw;
+    },
+    formatDictValue(options, value) {
+      const dict = (options && typeof options === "object") ? options : {};
+      const key = this.normalizeDictKey(value);
+      if (!key) return "-";
+      return dict[key] || key;
+    },
+    buildEnumScopeKey(deviceCategory, matchField) {
+      return `${String(deviceCategory || "").trim()}|${String(matchField || "").trim()}`;
+    },
+    buildSiteEnumOptionMap(mappings = []) {
+      return (mappings || []).reduce((acc, item) => {
+        const scopeKey = this.buildEnumScopeKey(item?.deviceCategory, item?.matchField);
+        const dataEnumCode = this.normalizeDictKey(item?.dataEnumCode);
+        const enumCode = this.normalizeDictKey(item?.enumCode);
+        const enumName = String(item?.enumName || "").trim();
+        const optionKey = dataEnumCode || enumCode;
+        if (!scopeKey || !optionKey || !enumName) {
+          return acc;
+        }
+        if (!acc[scopeKey]) {
+          acc[scopeKey] = {};
+        }
+        acc[scopeKey][optionKey] = enumName;
+        return acc;
+      }, {});
+    },
+    loadSiteEnumOptions() {
+      if (!this.siteId) {
+        this.siteEnumOptionMap = {};
+        return Promise.resolve({});
+      }
+      return getSingleMonitorWorkStatusEnumMappings(this.siteId).then(response => {
+        const optionMap = this.buildSiteEnumOptionMap(response?.data || []);
+        this.siteEnumOptionMap = optionMap;
+        return optionMap;
+      }).catch(() => {
+        this.siteEnumOptionMap = {};
+        return {};
+      });
+    },
+    getEnumOptions(deviceCategory, matchField, fallback = {}) {
+      const scopeKey = this.buildEnumScopeKey(deviceCategory, matchField);
+      const siteOptions = this.siteEnumOptionMap[scopeKey];
+      if (siteOptions && Object.keys(siteOptions).length > 0) {
+        return siteOptions;
+      }
+      return fallback || {};
+    },
+    handleCardClass(item) {
+      const workStatus = this.normalizeDictKey((item && item.workStatus) || "");
+      const statusOptions = (this.stackWorkStatusOptions && typeof this.stackWorkStatusOptions === "object")
+        ? this.stackWorkStatusOptions
+        : {};
+      const hasStatus = Object.prototype.hasOwnProperty.call(statusOptions, workStatus);
+      return !hasStatus ? "timing-card-container" : workStatus === '9' ? 'warning-card-container' : 'running-card-container';
+    },
+
     // 查看设备电位表格
     pointDetail(row, dataType) {
       const {siteId, deviceId} = row
       this.$refs.pointTable.showTable({siteId, deviceId, deviceCategory: 'STACK'}, dataType)
     },
-    showChart(pointName, deviceId, deviceCategory = 'STACK') {
+    handleStatusFieldClick(baseInfo, fieldKey, title) {
-      pointName && this.$refs.pointChart.showChart({pointName, deviceCategory, deviceId})
+      const pointId = this.resolvePointId(baseInfo, fieldKey, "status");
+      this.openCurveDialogByPointId(pointId, title || fieldKey);
     },
-    updateData() {
+    handleStackFieldClick(baseInfo, item) {
-      this.loading = true
+      const fieldKey = item?.attr || "";
-      getBMSOverView(this.siteId).then(response => {
+      const pointId = this.resolvePointId(baseInfo, fieldKey, "info");
-        this.baseInfoList = JSON.parse(JSON.stringify(response?.data || []));
+      this.openCurveDialogByPointId(pointId, item?.label || fieldKey);
+    },
+    handleStackSocClick(baseInfo) {
+      const pointId = this.resolvePointId(baseInfo, "stackSoc", "info");
+      this.openCurveDialogByPointId(pointId, "当前SOC");
+    },
+    handleClusterFieldClick(row = {}, fieldKey = "", title = "") {
+      const directKeys = [
+        "pointId",
+        "dataPoint",
+        `${fieldKey}PointId`,
+        `${fieldKey}DataPoint`,
+      ];
+      let pointId = "";
+      directKeys.some((key) => {
+        const value = String(row?.[key] || "").trim();
+        if (value) {
+          pointId = value;
+          return true;
+        }
+        return false;
+      });
+      if (!pointId && row?.pointIdMap && fieldKey) {
+        pointId = String(row.pointIdMap[fieldKey] || "").trim();
+      }
+      this.openCurveDialogByPointId(pointId, title || fieldKey);
+    },
+    resolvePointId(baseInfo = {}, fieldKey = "", source = "info") {
+      const mapKey = source === "status" ? "statusPointIdMap" : "pointIdMap";
+      return String(baseInfo?.[mapKey]?.[fieldKey] || "").trim();
+    },
+    openCurveDialogByPointId(pointId, title) {
+      const normalizedPointId = String(pointId || "").trim();
+      if (!normalizedPointId) {
+        this.$message.warning("该字段未配置点位，无法查询曲线");
+        return;
+      }
+      const range = this.getDefaultCurveRange();
+      this.curveCustomRange = range;
+      this.curveDialogTitle = `点位曲线 - ${title || normalizedPointId}`;
+      this.curveQuery = {
+        siteId: this.siteId,
+        pointId: normalizedPointId,
+        pointType: "data",
+        rangeType: "custom",
+        startTime: range[0],
+        endTime: range[1],
+      };
+      this.curveDialogVisible = true;
+    },
+    handleCurveDialogOpened() {
+      if (!this.curveChart && this.$refs.curveChartRef) {
+        this.curveChart = echarts.init(this.$refs.curveChartRef);
+      }
+      this.loadCurveData();
+    },
+    handleCurveDialogClosed() {
+      if (this.curveChart) {
+        this.curveChart.dispose();
+        this.curveChart = null;
+      }
+      this.curveLoading = false;
+    },
+    getDefaultCurveRange() {
+      const end = new Date();
+      const start = new Date(end.getTime() - 24 * 60 * 60 * 1000);
+      return [this.formatDateTime(start), this.formatDateTime(end)];
+    },
+    formatDateTime(date) {
+      const d = new Date(date);
+      const p = (n) => String(n).padStart(2, "0");
+      return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}:${p(d.getSeconds())}`;
+    },
+    formatCurveTime(value) {
+      if (value === undefined || value === null || value === "") {
+        return "";
+      }
+      const raw = String(value).trim();
+      const normalized = raw
+        .replace("T", " ")
+        .replace(/\.\d+/, "")
+        .replace(/Z$/, "")
+        .replace(/([+-]\d{2}:?\d{2})$/, "")
+        .trim();
+      const matched = normalized.match(/^(\d{4}-\d{2}-\d{2})\s+(\d{2}:\d{2})/);
+      if (matched) {
+        return `${matched[1]} ${matched[2]}`;
+      }
+      return normalized.slice(0, 16);
+    },
+    loadCurveData() {
+      if (!this.curveQuery.siteId || !this.curveQuery.pointId) {
+        this.$message.warning("点位信息不完整，无法查询曲线");
+        return;
+      }
+      if (!this.curveCustomRange || this.curveCustomRange.length !== 2) {
+        this.$message.warning("请选择查询时间范围");
+        return;
+      }
+      this.curveQuery.startTime = this.curveCustomRange[0];
+      this.curveQuery.endTime = this.curveCustomRange[1];
+      const query = {
+        siteId: this.curveQuery.siteId,
+        pointId: this.curveQuery.pointId,
+        pointType: "data",
+        rangeType: "custom",
+        startTime: this.curveQuery.startTime,
+        endTime: this.curveQuery.endTime,
+      };
+      this.curveLoading = true;
+      getPointConfigCurve(query).then((response) => {
+        const rows = response?.data || [];
+        this.renderCurveChart(rows);
+      }).catch(() => {
+        this.renderCurveChart([]);
       }).finally(() => {
-        this.loading = false
+        this.curveLoading = false;
-      })
+      });
+    },
+    renderCurveChart(rows = []) {
+      if (!this.curveChart) return;
+      const xData = rows.map((item) => this.formatCurveTime(item.dataTime));
+      const yData = rows.map((item) => item.pointValue);
+      this.curveChart.clear();
+      this.curveChart.setOption({
+        legend: {},
+        grid: {
+          containLabel: true,
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            type: "cross",
+          },
+        },
+        textStyle: {
+          color: "#333333",
+        },
+        xAxis: {
+          type: "category",
+          data: xData,
+        },
+        yAxis: {
+          type: "value",
+        },
+        dataZoom: [
+          {
+            type: "inside",
+            start: 0,
+            end: 100,
+          },
+          {
+            start: 0,
+            end: 100,
+          },
+        ],
+        series: [
+          {
+            name: this.curveDialogTitle,
+            type: "line",
+            data: yData,
+            connectNulls: true,
+          },
+        ],
+      });
+      if (!rows.length) {
+        this.$message.warning("当前时间范围暂无曲线数据");
+      }
     },
     init() {
       this.updateData()
       this.updateInterval(this.updateData)
-    }
+    },
+    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;
+    },
+    getPointIdMap(rowMap = {}) {
+      const map = {};
+      Object.keys(rowMap || {}).forEach((fieldName) => {
+        map[fieldName] = String(rowMap[fieldName]?.dataPoint || "").trim();
+      });
+      return map;
+    },
+    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())}`;
+    },
+    handleTagClick(deviceId) {
+      this.selectedStackId = deviceId || "";
+    },
+    getStackDeviceList() {
+      return getStackNameList(this.siteId).then(response => {
+        this.stackDeviceList = response?.data || [];
+      }).catch(() => {
+        this.stackDeviceList = [];
+      });
+    },
+    buildBaseInfoList() {
+      const devices = (this.stackDeviceList && this.stackDeviceList.length > 0)
+        ? this.stackDeviceList
+        : [{deviceId: this.siteId, deviceName: 'BMS总览'}];
+      this.baseInfoList = 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);
+          const stackSoc = Number(infoMap.stackSoc);
+          return {
+            ...infoMap,
+            workStatus: statusMap.workStatus,
+            pcsCommunicationStatus: statusMap.pcsCommunicationStatus,
+            emsCommunicationStatus: statusMap.emsCommunicationStatus,
+            stackSoc: isNaN(stackSoc) ? 0 : stackSoc,
+            pointIdMap: this.getPointIdMap(infoRowMap),
+            statusPointIdMap: this.getPointIdMap(statusRowMap),
+          };
+        })(),
+        siteId: this.siteId,
+        deviceId: device.deviceId || device.id || this.siteId,
+        deviceName: device.deviceName || device.name || device.deviceId || device.id || 'BMS总览',
+        dataUpdateTime: this.getLatestTime('SBJK_BMSZL'),
+        alarmNum: 0,
+        batteryDataList: [],
+      }));
+    },
+    updateData() {
+      this.loading = true
+      // 先渲染卡片框架，字段值走单点位 loading
+      this.buildBaseInfoList();
+      Promise.all([
+        getProjectDisplayData(this.siteId),
+        this.getStackDeviceList(),
+        this.loadSiteEnumOptions(),
+      ]).then(([displayResponse]) => {
+        this.displayData = displayResponse?.data || [];
+        this.buildBaseInfoList();
+      }).finally(() => {
+        this.loading = false
+      })
+    },
 
   }
+  ,
+  beforeDestroy() {
+    if (this.curveChart) {
+      this.curveChart.dispose();
+      this.curveChart = null;
+    }
+  },
 }
 </script>
 
 <style lang="scss" scoped>
+.pcs-tags {
+  margin: 0 0 12px;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  justify-content: flex-start;
+  align-items: center;
+}
+
+.pcs-tag-item {
+  cursor: pointer;
+}
+
+.curve-tools {
+  margin-bottom: 10px;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
 ::v-deep {
   //描述列表样式
   .descriptions-main {
@@ -249,4 +643,16 @@ export default {
   }
 }
 
+.point-loading-icon {
+  color: #409eff;
+  display: inline-block;
+  transform-origin: center;
+  animation: pointLoadingSpinPulse 1.1s linear infinite;
+}
+@keyframes pointLoadingSpinPulse {
+  0% { opacity: 0.45; transform: rotate(0deg) scale(0.9); }
+  50% { opacity: 1; transform: rotate(180deg) scale(1.08); }
+  100% { opacity: 0.45; transform: rotate(360deg) scale(0.9); }
+}
+
 </style>

src/views/ems/dzjk/sbjk/db/index.vue

@@ -1,185 +1,436 @@
 <template>
-  <div v-loading="loading">
+  <div>
+    <div class="pcs-tags">
+      <el-tag
+        size="small"
+        :type="selectedSectionKey ? 'info' : 'primary'"
+        :effect="selectedSectionKey ? 'plain' : 'dark'"
+        class="pcs-tag-item"
+        @click="handleTagClick('')"
+      >
+        全部
+      </el-tag>
+      <el-tag
+        v-for="(group, index) in sectionGroups"
+        :key="index + 'dbTag'"
+        size="small"
+        :type="selectedSectionKey === group.sectionKey ? 'primary' : 'info'"
+        :effect="selectedSectionKey === group.sectionKey ? 'dark' : 'plain'"
+        class="pcs-tag-item"
+        @click="handleTagClick(group.sectionKey)"
+      >
+        {{ group.displayName || "电表" }}
+      </el-tag>
+    </div>
     <el-card
-        v-for="(item,index) in list"
+      v-for="(group, index) in filteredSectionGroups"
-        :key="index+'dbList'"
+      :key="index + 'dbSection'"
-        shadow="always"
+      class="sbjk-card-container list running-card-container"
-        class="sbjk-card-container list"
+      shadow="always"
-        :class="{
-        'warning-card-container':item.emsCommunicationStatus && item.emsCommunicationStatus !== '0',
-        'running-card-container':item.emsCommunicationStatus === '0'
-      }"
     >
       <div slot="header">
-        <span class="large-title">{{ item.deviceName }}</span>
+        <span class="large-title">{{ group.displayName || "电表" }}</span>
         <div class="info">
-          <div>
+          <div>状态：{{ group.statusText }}</div>
-            {{
+          <div>数据更新时间：{{ group.updateTimeText }}</div>
-              $store.state.ems.communicationStatusOptions[
-                  item.emsCommunicationStatus
-                  ]
-            }}
-          </div>
-          <div>数据更新时间：{{ item.dataUpdateTime }}</div>
-        </div>
-        <div class="alarm">
-          <el-button type="primary" round size="small" style="margin-right:20px;" @click="pointDetail(item,'point')">
-            详细
-          </el-button>
-          <el-badge :value="item.alarmNum || 0" class="item">
-            <i
-                class="el-icon-message-solid alarm-icon"
-                @click="pointDetail(item,'alarmPoint')"
-            ></i>
-          </el-badge>
         </div>
       </div>
       <el-row class="device-info-row">
-        <el-col v-for="(tempDataItem,tempDataIndex) in deviceIdTypeMsg[item.deviceId]" :key="tempDataIndex+'dbTempData'"
+        <el-col
-                :span="8" class="device-info-col">
+          v-for="(item, dataIndex) in group.items"
-            <span class="pointer" @click="showChart(tempDataItem.pointName,item.deviceId)">
+          :key="dataIndex + 'dbField'"
-              <span class="left">{{ tempDataItem.name }}</span> <span class="right">{{ item[tempDataItem.attr] }}<span
+          :span="8"
-                v-html="tempDataItem.unit"></span></span>
+          class="device-info-col"
+          :class="{ 'field-disabled': !item.pointId }"
+        >
+          <div class="field-click-wrapper" @click="handleFieldClick(item)">
+            <span class="left">{{ item.fieldName }}</span>
+            <span class="right">
+              <i v-if="isPointLoading(item.fieldValue)" class="el-icon-loading point-loading-icon"></i>
+              <span v-else>{{ displayValue(item.fieldValue) | formatNumber }}</span>
             </span>
+          </div>
         </el-col>
       </el-row>
     </el-card>
-    <el-empty v-show="list.length<=0" :image-size="200"></el-empty>
+
-    <point-chart ref="pointChart" :site-id="siteId"/>
+    <el-dialog
-    <point-table ref="pointTable"/>
+      :visible.sync="curveDialogVisible"
+      :title="curveDialogTitle"
+      width="1000px"
+      append-to-body
+      class="ems-dialog"
+      :close-on-click-modal="false"
+      destroy-on-close
+      @opened="handleCurveDialogOpened"
+      @closed="handleCurveDialogClosed"
+    >
+      <div class="curve-tools">
+        <el-date-picker
+          v-model="curveCustomRange"
+          type="datetimerange"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          range-separator="至"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          style="width: 440px"
+        />
+        <el-button type="primary" size="mini" :loading="curveLoading" @click="loadCurveData">查询</el-button>
+      </div>
+      <div v-loading="curveLoading" ref="curveChartRef" style="height: 380px;"></div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import pointChart from "./../PointChart.vue";
+import * as echarts from "echarts";
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import {getAmmeterDataList} from "@/api/ems/dzjk";
 import intervalUpdate from "@/mixins/ems/intervalUpdate";
-import PointTable from "@/views/ems/site/sblb/PointTable.vue";
+import { getProjectDisplayData } from "@/api/ems/dzjk";
+import { getDeviceList, getPointConfigCurve } from "@/api/ems/site";
 
 export default {
   name: "DzjkSbjkDb",
   mixins: [getQuerySiteId, intervalUpdate],
-  components: {PointTable, pointChart},
   data() {
     return {
       loading: false,
-      list: [],
+      displayData: [],
-      deviceIdTypeMsg: {
+      selectedSectionKey: "",
-        'LOAD': [
+      ammeterDeviceList: [],
-          {
+      curveDialogVisible: false,
-            name: '正向有功电能',
+      curveDialogTitle: "点位曲线",
-            attr: 'forwardActive',
+      curveChart: null,
-            pointName: '正向有功电能'
+      curveLoading: false,
-          },
+      curveCustomRange: [],
-          {
+      curveQuery: {
-            name: '反向有功电能',
+        siteId: "",
-            attr: 'reverseActive',
+        pointId: "",
-            pointName: '反向有功电能'
+        pointType: "data",
-          },
+        rangeType: "custom",
-          {
+        startTime: "",
-            name: '正向无功电能',
+        endTime: "",
-            attr: 'forwardReactive',
+      },
-            pointName: '正向无功电能'
-          },
-          {
-            name: '反向无功电能',
-            attr: 'reverseReactive',
-            pointName: '反向无功电能'
-          },
-          {
-            name: '有功功率',
-            attr: 'activePower',
-            pointName: '总有功功率'
-          },
-          {
-            name: '无功功率',
-            attr: 'reactivePower',
-            pointName: '总无功功率'
-          }
-        ],
-        'METE': [
-          {
-            name: '正向有功电能',
-            attr: 'forwardActive',
-            pointName: '正向有功电能'
-          },
-          {
-            name: '反向有功电能',
-            attr: 'reverseActive',
-            pointName: '反向有功电能'
-          },
-          {
-            name: '正向无功电能',
-            attr: 'forwardReactive',
-            pointName: '正向无功电能'
-          },
-          {
-            name: '反向无功电能',
-            attr: 'reverseReactive',
-            pointName: '反向无功电能'
-          },
-          {
-            name: '有功功率',
-            attr: 'activePower',
-            pointName: '总有功功率'
-          },
-          {
-            name: '无功功率',
-            attr: 'reactivePower',
-            pointName: '总无功功率'
-          }
-        ],
-        'METEGF': [
-          {
-            name: '有功电能',
-            attr: 'activeEnergy',
-            pointName: '有功电能'
-          },
-          {
-            name: '无功电能',
-            attr: 'reactiveEnergy',
-            pointName: '无功电能'
-          },
-          {
-            name: '有功功率',
-            attr: 'activePower',
-            pointName: '总有功功率'
-          },
-          {
-            name: '无功功率',
-            attr: 'reactivePower',
-            pointName: '总无功功率'
-          }
-        ]
-      }
     };
   },
-  methods: {
+  computed: {
-    // 查看设备电位表格
+    moduleDisplayData() {
-    pointDetail(row, dataType) {
+      return (this.displayData || []).filter((item) => item.menuCode === "SBJK_DB");
-      const {deviceId} = row
-      this.$refs.pointTable.showTable({siteId: this.siteId, deviceId, deviceCategory: 'AMMETER'}, dataType)
     },
-    showChart(pointName, deviceId) {
+    dbTemplateFields() {
-      pointName && this.$refs.pointChart.showChart({pointName, deviceCategory: 'AMMETER', deviceId})
+      const source = this.moduleDisplayData || [];
+      const result = [];
+      const seen = new Set();
+      source.forEach((item) => {
+        const fieldName = String(item?.fieldName || "").trim();
+        if (!fieldName || seen.has(fieldName)) {
+          return;
+        }
+        seen.add(fieldName);
+        result.push(fieldName);
+      });
+      return result.length > 0 ? result : this.fallbackFields;
+    },
+    sectionGroups() {
+      const source = this.moduleDisplayData || [];
+      const devices = (this.ammeterDeviceList || []).length > 0
+        ? this.ammeterDeviceList
+        : [{ deviceId: "", deviceName: "电表" }];
+
+      return devices.map((device, index) => {
+        const deviceId = String(device?.deviceId || device?.id || "").trim();
+        const sectionKey = deviceId || `AMMETER_${index}`;
+        const displayName = String(device?.deviceName || device?.name || deviceId || `电表${index + 1}`).trim();
+        const exactRows = source.filter((item) => String(item?.deviceId || "").trim() === deviceId);
+        const fallbackRows = source.filter((item) => !String(item?.deviceId || "").trim());
+
+        const exactValueMap = {};
+        exactRows.forEach((item) => {
+          const key = String(item?.fieldName || "").trim();
+          if (key) {
+            exactValueMap[key] = item;
+          }
+        });
+        const fallbackValueMap = {};
+        fallbackRows.forEach((item) => {
+          const key = String(item?.fieldName || "").trim();
+          if (key && fallbackValueMap[key] === undefined) {
+            fallbackValueMap[key] = item;
+          }
+        });
+
+        const items = (this.dbTemplateFields || []).map((fieldName) => {
+          const row = exactValueMap[fieldName] || fallbackValueMap[fieldName] || {};
+          return {
+            fieldName,
+            fieldValue: row.fieldValue,
+            valueTime: row.valueTime,
+            pointId: String(row?.dataPoint || "").trim(),
+            raw: row,
+          };
+        });
+
+        const statusItem = (items || []).find((it) => String(it.fieldName || "").includes("状态"));
+        const timestamps = [...exactRows, ...fallbackRows]
+          .map((it) => new Date(it?.valueTime).getTime())
+          .filter((ts) => !isNaN(ts));
+
+        return {
+          sectionName: displayName,
+          sectionKey,
+          displayName,
+          deviceId,
+          items,
+          statusText: this.displayValue(statusItem ? statusItem.fieldValue : "-"),
+          updateTimeText: timestamps.length > 0 ? this.formatDate(new Date(Math.max(...timestamps))) : "-",
+        };
+      });
+    },
+    displaySectionGroups() {
+      if (this.sectionGroups.length > 0) {
+        return this.sectionGroups;
+      }
+      return [
+        {
+          sectionName: "电参量",
+          sectionKey: "电参量",
+          displayName: "电表",
+          items: this.fallbackFields.map((fieldName) => ({ fieldName, fieldValue: "-" })),
+          statusText: "-",
+          updateTimeText: "-",
+        },
+      ];
+    },
+    filteredSectionGroups() {
+      const groups = this.displaySectionGroups || [];
+      if (!this.selectedSectionKey) {
+        return groups;
+      }
+      return groups.filter((group) => group.sectionKey === this.selectedSectionKey);
+    },
+    fallbackFields() {
+      return [
+        "正向有功电能",
+        "反向有功电能",
+        "正向无功电能",
+        "反向无功电能",
+        "有功功率",
+        "无功功率",
+      ];
+    },
+  },
+  methods: {
+    handleFieldClick(item) {
+      const pointId = String(item?.pointId || item?.raw?.dataPoint || "").trim();
+      if (!pointId) {
+        this.$message.warning("该字段未配置点位，无法查询曲线");
+        return;
+      }
+      this.openCurveDialog({
+        pointId,
+        title: item?.fieldName || pointId,
+      });
+    },
+    openCurveDialog({ pointId, title }) {
+      const range = this.getDefaultCurveRange();
+      this.curveCustomRange = range;
+      this.curveDialogTitle = `点位曲线 - ${title || pointId}`;
+      this.curveQuery = {
+        siteId: this.siteId,
+        pointId,
+        pointType: "data",
+        rangeType: "custom",
+        startTime: range[0],
+        endTime: range[1],
+      };
+      this.curveDialogVisible = true;
+    },
+    handleCurveDialogOpened() {
+      if (!this.curveChart && this.$refs.curveChartRef) {
+        this.curveChart = echarts.init(this.$refs.curveChartRef);
+      }
+      this.loadCurveData();
+    },
+    handleCurveDialogClosed() {
+      if (this.curveChart) {
+        this.curveChart.dispose();
+        this.curveChart = null;
+      }
+      this.curveLoading = false;
+    },
+    getDefaultCurveRange() {
+      const end = new Date();
+      const start = new Date(end.getTime() - 24 * 60 * 60 * 1000);
+      return [this.formatDateTime(start), this.formatDateTime(end)];
+    },
+    formatDateTime(date) {
+      const d = new Date(date);
+      const p = (n) => String(n).padStart(2, "0");
+      return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}:${p(d.getSeconds())}`;
+    },
+    formatCurveTime(value) {
+      if (value === undefined || value === null || value === "") {
+        return "";
+      }
+      const raw = String(value).trim();
+      const normalized = raw
+        .replace("T", " ")
+        .replace(/\.\d+/, "")
+        .replace(/Z$/, "")
+        .replace(/([+-]\d{2}:?\d{2})$/, "")
+        .trim();
+      const matched = normalized.match(/^(\d{4}-\d{2}-\d{2})\s+(\d{2}:\d{2})/);
+      if (matched) {
+        return `${matched[1]} ${matched[2]}`;
+      }
+      return normalized.slice(0, 16);
+    },
+    loadCurveData() {
+      if (!this.curveQuery.siteId || !this.curveQuery.pointId) {
+        this.$message.warning("点位信息不完整，无法查询曲线");
+        return;
+      }
+      if (!this.curveCustomRange || this.curveCustomRange.length !== 2) {
+        this.$message.warning("请选择查询时间范围");
+        return;
+      }
+      this.curveQuery.startTime = this.curveCustomRange[0];
+      this.curveQuery.endTime = this.curveCustomRange[1];
+      const query = {
+        siteId: this.curveQuery.siteId,
+        pointId: this.curveQuery.pointId,
+        pointType: "data",
+        rangeType: "custom",
+        startTime: this.curveQuery.startTime,
+        endTime: this.curveQuery.endTime,
+      };
+      this.curveLoading = true;
+      getPointConfigCurve(query)
+        .then((response) => {
+          const rows = response?.data || [];
+          this.renderCurveChart(rows);
+        })
+        .catch(() => {
+          this.renderCurveChart([]);
+        })
+        .finally(() => {
+          this.curveLoading = false;
+        });
+    },
+    renderCurveChart(rows = []) {
+      if (!this.curveChart) return;
+      const xData = rows.map((item) => this.formatCurveTime(item.dataTime));
+      const yData = rows.map((item) => item.pointValue);
+      this.curveChart.clear();
+      this.curveChart.setOption({
+        legend: {},
+        grid: {
+          containLabel: true,
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            type: "cross",
+          },
+        },
+        textStyle: {
+          color: "#333333",
+        },
+        xAxis: {
+          type: "category",
+          data: xData,
+        },
+        yAxis: {
+          type: "value",
+        },
+        dataZoom: [
+          {
+            type: "inside",
+            start: 0,
+            end: 100,
+          },
+          {
+            start: 0,
+            end: 100,
+          },
+        ],
+        series: [
+          {
+            name: this.curveDialogTitle,
+            type: "line",
+            data: yData,
+            connectNulls: true,
+          },
+        ],
+      });
+      if (!rows.length) {
+        this.$message.warning("当前时间范围暂无曲线数据");
+      }
+    },
+    handleTagClick(sectionKey) {
+      this.selectedSectionKey = sectionKey || "";
+    },
+    displayValue(value) {
+      return value === undefined || value === null || value === "" ? "-" : value;
+    },
+    isPointLoading(value) {
+      return this.loading && (value === undefined || value === null || value === "" || value === "-");
+    },
+    formatDate(date) {
+      if (!(date instanceof Date) || isNaN(date.getTime())) {
+        return "-";
+      }
+      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())}`;
+    },
+    resolveDbDisplayName(sectionName) {
+      const key = String(sectionName || "").trim();
+      if (!key) {
+        return "电表";
+      }
+      const list = this.ammeterDeviceList || [];
+      const matched = list.find((item) => {
+        const deviceId = String(item.deviceId || item.id || "").trim();
+        const deviceName = String(item.deviceName || item.name || "").trim();
+        return key === deviceId || key === deviceName;
+      });
+      if (matched) {
+        return matched.deviceName || matched.name || key;
+      }
+      return key;
+    },
+    getAmmeterDeviceList() {
+      return getDeviceList(this.siteId)
+        .then((response) => {
+          const list = response?.data || [];
+          this.ammeterDeviceList = list.filter((item) => item.deviceCategory === "AMMETER");
+        })
+        .catch(() => {
+          this.ammeterDeviceList = [];
+        });
     },
     updateData() {
       this.loading = true;
-      getAmmeterDataList(this.siteId)
+      Promise.all([getProjectDisplayData(this.siteId), this.getAmmeterDeviceList()])
-          .then((response) => {
+        .then(([response]) => {
-            this.list = response?.data || []
+          this.displayData = response?.data || [];
-          })
+        })
-          .finally(() => {
+        .finally(() => {
-            this.loading = false;
+          this.loading = false;
-          });
+        });
     },
     init() {
-      this.updateData()
+      this.updateData();
-      this.updateInterval(this.updateData)
+      this.updateInterval(this.updateData);
     },
   },
-  mounted() {
+  beforeDestroy() {
+    if (this.curveChart) {
+      this.curveChart.dispose();
+      this.curveChart = null;
+    }
   },
 };
 </script>
@@ -189,6 +440,58 @@ export default {
   &.list:not(:last-child) {
     margin-bottom: 25px;
   }
+
+  .info {
+    float: right;
+    text-align: right;
+    font-size: 12px;
+    color: #666;
+    line-height: 18px;
+  }
 }
 
+.pcs-tags {
+  margin: 0 0 12px;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  justify-content: flex-start;
+  align-items: center;
+}
+
+.pcs-tag-item {
+  cursor: pointer;
+}
+
+.device-info-col {
+  cursor: pointer;
+}
+
+.field-click-wrapper {
+  width: 100%;
+}
+
+.device-info-col.field-disabled {
+  cursor: not-allowed;
+  opacity: 0.8;
+}
+
+.curve-tools {
+  margin-bottom: 10px;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
+.point-loading-icon {
+  color: #409eff;
+  display: inline-block;
+  transform-origin: center;
+  animation: pointLoadingSpinPulse 1.1s linear infinite;
+}
+@keyframes pointLoadingSpinPulse {
+  0% { opacity: 0.45; transform: rotate(0deg) scale(0.9); }
+  50% { opacity: 1; transform: rotate(180deg) scale(1.08); }
+  100% { opacity: 0.45; transform: rotate(360deg) scale(0.9); }
+}
 </style>

src/views/ems/dzjk/sbjk/dh/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="loading">
+  <div>
     <el-card
         v-for="(item,index) in list"
         :key="index+'ylLise'"
@@ -14,7 +14,7 @@
           <el-button type="primary" round size="small" style="margin-right:20px;" @click="pointDetail(item,'point')">
             详细
           </el-button>
-          <el-badge :value="item.alarmNum || 0" class="item">
+          <el-badge :hidden="!item.alarmNum" :value="item.alarmNum || 0" class="item">
             <i
                 class="el-icon-message-solid alarm-icon"
                 @click="pointDetail(item,'alarmPoint')"
@@ -26,8 +26,11 @@
         <el-col v-for="(tempDataItem,tempDataIndex) in tempData" :key="tempDataIndex+'hdTempData'" :span="12"
                 class="device-info-col">
             <span class="pointer" @click="showChart(tempDataItem.title,item.deviceId)">
-              <span class="left">{{ tempDataItem.title }}</span> <span class="right">{{ item[tempDataItem.attr] }}<span
+              <span class="left">{{ tempDataItem.title }}</span>
-                v-html="tempDataItem.unit"></span></span>
+              <span class="right">
+                <i v-if="isPointLoading(item[tempDataItem.attr])" class="el-icon-loading point-loading-icon"></i>
+                <span v-else>{{ displayValue(item[tempDataItem.attr]) }}<span v-html="tempDataItem.unit"></span></span>
+              </span>
             </span>
         </el-col>
       </el-row>
@@ -61,6 +64,12 @@ export default {
     }
   },
   methods: {
+    displayValue(value) {
+      return value === undefined || value === null || value === "" ? "-" : value;
+    },
+    isPointLoading(value) {
+      return this.loading && (value === undefined || value === null || value === "" || value === "-");
+    },
     // 查看设备电位表格
     pointDetail(row, dataType) {
       const {deviceId} = row
@@ -116,4 +125,16 @@ export default {
     }
   }
 }
+
+.point-loading-icon {
+  color: #409eff;
+  display: inline-block;
+  transform-origin: center;
+  animation: pointLoadingSpinPulse 1.1s linear infinite;
+}
+@keyframes pointLoadingSpinPulse {
+  0% { opacity: 0.45; transform: rotate(0deg) scale(0.9); }
+  50% { opacity: 1; transform: rotate(180deg) scale(1.08); }
+  100% { opacity: 0.45; transform: rotate(360deg) scale(0.9); }
+}
 </style>

src/views/ems/dzjk/sbjk/dtdc/List.vue

@@ -15,10 +15,10 @@
             {{ item.clusterDeviceId }}
           </div>
           <div>#{{ item.deviceId }}</div>
-          <div class="dy pointer" @click="chartDetail(item, '电压 (V)')">
+          <div class="dy pointer" @click="chartDetail(item, 'voltage')">
             {{ item.voltage }}V
           </div>
-          <div class="wd pointer" @click="chartDetail(item, '温度 (℃)')">
+          <div class="wd pointer" @click="chartDetail(item, 'temperature')">
             {{ item.temperature }}℃
           </div>
         </div>
@@ -102,9 +102,8 @@ export default {
       return className;
     },
     //查看表格行图表
-    chartDetail(row, dataType = "") {
+    chartDetail(row, fieldKey = "") {
-      const { clusterDeviceId, deviceId } = row;
+      this.$emit("chart", { ...row, fieldKey });
-      this.$emit("chart", { ...row, dataType });
     },
   },
 };

src/views/ems/dzjk/sbjk/dtdc/Table.vue

@@ -11,7 +11,7 @@
       <el-table-column prop="voltage" label="电压 (V)">
         <template slot-scope="scope">
           <el-button
-              @click="chartDetail(scope.row, '电压 (V)')"
+              @click="chartDetail(scope.row, 'voltage')"
               type="text"
               size="small"
           >
@@ -22,7 +22,7 @@
       <el-table-column prop="temperature" label="温度 (℃)">
         <template slot-scope="scope">
           <el-button
-              @click="chartDetail(scope.row, '温度 (℃)')"
+              @click="chartDetail(scope.row, 'temperature')"
               type="text"
               size="small"
           >
@@ -33,7 +33,7 @@
       <el-table-column prop="soc" label="SOC (%)">
         <template slot-scope="scope">
           <el-button
-              @click="chartDetail(scope.row, 'SOC (%)')"
+              @click="chartDetail(scope.row, 'soc')"
               type="text"
               size="small"
           >
@@ -44,7 +44,7 @@
       <el-table-column prop="soh" label="SOH (%)">
         <template slot-scope="scope">
           <el-button
-              @click="chartDetail(scope.row, 'SOH (%)')"
+              @click="chartDetail(scope.row, 'soh')"
               type="text"
               size="small"
           >
@@ -52,16 +52,6 @@
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="160">
-        <template slot-scope="scope">
-          <el-button @click="$emit('pointDetail',scope.row,'point')" type="text" size="small">
-            详细
-          </el-button>
-          <el-button @click="$emit('pointDetail',scope.row,'alarmPoint')" type="text" size="small">
-            报警点位详细
-          </el-button>
-        </template>
-      </el-table-column>
     </el-table>
     <!-- <el-pagination
       v-show="tableData.length > 0"
@@ -117,8 +107,8 @@ export default {
   },
   methods: {
     //查看表格行图表
-    chartDetail(row, dataType = "") {
+    chartDetail(row, fieldKey = "") {
-      this.$emit("chart", {...row, dataType});
+      this.$emit("chart", {...row, fieldKey});
     },
   },
 };

src/views/ems/dzjk/sbjk/dtdc/index.vue

@@ -88,7 +88,6 @@
       :totalSize="totalSize"
       :pointIdList="pointIdList"
       @chart="chartDetail"
-      @pointDetail="pointDetail"
     ></component>
     <el-pagination
       v-show="tableData.length > 0"
@@ -104,34 +103,55 @@
     >
     </el-pagination>
     <chart-detail ref="chartDetail" />
-    <point-chart ref="pointChart" :site-id="siteId" />
+    <el-dialog
-    <point-table ref="pointTable"/>
+      :visible.sync="curveDialogVisible"
+      :title="curveDialogTitle"
+      width="1000px"
+      append-to-body
+      class="ems-dialog"
+      :close-on-click-modal="false"
+      destroy-on-close
+      @opened="handleCurveDialogOpened"
+      @closed="handleCurveDialogClosed"
+    >
+      <div class="curve-tools">
+        <el-date-picker
+          v-model="curveCustomRange"
+          type="datetimerange"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          range-separator="至"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          style="width: 440px"
+        />
+        <el-button type="primary" size="mini" :loading="curveLoading" @click="loadCurveData">查询</el-button>
+      </div>
+      <div v-loading="curveLoading" ref="curveChartRef" style="height: 380px;"></div>
+    </el-dialog>
   </el-card>
 </template>
 
 <script>
+import * as echarts from "echarts";
 import BarChart from "./BarChart";
 import {
-  getStackNameList,
-  getClusterNameList,
   getClusterDataInfoList,
+  getClusterNameList,
+  getStackNameList,
 } from "@/api/ems/dzjk";
+import { getPointConfigCurve } from "@/api/ems/site";
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import ChartDetail from "./ChartDetail.vue";
 import Table from "./Table.vue";
 import List from "./List.vue";
-import pointChart from "./../PointChart.vue";
-import PointTable from "@/views/ems/site/sblb/PointTable.vue";
 export default {
   name: "DzjkSbjkDtdc",
   mixins: [getQuerySiteId],
   components: {
-    PointTable,
     BarChart,
     ChartDetail,
     DtdcTable: Table,
     DtdcList: List,
-    pointChart,
   },
   computed: {
     pointIdList() {
@@ -166,27 +186,190 @@ export default {
       pageNum: 1, //分页栏当前页数
       totalSize: 0, //table表格数据总数
       activeBtn: "table",
+      curveDialogVisible: false,
+      curveDialogTitle: "点位曲线",
+      curveChart: null,
+      curveLoading: false,
+      curveCustomRange: [],
+      curveQuery: {
+        siteId: "",
+        pointId: "",
+        pointType: "data",
+        rangeType: "custom",
+        startTime: "",
+        endTime: "",
+      },
     };
   },
+  beforeDestroy() {
+    if (this.curveChart) {
+      this.curveChart.dispose();
+      this.curveChart = null;
+    }
+  },
   methods: {
-    // 查看设备电位表格
+    getFieldPointConfig(fieldKey) {
-    pointDetail(row,dataType){
+      const pointMap = {
-      const {deviceId,clusterDeviceId} = row
+        voltage: { pointIdKey: "voltagePointId", title: "电压 (V)" },
-      this.$refs.pointTable.showTable({siteId:this.siteId,deviceId,deviceCategory:'BATTERY',parentId:clusterDeviceId},dataType)
+        temperature: { pointIdKey: "temperaturePointId", title: "温度 (℃)" },
+        soc: { pointIdKey: "socPointId", title: "SOC (%)" },
+        soh: { pointIdKey: "sohPointId", title: "SOH (%)" },
+      };
+      return pointMap[String(fieldKey || "").trim()] || null;
+    },
+    openCurveDialogByPointId(pointId, title) {
+      const normalizedPointId = String(pointId || "").trim();
+      if (!normalizedPointId) {
+        this.$message.warning("该字段未配置点位，无法查询曲线");
+        return;
+      }
+      const range = this.getDefaultCurveRange();
+      this.curveCustomRange = range;
+      this.curveDialogTitle = `点位曲线 - ${title || normalizedPointId}`;
+      this.curveQuery = {
+        siteId: this.siteId,
+        pointId: normalizedPointId,
+        pointType: "data",
+        rangeType: "custom",
+        startTime: range[0],
+        endTime: range[1],
+      };
+      this.curveDialogVisible = true;
+    },
+    handleCurveDialogOpened() {
+      if (!this.curveChart && this.$refs.curveChartRef) {
+        this.curveChart = echarts.init(this.$refs.curveChartRef);
+      }
+      this.loadCurveData();
+    },
+    handleCurveDialogClosed() {
+      if (this.curveChart) {
+        this.curveChart.dispose();
+        this.curveChart = null;
+      }
+      this.curveLoading = false;
+    },
+    getDefaultCurveRange() {
+      const end = new Date();
+      const start = new Date(end.getTime() - 24 * 60 * 60 * 1000);
+      return [this.formatDateTime(start), this.formatDateTime(end)];
+    },
+    formatDateTime(date) {
+      const d = new Date(date);
+      const p = (n) => String(n).padStart(2, "0");
+      return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(
+        d.getHours()
+      )}:${p(d.getMinutes())}:${p(d.getSeconds())}`;
+    },
+    formatCurveTime(value) {
+      if (value === undefined || value === null || value === "") {
+        return "";
+      }
+      const raw = String(value).trim();
+      const normalized = raw
+        .replace("T", " ")
+        .replace(/\.\d+/, "")
+        .replace(/Z$/, "")
+        .replace(/([+-]\d{2}:?\d{2})$/, "")
+        .trim();
+      const matched = normalized.match(/^(\d{4}-\d{2}-\d{2})\s+(\d{2}:\d{2})/);
+      if (matched) {
+        return `${matched[1]} ${matched[2]}`;
+      }
+      return normalized.slice(0, 16);
+    },
+    loadCurveData() {
+      if (!this.curveQuery.siteId || !this.curveQuery.pointId) {
+        this.$message.warning("点位信息不完整，无法查询曲线");
+        return;
+      }
+      if (!this.curveCustomRange || this.curveCustomRange.length !== 2) {
+        this.$message.warning("请选择查询时间范围");
+        return;
+      }
+      this.curveQuery.startTime = this.curveCustomRange[0];
+      this.curveQuery.endTime = this.curveCustomRange[1];
+      const query = {
+        siteId: this.curveQuery.siteId,
+        pointId: this.curveQuery.pointId,
+        pointType: "data",
+        rangeType: "custom",
+        startTime: this.curveQuery.startTime,
+        endTime: this.curveQuery.endTime,
+      };
+      this.curveLoading = true;
+      getPointConfigCurve(query)
+        .then((response) => {
+          const rows = response?.data || [];
+          this.renderCurveChart(rows);
+        })
+        .catch(() => {
+          this.renderCurveChart([]);
+        })
+        .finally(() => {
+          this.curveLoading = false;
+        });
+    },
+    renderCurveChart(rows = []) {
+      if (!this.curveChart) return;
+      const xData = rows.map((item) => this.formatCurveTime(item.dataTime));
+      const yData = rows.map((item) => item.pointValue);
+      this.curveChart.clear();
+      this.curveChart.setOption({
+        legend: {},
+        grid: {
+          containLabel: true,
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            type: "cross",
+          },
+        },
+        textStyle: {
+          color: "#333333",
+        },
+        xAxis: {
+          type: "category",
+          data: xData,
+        },
+        yAxis: {
+          type: "value",
+        },
+        dataZoom: [
+          {
+            type: "inside",
+            start: 0,
+            end: 100,
+          },
+          {
+            start: 0,
+            end: 100,
+          },
+        ],
+        series: [
+          {
+            name: this.curveDialogTitle,
+            type: "line",
+            data: yData,
+            connectNulls: true,
+          },
+        ],
+      });
+      if (!rows.length) {
+        this.$message.warning("当前时间范围暂无曲线数据");
+      }
     },
     changeMenu(menu) {
       const { activeBtn } = this;
       activeBtn !== menu && (this.activeBtn = menu);
     },
     //查看表格行图表
-    chartDetail({ deviceId, clusterDeviceId, dataType = "" }) {
+    chartDetail(row = {}) {
-      dataType &&
+      const config = this.getFieldPointConfig(row.fieldKey);
-        this.$refs.pointChart.showChart({
+      if (!config) return;
-          pointName: dataType,
+      const pointId = row[config.pointIdKey];
-          deviceCategory:'BATTERY',
+      this.openCurveDialogByPointId(pointId, config.title);
-          deviceId: clusterDeviceId,
-          child: [deviceId],
-        });
     },
     // 分页
     handleSizeChange(val) {
@@ -224,6 +407,9 @@ export default {
         );
         this.search.clusterId = "";
         this.getClusterList();
+      } else {
+        this.search.clusterId = "";
+        this.clusterOptions = [];
       }
     },
     //表格数据
@@ -254,19 +440,26 @@ export default {
     },
     getStackList() {
       getStackNameList(this.siteId).then((response) => {
-        this.stackOptions = JSON.parse(JSON.stringify(response?.data || []));
+        const list = JSON.parse(JSON.stringify(response?.data || []));
+        this.stackOptions = list;
       });
     },
     getClusterList() {
+      const { stackId } = this.search;
+      if (!stackId) {
+        this.clusterOptions = [];
+        return Promise.resolve();
+      }
       this.clusterloading = true;
-      getClusterNameList({
+      const currentStackId = String(stackId);
-        stackDeviceId: this.search.stackId,
+      return getClusterNameList({
+        stackDeviceId: stackId,
         siteId: this.siteId,
       })
         .then((response) => {
-          this.clusterOptions = JSON.parse(
+          // 避免用户快速切换电池堆时旧请求覆盖新数据
-            JSON.stringify(response?.data || [])
+          if (String(this.search.stackId || "") !== currentStackId) return;
-          );
+          this.clusterOptions = JSON.parse(JSON.stringify(response?.data || []));
         })
         .finally(() => {
           this.clusterloading = false;

src/views/ems/dzjk/sbjk/ems/index.vue

@@ -1,334 +1,481 @@
 <template>
-  <div v-loading="loading" class="ems">
+  <div>
-    <!--    <div-->
+    <div class="pcs-tags">
-    <!--        v-for="(item, index) in list"-->
+      <el-tag
-    <!--        :key="index + 'PcsHome'"-->
+        size="small"
-    <!--        style="margin-bottom: 25px"-->
+        :type="selectedSectionKey ? 'info' : 'primary'"
-    <!--    >-->
+        :effect="selectedSectionKey ? 'plain' : 'dark'"
-    <!--      <el-card-->
+        class="pcs-tag-item"
-    <!--          :class="{-->
+        @click="handleTagClick('')"
-    <!--          'warning-card-container': item.workStatus === '1',-->
+      >
-    <!--          'timing-card-container': item.workStatus === '2',-->
+        全部
-    <!--          'running-card-container': !['1', '2'].includes(item.workStatus),-->
+      </el-tag>
-    <!--        }"-->
+      <el-tag
-    <!--          class="sbjk-card-container common-card-container-body-no-padding common-card-container-no-title-bg"-->
+        v-for="(group, index) in sectionGroups"
-    <!--          shadow="always"-->
+        :key="index + 'emsTag'"
-    <!--      >-->
+        size="small"
-    <!--        &lt;!&ndash;        标题&ndash;&gt;-->
+        :type="selectedSectionKey === group.sectionKey ? 'primary' : 'info'"
-    <!--        <div slot="header">-->
+        :effect="selectedSectionKey === group.sectionKey ? 'dark' : 'plain'"
-    <!--          <span class="large-title"-->
+        class="pcs-tag-item"
-    <!--          >{{ item.deviceName }}</span-->
+        @click="handleTagClick(group.sectionKey)"
-    <!--          >-->
+      >
-    <!--          <div class="info">-->
+        {{ group.displayName || group.sectionName || "EMS" }}
-    <!--            <div>-->
+      </el-tag>
-    <!--              {{-->
+    </div>
-    <!--                $store.state.ems.workStatusOptions[item.workStatus]-->
-    <!--              }}-->
-    <!--            </div>-->
-    <!--            <div>数据更新时间：{{ item.dataUpdateTime }}</div>-->
-    <!--          </div>-->
-    <!--          <div class="alarm">-->
-    <!--            <el-button type="primary" size="small" style="margin-right:20px;" @click="pointDetail(item,'point')">-->
-    <!--              详细-->
-    <!--            </el-button>-->
-    <!--            <el-badge :value="item.alarmNum || 0" class="item">-->
-    <!--              <i-->
-    <!--                  class="el-icon-message-solid alarm-icon"-->
-    <!--                  @click="pointDetail(item,'alarmPoint')"-->
-    <!--              ></i>-->
-    <!--            </el-badge>-->
-    <!--          </div>-->
-    <!--        </div>-->
-    <!--        &lt;!&ndash;        工作状态&ndash;&gt;-->
-    <!--        <div class="descriptions-main">-->
-    <!--          <el-descriptions :colon="false" :column="5" direction="vertical">-->
-    <!--            <el-descriptions-item-->
-    <!--                :contentClassName="`descriptions-direction ${-->
-    <!--                            item.workStatus === '0' ? 'save' : 'danger'-->
-    <!--                          }`"-->
-    <!--                :span="1"-->
-    <!--                label="工作状态"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >{{-->
-    <!--                $store.state.ems.workStatusOptions[item.workStatus]-->
-    <!--              }}-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--            <el-descriptions-item-->
-    <!--                :span="1"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="工作模式"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >-->
-    <!--              todo 手动/自动-->
-    <!--              {{-->
-    <!--                $store.state.ems.gridStatusOptions[item.gridStatus]-->
-    <!--              }}-->
-
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--            <el-descriptions-item-->
-    <!--                :span="1"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="并网状态"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >{{-->
-    <!--                $store.state.ems.gridStatusOptions[item.gridStatus]-->
-    <!--              }}-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--            <el-descriptions-item-->
-    <!--                :span="1"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="告警状态"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >-->
-    <!--              todo-->
-    <!--              &lt;!&ndash;-->
-    <!--              {{-->
-    <!--                              $store.state.ems.warnOptions[item.warnMode]-->
-    <!--                            }}&ndash;&gt;-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--            <el-descriptions-item-->
-    <!--                :contentClassName="`descriptions-direction ${-->
-    <!--                item.deviceStatus === '2' ? 'save' : 'danger'-->
-    <!--              }`"-->
-    <!--                :span="1"-->
-    <!--                label="设备状态"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >{{-->
-    <!--                $store.state.ems.deviceStatusOptions[item.deviceStatus]-->
-    <!--              }}-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--          </el-descriptions>-->
-    <!--        </div>-->
-    <!--        &lt;!&ndash;        用电量&ndash;&gt;-->
-    <!--        <div class="descriptions-main descriptions-main-bg-color">-->
-    <!--          <el-descriptions :colon="false" :column="5" direction="vertical">-->
-    <!--            <el-descriptions-item-->
-    <!--                :span="5"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="当日用电量："-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--            <el-descriptions-item-->
-    <!--                :span="1"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="电网用电量"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--            <el-descriptions-item-->
-    <!--                :span="1"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="储能放电量"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--            <el-descriptions-item-->
-    <!--                :span="1"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="储能充电量"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-
-    <!--            <el-descriptions-item-->
-    <!--                :span="1"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="负荷用电量"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--            <el-descriptions-item-->
-    <!--                :span="1"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="光伏发电量"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--          </el-descriptions>-->
-    <!--        </div>-->
-    <!--        &lt;!&ndash;        表格&ndash;&gt;-->
-    <!--        <el-table-->
-    <!--            class="common-table"-->
-    <!--            stripe-->
-    <!--            style="width: 100%;margin-top:25px;">-->
-    <!--          <el-table-column-->
-    <!--              label="功率"-->
-    <!--              prop="type">-->
-    <!--          </el-table-column>-->
-    <!--          <el-table-column-->
-    <!--              label="电网"-->
-    <!--          >-->
-    <!--            <template slot-scope="scope">-->
-    <!--              <span class="pointer"-->
-    <!--                    @click="showChart('簇电压',scope.row.clusterId)">{{ scope.row.clusterVoltage }} V</span>-->
-    <!--            </template>-->
-    <!--          </el-table-column>-->
-    <!--          <el-table-column-->
-    <!--              label="储能">-->
-    <!--            <template slot-scope="scope">-->
-    <!--              <span class="pointer"-->
-    <!--                    @click="showChart('簇电流',scope.row.clusterId)">{{ scope.row.clusterCurrent }} A</span>-->
-    <!--            </template>-->
-    <!--          </el-table-column>-->
-    <!--          <el-table-column-->
-    <!--              label="负荷">-->
-    <!--            <template slot-scope="scope">-->
-    <!--              <span class="pointer"-->
-    <!--                    @click="showChart('簇电流',scope.row.clusterId)">{{ scope.row.clusterCurrent }} A</span>-->
-    <!--            </template>-->
-    <!--          </el-table-column>-->
-    <!--          <el-table-column-->
-    <!--              label="光伏">-->
-    <!--            <template slot-scope="scope">-->
-    <!--              <span class="pointer"-->
-    <!--                    @click="showChart('当前SOC',scope.row.clusterId)">{{ scope.row.currentSoc }} %</span>-->
-    <!--            </template>-->
-    <!--          </el-table-column>-->
-    <!--        </el-table>-->
-    <!--        &lt;!&ndash;        图表&ndash;&gt;-->
-    <!--        <div id="emsChart" style="height: 350px"></div>-->
-    <!--      </el-card>-->
-    <!--    </div>-->
     <el-card
-        v-for="(item,index) in list"
+      v-for="(group, index) in filteredSectionGroups"
-        :key="index+'emsList'"
+      :key="index + 'emsSection'"
-        class="sbjk-card-container list running-card-container"
+      class="sbjk-card-container list running-card-container"
-        shadow="always"
+      shadow="always"
     >
       <div slot="header">
-        <span class="large-title">{{ item.deviceName }}</span>
+        <span class="large-title">{{ group.displayName || group.sectionName || "EMS" }}</span>
         <div class="info">
-          <div>
+          <div>状态：{{ group.statusText }}</div>
-            EMS控制模式: {{
+          <div>数据更新时间：{{ group.updateTimeText }}</div>
-              item.emsStatus === 0 ? '自动' : '手动'
-            }}
-          </div>
-          <div>数据更新时间：{{ item.dataUpdateTime }}</div>
-        </div>
-        <div class="alarm">
-          <el-button size="small" round style="margin-right:20px;" type="primary" @click="pointDetail(item,'point')">详细
-          </el-button>
-          <el-badge :value="item.alarmNum || 0" class="item">
-            <i
-                class="el-icon-message-solid alarm-icon"
-                @click="pointDetail(item,'alarmPoint')"
-            ></i>
-          </el-badge>
         </div>
       </div>
       <el-row class="device-info-row">
-        <el-col v-for="(tempDataItem,tempDataIndex) in bmsDataList" :key="tempDataIndex+'bmsTempData'"
+        <el-col
-                :span="6" class="device-info-col">
+          v-for="(item, dataIndex) in group.items"
-            <span class="pointer" @click="showChart(tempDataItem.name,item.deviceId)">
+          :key="dataIndex + 'emsField'"
-              <span class="left">{{ tempDataItem.name }}</span> <span class="right">{{ item[tempDataItem.attr] }}<span
+          :span="6"
-                v-html="tempDataItem.unit"></span></span>
+          class="device-info-col"
-            </span>
+          :class="{ 'field-disabled': !item.pointId }"
-        </el-col>
+        >
-        <el-col v-for="(tempDataItem,tempDataIndex) in pcsDataList" :key="tempDataIndex+'pcsTempData'"
+          <div class="field-click-wrapper" @click="handleFieldClick(item)">
-                :span="6" class="device-info-col">
+            <span class="left">{{ item.fieldName }}</span>
-            <span class="pointer" @click="showChart(tempDataItem.name,item.deviceId)">
+            <span class="right">
-              <span class="left">{{ tempDataItem.name }}</span> <span class="right">{{ item[tempDataItem.attr] }}<span
+              <i v-if="isPointLoading(item.fieldValue)" class="el-icon-loading point-loading-icon"></i>
-                v-html="tempDataItem.unit"></span></span>
+              <span v-else>{{ displayValue(item.fieldValue) | formatNumber }}</span>
             </span>
+          </div>
         </el-col>
       </el-row>
     </el-card>
 
-    <el-empty v-show="list.length <= 0" :image-size="200"></el-empty>
+    <el-dialog
-    <point-chart ref="pointChart" :site-id="siteId"/>
+      :visible.sync="curveDialogVisible"
-    <point-table ref="pointTable"/>
+      :title="curveDialogTitle"
+      width="1000px"
+      append-to-body
+      class="ems-dialog"
+      :close-on-click-modal="false"
+      destroy-on-close
+      @opened="handleCurveDialogOpened"
+      @closed="handleCurveDialogClosed"
+    >
+      <div class="curve-tools">
+        <el-date-picker
+          v-model="curveCustomRange"
+          type="datetimerange"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          range-separator="至"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          style="width: 440px"
+        />
+        <el-button type="primary" size="mini" :loading="curveLoading" @click="loadCurveData">查询</el-button>
+      </div>
+      <div v-loading="curveLoading" ref="curveChartRef" style="height: 380px;"></div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import pointChart from "./../PointChart.vue";
+import * as echarts from "echarts";
-import PointTable from "@/views/ems/site/sblb/PointTable.vue";
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import {getEmsDataList} from "@/api/ems/dzjk";
 import intervalUpdate from "@/mixins/ems/intervalUpdate";
+import { getProjectDisplayData } from "@/api/ems/dzjk";
+import { getDeviceList, getPointConfigCurve } from "@/api/ems/site";
 
 export default {
   name: "DzjkSbjkEms",
-  components: {pointChart, PointTable},
   mixins: [getQuerySiteId, intervalUpdate],
   data() {
     return {
       loading: false,
-      list: [],
+      displayData: [],
-      bmsDataList: [{
+      selectedSectionKey: "",
-        name: 'BMS1SOC',
+      emsDeviceList: [],
-        attr: 'bms1Soc'
+      curveDialogVisible: false,
+      curveDialogTitle: "点位曲线",
+      curveChart: null,
+      curveLoading: false,
+      curveCustomRange: [],
+      curveQuery: {
+        siteId: "",
+        pointId: "",
+        pointType: "data",
+        rangeType: "custom",
+        startTime: "",
+        endTime: "",
       },
-        {
-          name: 'BMS2SOC',
-          attr: 'bms2Soc'
-        },
-        {
-          name: 'BMS3SOC',
-          attr: 'bms3Soc'
-        },
-        {
-          name: 'BMS4SOC',
-          attr: 'bms4Soc'
-        }],
-      pcsDataList: [{
-        name: 'PCS-1有功功率',
-        attr: 'pcs1Yggl'
-      },
-        {
-          name: 'PCS-2有功功率',
-          attr: 'pcs2Yggl'
-        },
-        {
-          name: 'PCS-3有功功率',
-          attr: 'pcs3Yggl'
-        },
-        {
-          name: 'PCS-4有功功率',
-          attr: 'pcs4Yggl'
-        }]
     };
   },
+  computed: {
+    moduleDisplayData() {
+      return (this.displayData || []).filter((item) => item.menuCode === "SBJK_EMS");
+    },
+    emsTemplateFields() {
+      const source = this.moduleDisplayData || [];
+      const result = [];
+      const seen = new Set();
+      source.forEach((item) => {
+        const fieldName = String(item?.fieldName || "").trim();
+        if (!fieldName || seen.has(fieldName)) {
+          return;
+        }
+        seen.add(fieldName);
+        result.push(fieldName);
+      });
+      return result.length > 0 ? result : this.fallbackFields;
+    },
+    sectionGroups() {
+      const source = this.moduleDisplayData || [];
+      const devices = (this.emsDeviceList || []).length > 0
+        ? this.emsDeviceList
+        : [{ deviceId: "", deviceName: "EMS" }];
+
+      return devices.map((device, index) => {
+        const deviceId = String(device?.deviceId || device?.id || "").trim();
+        const sectionKey = deviceId || `EMS_${index}`;
+        const displayName = String(device?.deviceName || device?.name || deviceId || `EMS${index + 1}`).trim();
+        const exactRows = source.filter((item) => String(item?.deviceId || "").trim() === deviceId);
+        const fallbackRows = source.filter((item) => !String(item?.deviceId || "").trim());
+
+        const exactValueMap = {};
+        exactRows.forEach((item) => {
+          const key = String(item?.fieldName || "").trim();
+          if (key) {
+            exactValueMap[key] = item;
+          }
+        });
+        const fallbackValueMap = {};
+        fallbackRows.forEach((item) => {
+          const key = String(item?.fieldName || "").trim();
+          if (key && fallbackValueMap[key] === undefined) {
+            fallbackValueMap[key] = item;
+          }
+        });
+
+        const items = (this.emsTemplateFields || []).map((fieldName) => {
+          const row = exactValueMap[fieldName] || fallbackValueMap[fieldName] || {};
+          return {
+            fieldName,
+            fieldValue: row.fieldValue,
+            valueTime: row.valueTime,
+            pointId: String(row?.dataPoint || "").trim(),
+            raw: row,
+          };
+        });
+
+        const statusItem = (items || []).find((it) => String(it.fieldName || "").includes("状态"));
+        const timestamps = [...exactRows, ...fallbackRows]
+          .map((it) => new Date(it?.valueTime).getTime())
+          .filter((ts) => !isNaN(ts));
+
+        return {
+          sectionName: displayName,
+          sectionKey,
+          displayName,
+          deviceId,
+          items,
+          statusText: this.displayValue(statusItem ? statusItem.fieldValue : "-"),
+          updateTimeText: timestamps.length > 0 ? this.formatDate(new Date(Math.max(...timestamps))) : "-",
+        };
+      });
+    },
+    displaySectionGroups() {
+      if (this.sectionGroups.length > 0) {
+        return this.sectionGroups;
+      }
+      return [
+        {
+          sectionName: "EMS",
+          items: this.fallbackFields.map((fieldName) => ({ fieldName, fieldValue: "-" })),
+          statusText: "-",
+          updateTimeText: "-",
+        },
+      ];
+    },
+    filteredSectionGroups() {
+      const groups = this.displaySectionGroups || [];
+      if (!this.selectedSectionKey) {
+        return groups;
+      }
+      return groups.filter((group) => group.sectionKey === this.selectedSectionKey);
+    },
+    fallbackFields() {
+      return [
+        "BMS1SOC",
+        "BMS2SOC",
+        "BMS3SOC",
+        "BMS4SOC",
+        "PCS-1有功功率",
+        "PCS-2有功功率",
+        "PCS-3有功功率",
+        "PCS-4有功功率",
+      ];
+    },
+  },
   methods: {
-    // 查看设备电位表格
+    handleFieldClick(item) {
-    pointDetail(row, dataType) {
+      const pointId = String(item?.pointId || item?.raw?.dataPoint || "").trim();
-      const {deviceId} = row
+      if (!pointId) {
-      this.$refs.pointTable.showTable({siteId: this.siteId, deviceId, deviceCategory: 'EMS'}, dataType)
+        this.$message.warning("该字段未配置点位，无法查询曲线");
+        return;
+      }
+      this.openCurveDialog({
+        pointId,
+        title: item?.fieldName || pointId,
+      });
     },
-    showChart(pointName, deviceId) {
+    openCurveDialog({ pointId, title }) {
-      pointName &&
+      const range = this.getDefaultCurveRange();
-      this.$refs.pointChart.showChart({pointName, deviceCategory: 'EMS', deviceId});
+      this.curveCustomRange = range;
+      this.curveDialogTitle = `点位曲线 - ${title || pointId}`;
+      this.curveQuery = {
+        siteId: this.siteId,
+        pointId,
+        pointType: "data",
+        rangeType: "custom",
+        startTime: range[0],
+        endTime: range[1],
+      };
+      this.curveDialogVisible = true;
     },
-    getData() {
+    handleCurveDialogOpened() {
-      this.loading = true;
+      if (!this.curveChart && this.$refs.curveChartRef) {
-      getEmsDataList(this.siteId)
+        this.curveChart = echarts.init(this.$refs.curveChartRef);
-          .then((response) => {
+      }
-            const data = response?.data || {};
+      this.loadCurveData();
-            this.list = JSON.parse(JSON.stringify(data));
+    },
-          })
+    handleCurveDialogClosed() {
-          .finally(() => (this.loading = false));
+      if (this.curveChart) {
+        this.curveChart.dispose();
+        this.curveChart = null;
+      }
+      this.curveLoading = false;
+    },
+    getDefaultCurveRange() {
+      const end = new Date();
+      const start = new Date(end.getTime() - 24 * 60 * 60 * 1000);
+      return [this.formatDateTime(start), this.formatDateTime(end)];
+    },
+    formatDateTime(date) {
+      const d = new Date(date);
+      const p = (n) => String(n).padStart(2, "0");
+      return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}:${p(d.getSeconds())}`;
+    },
+    formatCurveTime(value) {
+      if (value === undefined || value === null || value === "") {
+        return "";
+      }
+      const raw = String(value).trim();
+      const normalized = raw
+        .replace("T", " ")
+        .replace(/\.\d+/, "")
+        .replace(/Z$/, "")
+        .replace(/([+-]\d{2}:?\d{2})$/, "")
+        .trim();
+      const matched = normalized.match(/^(\d{4}-\d{2}-\d{2})\s+(\d{2}:\d{2})/);
+      if (matched) {
+        return `${matched[1]} ${matched[2]}`;
+      }
+      return normalized.slice(0, 16);
+    },
+    loadCurveData() {
+      if (!this.curveQuery.siteId || !this.curveQuery.pointId) {
+        this.$message.warning("点位信息不完整，无法查询曲线");
+        return;
+      }
+      if (!this.curveCustomRange || this.curveCustomRange.length !== 2) {
+        this.$message.warning("请选择查询时间范围");
+        return;
+      }
+      this.curveQuery.startTime = this.curveCustomRange[0];
+      this.curveQuery.endTime = this.curveCustomRange[1];
+      const query = {
+        siteId: this.curveQuery.siteId,
+        pointId: this.curveQuery.pointId,
+        pointType: "data",
+        rangeType: "custom",
+        startTime: this.curveQuery.startTime,
+        endTime: this.curveQuery.endTime,
+      };
+      this.curveLoading = true;
+      getPointConfigCurve(query)
+        .then((response) => {
+          const rows = response?.data || [];
+          this.renderCurveChart(rows);
+        })
+        .catch(() => {
+          this.renderCurveChart([]);
+        })
+        .finally(() => {
+          this.curveLoading = false;
+        });
+    },
+    renderCurveChart(rows = []) {
+      if (!this.curveChart) return;
+      const xData = rows.map((item) => this.formatCurveTime(item.dataTime));
+      const yData = rows.map((item) => item.pointValue);
+      this.curveChart.clear();
+      this.curveChart.setOption({
+        legend: {},
+        grid: {
+          containLabel: true,
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            type: "cross",
+          },
+        },
+        textStyle: {
+          color: "#333333",
+        },
+        xAxis: {
+          type: "category",
+          data: xData,
+        },
+        yAxis: {
+          type: "value",
+        },
+        dataZoom: [
+          {
+            type: "inside",
+            start: 0,
+            end: 100,
+          },
+          {
+            start: 0,
+            end: 100,
+          },
+        ],
+        series: [
+          {
+            name: this.curveDialogTitle,
+            type: "line",
+            data: yData,
+            connectNulls: true,
+          },
+        ],
+      });
+      if (!rows.length) {
+        this.$message.warning("当前时间范围暂无曲线数据");
+      }
+    },
+    handleTagClick(sectionKey) {
+      this.selectedSectionKey = sectionKey || "";
+    },
+    displayValue(value) {
+      return value === undefined || value === null || value === "" ? "-" : value;
+    },
+    isPointLoading(value) {
+      return this.loading && (value === undefined || value === null || value === "" || value === "-");
+    },
+    formatDate(date) {
+      if (!(date instanceof Date) || isNaN(date.getTime())) {
+        return "-";
+      }
+      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())}`;
+    },
+    getEmsDeviceList() {
+      return getDeviceList(this.siteId)
+        .then((response) => {
+          const list = response?.data || [];
+          this.emsDeviceList = list.filter((item) => item.deviceCategory === "EMS");
+        })
+        .catch(() => {
+          this.emsDeviceList = [];
+        });
     },
     updateData() {
-      this.getData();
+      this.loading = true;
+      Promise.all([getProjectDisplayData(this.siteId), this.getEmsDeviceList()])
+        .then(([response]) => {
+          this.displayData = response?.data || [];
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
     init() {
       this.updateData();
       this.updateInterval(this.updateData);
     },
   },
+  beforeDestroy() {
+    if (this.curveChart) {
+      this.curveChart.dispose();
+      this.curveChart = null;
+    }
+  },
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style scoped lang="scss">
+.sbjk-card-container {
+  &.list:not(:last-child) {
+    margin-bottom: 25px;
+  }
+
+  .info {
+    float: right;
+    text-align: right;
+    font-size: 12px;
+    color: #666;
+    line-height: 18px;
+  }
+}
+
+.pcs-tags {
+  margin: 0 0 12px;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  justify-content: flex-start;
+  align-items: center;
+}
+
+.pcs-tag-item {
+  cursor: pointer;
+}
+
+.device-info-col {
+  cursor: pointer;
+}
+
+.field-click-wrapper {
+  width: 100%;
+}
+
+.device-info-col.field-disabled {
+  cursor: not-allowed;
+  opacity: 0.8;
+}
+
+.curve-tools {
+  margin-bottom: 10px;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
+.point-loading-icon {
+  color: #409eff;
+  display: inline-block;
+  transform-origin: center;
+  animation: pointLoadingSpinPulse 1.1s linear infinite;
+}
+@keyframes pointLoadingSpinPulse {
+  0% { opacity: 0.45; transform: rotate(0deg) scale(0.9); }
+  50% { opacity: 1; transform: rotate(180deg) scale(1.08); }
+  100% { opacity: 0.45; transform: rotate(360deg) scale(0.9); }
+}
+</style>

src/views/ems/dzjk/sbjk/index.vue

@@ -72,4 +72,3 @@ export default {
   flex: 1;
 }
 </style>
-

src/views/ems/dzjk/sbjk/pcs/index.vue

@@ -1,18 +1,34 @@
 <template>
-  <div v-loading="loading" class="pcs-ems-dashboard-editor-container">
+  <div class="pcs-ems-dashboard-editor-container">
-    <!--    顶部六个方块-->
+    <div class="pcs-tags">
-    <real-time-base-info :data="runningHeadData"/>
+      <el-tag
+          size="small"
+          :type="selectedPcsId ? 'info' : 'primary'"
+          :effect="selectedPcsId ? 'plain' : 'dark'"
+          class="pcs-tag-item"
+          @click="handleTagClick('')"
+      >
+        全部
+      </el-tag>
+      <el-tag
+          v-for="(item, index) in pcsDeviceList"
+          :key="index + 'pcsTag'"
+          size="small"
+          :type="selectedPcsId === (item.deviceId || item.id) ? 'primary' : 'info'"
+          :effect="selectedPcsId === (item.deviceId || item.id) ? 'dark' : 'plain'"
+          class="pcs-tag-item"
+          @click="handleTagClick(item.deviceId || item.id || '')"
+      >
+        {{ item.deviceName || item.deviceId || item.id || 'PCS' }}
+      </el-tag>
+    </div>
     <div
-        v-for="(pcsItem, pcsIndex) in pcsList"
+        v-for="(pcsItem, pcsIndex) in filteredPcsList"
         :key="pcsIndex + 'PcsHome'"
         style="margin-bottom: 25px"
     >
       <el-card
-          :class="{
+          :class="handleCardClass(pcsItem)"
-          'warning-card-container': pcsItem.workStatus === '1',
-          'timing-card-container': pcsItem.workStatus === '2',
-          'running-card-container': !['1', '2'].includes(pcsItem.workStatus),
-        }"
           class="sbjk-card-container common-card-container-body-no-padding common-card-container-no-title-bg"
           shadow="always"
       >
@@ -21,27 +37,13 @@
           >{{ pcsItem.deviceName }}</span
           >
           <div class="info">
-            <div>
+            <div v-if="(($store.state.ems && $store.state.ems.communicationStatusOptions) || {})[pcsItem.communicationStatus]">
-              {{
+              {{ (($store.state.ems && $store.state.ems.communicationStatusOptions) || {})[pcsItem.communicationStatus] }}
-                $store.state.ems.communicationStatusOptions[
-                    pcsItem.communicationStatus
-                    ]
-              }}
             </div>
             <div>数据更新时间：{{ pcsItem.dataUpdateTime }}</div>
           </div>
           <div class="alarm">
-            <pcs-switch style="margin-right:10px;"
+            <el-badge :hidden="!pcsItem.alarmNum" :value="pcsItem.alarmNum || 0" class="item">
-                        :round="true"
-                        size="small"
-                        type="danger"
-                        :data="pcsItem"
-                        @updateSuccess="init"/>
-            <el-button type="primary" round size="small" style="margin-right:20px;"
-                       @click="pointDetail(pcsItem,'point')">
-              详细
-            </el-button>
-            <el-badge :value="pcsItem.alarmNum || 0" class="item">
               <i
                   class="el-icon-message-solid alarm-icon"
                   @click="pointDetail(pcsItem,'alarmPoint')"
@@ -52,15 +54,18 @@
         <div class="descriptions-main">
           <el-descriptions :colon="false" :column="4" direction="vertical">
             <el-descriptions-item
-                :contentClassName="`descriptions-direction ${
+                contentClassName="descriptions-direction work-status"
-                pcsItem.workStatus === '0' ? 'save' : 'danger'
-              }`"
                 :span="1"
                 label="工作状态"
                 labelClassName="descriptions-label"
-            >{{
+            >
-                $store.state.ems.workStatusOptions[pcsItem.workStatus]
+              <span
-              }}
+                class="pointer"
+                :class="{ 'field-disabled': !hasFieldPointId(pcsItem, 'workStatus') }"
+                @click="handlePcsFieldClick(pcsItem, 'workStatus', '工作状态')"
+              >
+                {{ formatDictValue(pcsWorkStatusOptions, pcsItem.workStatus) }}
+              </span>
             </el-descriptions-item
             >
             <el-descriptions-item
@@ -68,21 +73,31 @@
                 contentClassName="descriptions-direction"
                 label="并网状态"
                 labelClassName="descriptions-label"
-            >{{
+            >
-                $store.state.ems.gridStatusOptions[pcsItem.gridStatus]
+              <span
-              }}
+                class="pointer"
+                :class="{ 'field-disabled': !hasFieldPointId(pcsItem, 'gridStatus') }"
+                @click="handlePcsFieldClick(pcsItem, 'gridStatus', '并网状态')"
+              >
+                {{ formatDictValue(pcsGridStatusOptions, pcsItem.gridStatus) }}
+              </span>
             </el-descriptions-item
             >
             <el-descriptions-item
                 :contentClassName="`descriptions-direction ${
-                pcsItem.deviceStatus === '2' ? 'save' : 'danger'
+                pcsItem.deviceStatus === '1' ? 'save' : 'danger'
               }`"
                 :span="1"
                 label="设备状态"
                 labelClassName="descriptions-label"
-            >{{
+            >
-                $store.state.ems.deviceStatusOptions[pcsItem.deviceStatus]
+              <span
-              }}
+                class="pointer"
+                :class="{ 'field-disabled': !hasFieldPointId(pcsItem, 'deviceStatus') }"
+                @click="handlePcsFieldClick(pcsItem, 'deviceStatus', '设备状态')"
+              >
+                {{ formatDictValue(pcsDeviceStatusOptions, pcsItem.deviceStatus) }}
+              </span>
             </el-descriptions-item
             >
             <el-descriptions-item
@@ -90,9 +105,14 @@
                 contentClassName="descriptions-direction"
                 label="控制模式"
                 labelClassName="descriptions-label"
-            >{{
+            >
-                $store.state.ems.controlModeOptions[pcsItem.controlMode]
+              <span
-              }}
+                class="pointer"
+                :class="{ 'field-disabled': !hasFieldPointId(pcsItem, 'controlMode') }"
+                @click="handlePcsFieldClick(pcsItem, 'controlMode', '控制模式')"
+              >
+                {{ formatDictValue(pcsControlModeOptions, pcsItem.controlMode) }}
+              </span>
             </el-descriptions-item
             >
           </el-descriptions>
@@ -113,11 +133,11 @@
             >
               <span
                   class="pointer"
-                  @click="
+                  :class="{ 'field-disabled': !hasFieldPointId(pcsItem, item.attr) }"
-                  showChart(item.pointName || '', pcsItem.deviceId)
+                  @click="handlePcsFieldClick(pcsItem, item.attr, item.label)"
-                "
               >
-                {{ pcsItem[item.attr] | formatNumber }}
+                <i v-if="isPointLoading(pcsItem[item.attr])" class="el-icon-loading point-loading-icon"></i>
+                <span v-else>{{ displayValue(pcsItem[item.attr]) | formatNumber }}</span>
                 <span v-if="item.unit" v-html="item.unit"></span>
               </span>
             </el-descriptions-item>
@@ -151,7 +171,8 @@
             >
               <span
                   class="pointer"
-                  @click="showChart('直流功率', item.deviceId,true)"
+                  :class="{ 'field-disabled': !item.dcPowerPointId }"
+                  @click="openCurveDialogByPointId(item.dcPowerPointId, '直流功率')"
               >{{ item.dcPower }}kW</span
               >
             </el-descriptions-item>
@@ -163,7 +184,8 @@
             >
               <span
                   class="pointer"
-                  @click="showChart('直流电压', item.deviceId,true)"
+                  :class="{ 'field-disabled': !item.dcVoltagePointId }"
+                  @click="openCurveDialogByPointId(item.dcVoltagePointId, '直流电压')"
               >{{ item.dcVoltage }}V</span
               >
             </el-descriptions-item>
@@ -175,7 +197,8 @@
             >
               <span
                   class="pointer"
-                  @click="showChart('直流电流',  item.deviceId,true)"
+                  :class="{ 'field-disabled': !item.dcCurrentPointId }"
+                  @click="openCurveDialogByPointId(item.dcCurrentPointId, '直流电流')"
               >{{ item.dcCurrent }}A</span
               >
             </el-descriptions-item>
@@ -183,36 +206,104 @@
         </div>
       </el-card>
     </div>
-    <el-empty v-show="pcsList.length <= 0" :image-size="200"></el-empty>
-    <point-chart ref="pointChart" :site-id="siteId"/>
     <point-table ref="pointTable"/>
+    <el-dialog
+      :visible.sync="curveDialogVisible"
+      :title="curveDialogTitle"
+      width="1000px"
+      append-to-body
+      class="ems-dialog"
+      :close-on-click-modal="false"
+      destroy-on-close
+      @opened="handleCurveDialogOpened"
+      @closed="handleCurveDialogClosed"
+    >
+      <div class="curve-tools">
+        <el-date-picker
+          v-model="curveCustomRange"
+          type="datetimerange"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          range-separator="至"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          style="width: 440px"
+        />
+        <el-button type="primary" size="mini" :loading="curveLoading" @click="loadCurveData">查询</el-button>
+      </div>
+      <div v-loading="curveLoading" ref="curveChartRef" style="height: 380px;"></div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import pointChart from "./../PointChart.vue";
+import * as echarts from "echarts";
 import PointTable from "@/views/ems/site/sblb/PointTable.vue";
-import RealTimeBaseInfo from "./../RealTimeBaseInfo.vue";
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import {getPcsDetailInfo, getRunningHeadInfo} from "@/api/ems/dzjk";
+import {getPcsNameList, getProjectDisplayData} from "@/api/ems/dzjk";
 import intervalUpdate from "@/mixins/ems/intervalUpdate";
-import PcsSwitch from "@/views/ems/site/sblb/PcsSwitch.vue";
+import {mapState} from "vuex";
+import {getPointConfigCurve, getSingleMonitorWorkStatusEnumMappings} from "@/api/ems/site";
 
 export default {
   name: "DzjkSbjkPcs",
-  components: {RealTimeBaseInfo, pointChart, PointTable, PcsSwitch},
+  components: {PointTable},
   mixins: [getQuerySiteId, intervalUpdate],
+  computed: {
+    ...mapState({
+      PCSWorkStatusOptions: state => state?.ems?.PCSWorkStatusOptions || {},
+    }),
+    pcsWorkStatusOptions() {
+      return this.getEnumOptions("PCS", "workStatus", this.PCSWorkStatusOptions || {});
+    },
+    pcsGridStatusOptions() {
+      return this.getEnumOptions("PCS", "gridStatus", (this.$store.state.ems && this.$store.state.ems.gridStatusOptions) || {});
+    },
+    pcsDeviceStatusOptions() {
+      return this.getEnumOptions("PCS", "deviceStatus", (this.$store.state.ems && this.$store.state.ems.deviceStatusOptions) || {});
+    },
+    pcsControlModeOptions() {
+      return this.getEnumOptions("PCS", "controlMode", (this.$store.state.ems && this.$store.state.ems.controlModeOptions) || {});
+    },
+    filteredPcsList() {
+      if (!this.selectedPcsId) {
+        return this.pcsList || [];
+      }
+      return (this.pcsList || []).filter(item => item.deviceId === this.selectedPcsId);
+    },
+  },
   data() {
     return {
       loading: false,
-      runningHeadData: {}, //运行信息
+      displayData: [],
-      pcsList: [],
+      pcsDeviceList: [],
+      siteEnumOptionMap: {},
+      selectedPcsId: "",
+      curveDialogVisible: false,
+      curveDialogTitle: "点位曲线",
+      curveChart: null,
+      curveLoading: false,
+      curveCustomRange: [],
+      curveQuery: {
+        siteId: "",
+        pointId: "",
+        pointType: "data",
+        rangeType: "custom",
+        startTime: "",
+        endTime: "",
+      },
+      pcsList: [{
+        deviceId: "",
+        deviceName: "PCS",
+        dataUpdateTime: "-",
+        alarmNum: 0,
+        pcsBranchInfoList: [],
+      }],
       infoData: [
         {
-          label: "总交流有功电率",
+          label: "总交流有功功率",
           attr: "totalActivePower",
           unit: "kW",
-          pointName: "总交流有功电率",
+          pointName: "总交流有功功率",
         },
         {
           label: "当天交流充电量",
@@ -228,10 +319,10 @@ export default {
           pointName: "A相电流",
         },
         {
-          label: "总交流无功电率",
+          label: "总交流无功功率",
           attr: "totalReactivePower",
           unit: "kVar",
-          pointName: "总交流无功电率",
+          pointName: "总交流无功功率",
         },
         {
           label: "当天交流放电量",
@@ -284,44 +375,391 @@ export default {
           pointName: "交流频率",
         },
       ],
-      pcsBranchList: [], //pcs的支路列表
     };
   },
   methods: {
+    displayValue(value) {
+      return value === undefined || value === null || value === "" ? "-" : value;
+    },
+    isPointLoading(value) {
+      return this.loading && (value === undefined || value === null || value === "" || value === "-");
+    },
+    normalizeDictKey(value) {
+      const raw = String(value == null ? "" : value).trim();
+      if (!raw) return "";
+      if (/^-?\d+(\.0+)?$/.test(raw)) {
+        return String(parseInt(raw, 10));
+      }
+      return raw;
+    },
+    formatDictValue(options, value) {
+      const dict = (options && typeof options === "object") ? options : {};
+      const key = this.normalizeDictKey(value);
+      if (!key) return "-";
+      return dict[key] || key;
+    },
+    normalizeDeviceId(value) {
+      return String(value == null ? "" : value).trim().toUpperCase();
+    },
+    buildEnumScopeKey(deviceCategory, matchField) {
+      return `${String(deviceCategory || "").trim()}|${String(matchField || "").trim()}`;
+    },
+    buildSiteEnumOptionMap(mappings = []) {
+      return (mappings || []).reduce((acc, item) => {
+        const scopeKey = this.buildEnumScopeKey(item?.deviceCategory, item?.matchField);
+        const dataEnumCode = this.normalizeDictKey(item?.dataEnumCode);
+        const enumCode = this.normalizeDictKey(item?.enumCode);
+        const enumName = String(item?.enumName || "").trim();
+        const optionKey = dataEnumCode || enumCode;
+        if (!scopeKey || !optionKey || !enumName) {
+          return acc;
+        }
+        if (!acc[scopeKey]) {
+          acc[scopeKey] = {};
+        }
+        acc[scopeKey][optionKey] = enumName;
+        return acc;
+      }, {});
+    },
+    loadSiteEnumOptions() {
+      if (!this.siteId) {
+        this.siteEnumOptionMap = {};
+        return Promise.resolve({});
+      }
+      return getSingleMonitorWorkStatusEnumMappings(this.siteId).then(response => {
+        const optionMap = this.buildSiteEnumOptionMap(response?.data || []);
+        this.siteEnumOptionMap = optionMap;
+        return optionMap;
+      }).catch(() => {
+        this.siteEnumOptionMap = {};
+        return {};
+      });
+    },
+    getEnumOptions(deviceCategory, matchField, fallback = {}) {
+      const scopeKey = this.buildEnumScopeKey(deviceCategory, matchField);
+      const siteOptions = this.siteEnumOptionMap[scopeKey];
+      if (siteOptions && Object.keys(siteOptions).length > 0) {
+        return siteOptions;
+      }
+      return fallback || {};
+    },
+    handleCardClass(item) {
+      const workStatus = this.normalizeDictKey((item && item.workStatus) || "");
+      const statusOptions = (this.pcsWorkStatusOptions && typeof this.pcsWorkStatusOptions === 'object')
+        ? this.pcsWorkStatusOptions
+        : {};
+      const hasStatus = Object.prototype.hasOwnProperty.call(statusOptions, workStatus);
+      return workStatus === '1' || !hasStatus
+        ? "timing-card-container"
+        : workStatus === '2'
+          ? 'warning-card-container'
+          : 'running-card-container';
+    },
     // 查看设备电位表格
     pointDetail(row, dataType) {
       const {deviceId} = row
       this.$refs.pointTable.showTable({siteId: this.siteId, deviceId, deviceCategory: 'PCS'}, dataType)
     },
-    showChart(pointName, deviceId, isBranch = false) {
+    hasFieldPointId(pcsItem, fieldName) {
-      pointName &&
+      const row = this.getFieldRow(pcsItem, fieldName);
-      this.$refs.pointChart.showChart({pointName, deviceCategory: isBranch ? 'BRANCH' : 'PCS', deviceId});
+      return !!String(row?.dataPoint || "").trim();
     },
-    //6个方块数据
+    getFieldRow(pcsItem, fieldName) {
-    getRunningHeadData() {
+      const key = String(fieldName || "").trim();
-      getRunningHeadInfo(this.siteId).then((response) => {
+      const map = pcsItem?._fieldRowMap || {};
-        this.runningHeadData = response?.data || {};
+      return map[key] || null;
+    },
+    handlePcsFieldClick(pcsItem, fieldName, title) {
+      const row = this.getFieldRow(pcsItem, fieldName);
+      const pointId = String(row?.dataPoint || "").trim();
+      this.openCurveDialogByPointId(pointId, title || fieldName);
+    },
+    openCurveDialogByPointId(pointId, title) {
+      const normalizedPointId = String(pointId || "").trim();
+      if (!normalizedPointId) {
+        this.$message.warning("该字段未配置点位，无法查询曲线");
+        return;
+      }
+      const range = this.getDefaultCurveRange();
+      this.curveCustomRange = range;
+      this.curveDialogTitle = `点位曲线 - ${title || normalizedPointId}`;
+      this.curveQuery = {
+        siteId: this.siteId,
+        pointId: normalizedPointId,
+        pointType: "data",
+        rangeType: "custom",
+        startTime: range[0],
+        endTime: range[1],
+      };
+      this.curveDialogVisible = true;
+    },
+    handleCurveDialogOpened() {
+      if (!this.curveChart && this.$refs.curveChartRef) {
+        this.curveChart = echarts.init(this.$refs.curveChartRef);
+      }
+      this.loadCurveData();
+    },
+    handleCurveDialogClosed() {
+      if (this.curveChart) {
+        this.curveChart.dispose();
+        this.curveChart = null;
+      }
+      this.curveLoading = false;
+    },
+    getDefaultCurveRange() {
+      const end = new Date();
+      const start = new Date(end.getTime() - 24 * 60 * 60 * 1000);
+      return [this.formatDateTime(start), this.formatDateTime(end)];
+    },
+    formatDateTime(date) {
+      const d = new Date(date);
+      const p = (n) => String(n).padStart(2, "0");
+      return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}:${p(d.getSeconds())}`;
+    },
+    formatCurveTime(value) {
+      if (value === undefined || value === null || value === "") {
+        return "";
+      }
+      const raw = String(value).trim();
+      const normalized = raw
+        .replace("T", " ")
+        .replace(/\.\d+/, "")
+        .replace(/Z$/, "")
+        .replace(/([+-]\d{2}:?\d{2})$/, "")
+        .trim();
+      const matched = normalized.match(/^(\d{4}-\d{2}-\d{2})\s+(\d{2}:\d{2})/);
+      if (matched) {
+        return `${matched[1]} ${matched[2]}`;
+      }
+      return normalized.slice(0, 16);
+    },
+    loadCurveData() {
+      if (!this.curveQuery.siteId || !this.curveQuery.pointId) {
+        this.$message.warning("点位信息不完整，无法查询曲线");
+        return;
+      }
+      if (!this.curveCustomRange || this.curveCustomRange.length !== 2) {
+        this.$message.warning("请选择查询时间范围");
+        return;
+      }
+      this.curveQuery.startTime = this.curveCustomRange[0];
+      this.curveQuery.endTime = this.curveCustomRange[1];
+      const query = {
+        siteId: this.curveQuery.siteId,
+        pointId: this.curveQuery.pointId,
+        pointType: "data",
+        rangeType: "custom",
+        startTime: this.curveQuery.startTime,
+        endTime: this.curveQuery.endTime,
+      };
+      this.curveLoading = true;
+      getPointConfigCurve(query).then((response) => {
+        const rows = response?.data || [];
+        this.renderCurveChart(rows);
+      }).catch(() => {
+        this.renderCurveChart([]);
+      }).finally(() => {
+        this.curveLoading = false;
       });
     },
-    getPcsList() {
+    renderCurveChart(rows = []) {
-      this.loading = true;
+      if (!this.curveChart) return;
-      getPcsDetailInfo(this.siteId)
+      const xData = rows.map(item => this.formatCurveTime(item.dataTime));
-          .then((response) => {
+      const yData = rows.map(item => item.pointValue);
-            const data = response?.data || {};
+      this.curveChart.clear();
-            this.pcsList = JSON.parse(JSON.stringify(data));
+      this.curveChart.setOption({
-          })
+        legend: {},
-          .finally(() => (this.loading = false));
+        grid: {
+          containLabel: true,
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            type: "cross",
+          },
+        },
+        textStyle: {
+          color: "#333333",
+        },
+        xAxis: {
+          type: "category",
+          data: xData,
+        },
+        yAxis: {
+          type: "value",
+        },
+        dataZoom: [
+          {
+            type: "inside",
+            start: 0,
+            end: 100,
+          },
+          {
+            start: 0,
+            end: 100,
+          },
+        ],
+        series: [
+          {
+            name: this.curveDialogTitle,
+            type: "line",
+            data: yData,
+            connectNulls: true,
+          },
+        ],
+      });
+      if (!rows.length) {
+        this.$message.warning("当前时间范围暂无曲线数据");
+      }
+    },
+    handleTagClick(deviceId) {
+      this.selectedPcsId = deviceId || "";
+    },
+    getModuleRows(menuCode, sectionName) {
+      return (this.displayData || []).filter(item => item.menuCode === menuCode && item.sectionName === sectionName);
+    },
+    getFieldName(fieldCode) {
+      if (!fieldCode) {
+        return "";
+      }
+      const index = fieldCode.lastIndexOf("__");
+      return index >= 0 ? fieldCode.slice(index + 2) : fieldCode;
+    },
+    getFieldMap(rows = [], deviceId = "") {
+      const rowMap = this.getFieldRowMap(rows, deviceId);
+      return Object.keys(rowMap).reduce((acc, fieldName) => {
+        const row = rowMap[fieldName] || {};
+        acc[fieldName] = row.fieldValue;
+        return acc;
+      }, {});
+    },
+    getFieldRowMap(rows = [], deviceId = "") {
+      const map = {};
+      const targetDeviceId = this.normalizeDeviceId(deviceId || "");
+      // 设备维度优先：先吃 device_id 对应值，再用默认值(空 device_id)补齐
+      rows.forEach(item => {
+        if (!item || !item.fieldCode) {
+          return;
+        }
+        const itemDeviceId = this.normalizeDeviceId(item.deviceId || "");
+        if (itemDeviceId !== targetDeviceId) {
+          return;
+        }
+        map[this.getFieldName(item.fieldCode)] = item;
+      });
+      rows.forEach(item => {
+        if (!item || !item.fieldCode) {
+          return;
+        }
+        const itemDeviceId = this.normalizeDeviceId(item.deviceId || "");
+        if (itemDeviceId !== "") {
+          return;
+        }
+        const fieldName = this.getFieldName(item.fieldCode);
+        if (map[fieldName] === undefined || map[fieldName] === null || map[fieldName] === "") {
+          map[fieldName] = item;
+        }
+      });
+      return map;
+    },
+    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())}`;
+    },
+    getPcsDeviceList() {
+      return getPcsNameList(this.siteId).then((response) => {
+        this.pcsDeviceList = response?.data || [];
+      }).catch(() => {
+        this.pcsDeviceList = [];
+      });
+    },
+    buildPcsList() {
+      const devices = (this.pcsDeviceList && this.pcsDeviceList.length > 0)
+        ? this.pcsDeviceList
+        : [{deviceId: this.siteId, deviceName: 'PCS'}];
+      this.pcsList = devices.map((device) => ({
+        ...this.getFieldMap(this.getModuleRows('SBJK_PCS', '电参量'), device.deviceId || device.id || this.siteId),
+        deviceId: device.deviceId || device.id || this.siteId,
+        deviceName: device.deviceName || device.name || device.deviceId || device.id || 'PCS',
+        ...this.getFieldMap(this.getModuleRows('SBJK_PCS', '状态'), device.deviceId || device.id || this.siteId),
+        _fieldRowMap: {
+          ...this.getFieldRowMap(this.getModuleRows('SBJK_PCS', '电参量'), device.deviceId || device.id || this.siteId),
+          ...this.getFieldRowMap(this.getModuleRows('SBJK_PCS', '状态'), device.deviceId || device.id || this.siteId),
+        },
+        dataUpdateTime: this.getLatestTime('SBJK_PCS'),
+        alarmNum: 0,
+        pcsBranchInfoList: [],
+      }));
     },
     updateData() {
-      this.getRunningHeadData();
+      this.loading = true;
-      this.getPcsList();
+      // 先渲染卡片框架，字段值走单点位 loading
+      this.buildPcsList();
+      Promise.all([
+        getProjectDisplayData(this.siteId),
+        this.getPcsDeviceList(),
+        this.loadSiteEnumOptions(),
+      ]).then(([displayResponse]) => {
+        this.displayData = displayResponse?.data || [];
+        this.buildPcsList();
+      }).finally(() => (this.loading = false));
     },
     init() {
       this.updateData();
       this.updateInterval(this.updateData);
     },
   },
+  beforeDestroy() {
+    if (this.curveChart) {
+      this.curveChart.dispose();
+      this.curveChart = null;
+    }
+  },
 };
 </script>
+<style lang="scss" scoped>
+.pcs-tags {
+  margin: 0 0 12px;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  justify-content: flex-start;
+  align-items: center;
+}
 
-<style lang="scss" scoped></style>
+.pcs-tag-item {
+  cursor: pointer;
+}
+
+.field-disabled {
+  cursor: not-allowed;
+  opacity: 0.8;
+}
+
+.curve-tools {
+  margin-bottom: 10px;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
+.point-loading-icon {
+  color: #409eff;
+  display: inline-block;
+  transform-origin: center;
+  animation: pointLoadingSpinPulse 1.1s linear infinite;
+}
+@keyframes pointLoadingSpinPulse {
+  0% { opacity: 0.45; transform: rotate(0deg) scale(0.9); }
+  50% { opacity: 1; transform: rotate(180deg) scale(1.08); }
+  100% { opacity: 0.45; transform: rotate(360deg) scale(0.9); }
+}
+</style>

src/views/ems/dzjk/sbjk/ssyx/CnglqxChart.vue

@@ -1,12 +1,12 @@
 <template>
   <el-card
-    shadow="always"
+      shadow="always"
-    class="common-card-container common-card-container-body-no-padding"
+      class="common-card-container common-card-container-body-no-padding"
   >
     <div slot="header">
       <span class="card-title">PCS有功功率/PCS无功功率</span>
     </div>
-    <div style="height: 360px" id="cnglqxChart" />
+    <div ref="chartRef" style="height: 360px" />
   </el-card>
 </template>
 
@@ -14,17 +14,23 @@
 <script>
 import * as echarts from "echarts";
 import resize from "@/mixins/ems/resize";
-import { storagePower } from "@/api/ems/dzjk";
+import { getPointConfigCurve } from "@/api/ems/site";
 
 export default {
   mixins: [resize],
+  props: {
+    displayData: {
+      type: Array,
+      default: () => []
+    }
+  },
   data() {
     return {
       chart: null,
     };
   },
   mounted() {
-    this.chart = echarts.init(document.querySelector("#cnglqxChart"));
+    this.chart = echarts.init(this.$refs.chartRef);
   },
   beforeDestroy() {
     if (!this.chart) {
@@ -35,57 +41,62 @@ export default {
   },
   methods: {
     init(siteId, timeRange) {
-      this.chart.showLoading();
+      const [startTime = "", endTime = ""] = timeRange;
-      const [startTime='', endTime=''] = timeRange;
+      const query = {
-      storagePower(siteId,startTime,endTime)
+        rangeType: "custom",
-        .then((response) => {
+        startTime: this.normalizeDateTime(startTime, false),
-          this.setOption(response?.data?.pcsPowerList || []);
+        endTime: this.normalizeDateTime(endTime, true),
+        siteId
+      };
+      const rows = (this.displayData || []).filter(
+        (item) =>
+          item &&
+          item.useFixedDisplay !== 1 &&
+          [
+            "SBJK_SSYX__curvePcsActivePower",
+            "SBJK_SSYX__curvePcsReactivePower"
+          ].includes(item.fieldCode) &&
+          item.dataPoint
+      );
+      const tasks = rows.map((row) => {
+        const pointId = String(row.dataPoint || "").trim();
+        if (!pointId) return Promise.resolve(null);
+        return getPointConfigCurve({
+          ...query,
+          pointId
         })
-        .finally(() => {
+          .then((response) => {
-          this.chart.hideLoading();
+            const list = response?.data || [];
+            return {
+              name: (row.deviceName || "") + (row.fieldName || row.fieldCode || pointId),
+              data: list
+                .map((item) => [
+                  this.parseToTimestamp(item.dataTime),
+                  Number(item.pointValue)
+                ])
+                .filter((item) => item[0] && !Number.isNaN(item[1]))
+            };
+          })
+          .catch(() => null);
+      });
+      Promise.all(tasks)
+        .then((series) => {
+          this.setOption((series || []).filter(Boolean));
         });
     },
-    setOption(data) {
+    normalizeDateTime(value, endOfDay) {
-      let xdata = [],
+      const raw = String(value || "").trim();
-        series = [];
+      if (!raw) return "";
-      data.forEach((element, index) => {
+      if (raw.includes(" ")) return raw;
-        if (index === 0) {
+      return `${raw} ${endOfDay ? "23:59:59" : "00:00:00"}`;
-          xdata = (element.energyStoragePowList || []).map((i) => i.createDate);
+    },
-        }
+    parseToTimestamp(value) {
-        series.push(
+      if (!value) return null;
-          {
+      const t = new Date(value).getTime();
-            type: "line",
+      return Number.isNaN(t) ? null : t;
-            name: `${element.deviceId}有功功率`,
+    },
-            areaStyle: {
+    setOption(seriesData = []) {
-              // color:'#FFBD00'
+      this.chart && this.chart.setOption({
-            },
-            data: (element.energyStoragePowList || []).map(
-              (i) => {
-                return {
-                  value:i.pcsTotalActPower,
-                  year:i.dateDay || ''
-                }
-              }
-            )
-          },
-          {
-            type: "line",
-            name: `${element.deviceId}无功功率`,
-            areaStyle: {
-              // color:'#FFBD00'
-            },
-            data: (element.energyStoragePowList || []).map(
-              (i) => {
-                return {
-                  value: i.pcsTotalReactivePower,
-                  year:i.dateDay || ''
-                }
-              }
-            ),
-          }
-        );
-      });
-      this.chart.setOption({
         legend: {
           left: "center",
           top: "5",
@@ -99,29 +110,16 @@ export default {
           containLabel: true,
         },
         tooltip: {
-          show:true,
+          show: true,
           trigger: "axis",
           axisPointer: {
-            // 坐标轴指示器，坐标轴触发有效
+            type: "cross",
-            type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
-          },
-          formatter :(params)=>{
-            if(params.length <= 0) return
-            let result = (params[0].data.year || '')+' '+ params[0].name + '<div>'
-            params.forEach(item=>{
-              const {color,seriesName,value} = item
-              result +=  `<div style="position: relative;padding-left:20px;line-height: 20px;">
-                <div style="position: absolute;top:50%;left:0;width:12px;height:12px;border-radius:100%;background: ${color};transform: translateY(-50%)"></div>
-                <span>${seriesName}</span><span style="margin-left:20px;font-weight: 700">${value}</span></div>`
-            })
-            result+='</div>'
-            return result
           }
         },
         textStyle: {
           color: "#333333",
         },
-        xAxis: { type: "category", data: xdata },
+        xAxis: { type: "time" },
         yAxis: {
           type: "value",
         },
@@ -136,8 +134,17 @@ export default {
             end: 100,
           },
         ],
-        series,
+        series: seriesData.map((item) => ({
-      });
+          type: "line",
+          name: item.name,
+          showSymbol: false,
+          smooth: true,
+          areaStyle: {
+            opacity: 0.35
+          },
+          data: item.data
+        })),
+      }, true);
     },
   },
 };

src/views/ems/dzjk/sbjk/ssyx/DcpjsocChart.vue

@@ -6,7 +6,7 @@
     <div slot="header">
       <span class="card-title">平均SOC</span>
     </div>
-    <div style="height: 360px" id="dcpjsocChart" />
+    <div ref="chartRef" style="height: 360px" />
   </el-card>
 </template>
 
@@ -14,16 +14,22 @@
 <script>
 import * as echarts from "echarts";
 import resize from "@/mixins/ems/resize";
-import { batteryAveSoc } from "@/api/ems/dzjk";
+import { getPointConfigCurve } from "@/api/ems/site";
 export default {
   mixins: [resize],
+  props: {
+    displayData: {
+      type: Array,
+      default: () => []
+    }
+  },
   data() {
     return {
       chart: null,
     };
   },
   mounted() {
-    this.chart = echarts.init(document.querySelector("#dcpjsocChart"));
+    this.chart = echarts.init(this.$refs.chartRef);
   },
   beforeDestroy() {
     if (!this.chart) {
@@ -34,27 +40,53 @@ export default {
   },
   methods: {
     init(siteId,timeRange) {
-      this.chart.showLoading();
       const [startTime='', endTime=''] = timeRange;
-      batteryAveSoc(siteId,startTime,endTime)
+      const query = {
-        .then((response) => {
+        siteId,
-          this.setOption(response?.data?.batteryAveSOCList || []);
+        rangeType: "custom",
-        })
+        startTime: this.normalizeDateTime(startTime, false),
-        .finally(() => {
+        endTime: this.normalizeDateTime(endTime, true)
-          this.chart.hideLoading();
+      };
-        });
+      const rows = (this.displayData || []).filter(
-    },
+        (item) =>
-    setOption(data) {
+          item &&
-      let xdata = [],
+          item.fieldCode === "SBJK_SSYX__curveBatteryAveSoc" &&
-        ydata = [];
+          item.useFixedDisplay !== 1 &&
-      data.forEach((element) => {
+          item.dataPoint
-        xdata.push(element.createDate);
+      );
-        ydata.push({
+      const tasks = rows.map((row) => {
-          value:element.batterySOC,
+        const pointId = String(row.dataPoint || "").trim();
-          year:element.dateDay,
+        if(!pointId) return Promise.resolve(null);
-        });
+        return getPointConfigCurve({
+           ...query,
+           pointId
+        }).then((response) => {
+           const list = response?.data || [];
+           return {
+             name: (row.deviceName || "") + (row.fieldName || row.fieldCode || pointId),
+             data: list
+               .map((item) => [this.parseToTimestamp(item.dataTime), Number(item.pointValue)])
+               .filter((item) => item[0] && !Number.isNaN(item[1]))
+           };
+        }).catch(() => null);
       });
-      xdata = this.chart.setOption({
+      Promise.all(tasks).then((series) => {
+        this.setOption((series || []).filter(Boolean));
+      });
+    },
+    normalizeDateTime(value, endOfDay) {
+      const raw = String(value || "").trim();
+      if (!raw) return "";
+      if (raw.includes(" ")) return raw;
+      return `${raw} ${endOfDay ? "23:59:59" : "00:00:00"}`;
+    },
+    parseToTimestamp(value) {
+      if (!value) return null;
+      const t = new Date(value).getTime();
+      return Number.isNaN(t) ? null : t;
+    },
+    setOption(seriesData = []) {
+      this.chart && this.chart.setOption({
         legend: {
           left: "center",
           top: "5",
@@ -71,26 +103,13 @@ export default {
           show:true,
           trigger: "axis",
           axisPointer: {
-            // 坐标轴指示器，坐标轴触发有效
+            type: "cross",
-            type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
-          },
-          formatter :(params)=>{
-            if(params.length <= 0) return
-            let result = (params[0].data.year || '')+' '+params[0].name + '<div>'
-            params.forEach(item=>{
-              const {color,seriesName,value} = item
-              result +=  `<div style="position: relative;padding-left:20px;line-height: 20px;">
-                <div style="position: absolute;top:50%;left:0;width:12px;height:12px;border-radius:100%;background: ${color};transform: translateY(-50%)"></div>
-                <span>${seriesName}</span><span style="margin-left:20px;font-weight: 700">${value}</span></div>`
-            })
-            result+='</div>'
-            return result
           }
         },
         textStyle: {
           color: "#333333",
         },
-        xAxis: { type: "category", data: xdata },
+        xAxis: { type: "time" },
         yAxis: {
           type: "value",
         },
@@ -105,17 +124,17 @@ export default {
             end: 100,
           },
         ],
-        series: [
+        series: seriesData.map(item => ({
-          {
+          type: "line",
-            type: "line",
+          name: item.name,
-            name: `平均SOC`,
+          showSymbol: false,
-            areaStyle: {
+          smooth: true,
-              // color:'#FFBD00'
+          areaStyle: {
-            },
+            opacity: 0.35
-            data: ydata,
           },
-        ],
+          data: item.data
-      });
+        })),
+      },true);
     },
   },
 };

src/views/ems/dzjk/sbjk/ssyx/DcpjwdChart.vue

@@ -6,7 +6,7 @@
     <div slot="header">
       <span class="card-title">电池平均温度</span>
     </div>
-    <div style="height: 360px" id="dcpjwdChart" />
+    <div ref="chartRef" style="height: 360px" />
   </el-card>
 </template>
 
@@ -14,17 +14,23 @@
 <script>
 import * as echarts from "echarts";
 import resize from "@/mixins/ems/resize";
-import { batteryAveTemp } from "@/api/ems/dzjk";
+import { getPointConfigCurve } from "@/api/ems/site";
 
 export default {
   mixins: [resize],
+  props: {
+    displayData: {
+      type: Array,
+      default: () => []
+    }
+  },
   data() {
     return {
       chart: null,
     };
   },
   mounted() {
-    this.chart = echarts.init(document.querySelector("#dcpjwdChart"));
+    this.chart = echarts.init(this.$refs.chartRef);
   },
   beforeDestroy() {
     if (!this.chart) {
@@ -35,29 +41,53 @@ export default {
   },
   methods: {
     init(siteId,timeRange) {
-      this.chart.showLoading();
       const [startTime='', endTime=''] = timeRange;
-      batteryAveTemp(siteId,startTime,endTime)
+      const query = {
-        .then((response) => {
+        siteId,
-          this.setOption(response?.data?.batteryAveTempList || []);
+        rangeType: "custom",
-        })
+        startTime: this.normalizeDateTime(startTime, false),
-        .finally(() => {
+        endTime: this.normalizeDateTime(endTime, true)
-          this.chart.hideLoading();
+      };
-        });
+      const rows = (this.displayData || []).filter(
-    },
+        (item) =>
-    setOption(data) {
+          item &&
-      let xdata = [],
+          item.fieldCode === "SBJK_SSYX__curveBatteryAveTemp" &&
-        ydata = [];
+          item.useFixedDisplay !== 1 &&
-      data.forEach((element) => {
+          item.dataPoint
-        xdata.push(element.createDate);
+      );
-        ydata.push(
+      const tasks = rows.map((row) => {
-          {
+        const pointId = String(row.dataPoint || "").trim();
-            value: element.batteryTemp,
+        if(!pointId) return Promise.resolve(null);
-            year: element.dateDay
+        return getPointConfigCurve({
-          }
+           ...query,
-        );
+           pointId
+        }).then((response) => {
+           const list = response?.data || [];
+           return {
+             name: (row.deviceName || "") + (row.fieldName || row.fieldCode || pointId),
+             data: list
+               .map((item) => [this.parseToTimestamp(item.dataTime), Number(item.pointValue)])
+               .filter((item) => item[0] && !Number.isNaN(item[1]))
+           };
+        }).catch(() => null);
       });
-      xdata = this.chart.setOption({
+      Promise.all(tasks).then((series) => {
+        this.setOption((series || []).filter(Boolean));
+      });
+    },
+    normalizeDateTime(value, endOfDay) {
+      const raw = String(value || "").trim();
+      if (!raw) return "";
+      if (raw.includes(" ")) return raw;
+      return `${raw} ${endOfDay ? "23:59:59" : "00:00:00"}`;
+    },
+    parseToTimestamp(value) {
+      if (!value) return null;
+      const t = new Date(value).getTime();
+      return Number.isNaN(t) ? null : t;
+    },
+    setOption(seriesData = []) {
+      this.chart && this.chart.setOption({
         legend: {
           left: "center",
           top: "5",
@@ -74,26 +104,13 @@ export default {
           show:true,
           trigger: "axis",
           axisPointer: {
-            // 坐标轴指示器，坐标轴触发有效
+            type: "cross",
-            type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
-          },
-          formatter :(params)=>{
-            if(params.length <= 0) return
-            let result = (params[0].data.year || '')+' '+params[0].name + '<div>'
-            params.forEach(item=>{
-              const {color,seriesName,value} = item
-              result +=  `<div style="position: relative;padding-left:20px;line-height: 20px;">
-                <div style="position: absolute;top:50%;left:0;width:12px;height:12px;border-radius:100%;background: ${color};transform: translateY(-50%)"></div>
-                <span>${seriesName}</span><span style="margin-left:20px;font-weight: 700">${value}</span></div>`
-            })
-            result+='</div>'
-            return result
           }
         },
         textStyle: {
           color: "#333333",
         },
-        xAxis: { type: "category", data: xdata },
+        xAxis: { type: "time" },
         yAxis: {
           type: "value",
         },
@@ -108,17 +125,17 @@ export default {
             end: 100,
           },
         ],
-        series: [
+        series: seriesData.map(item => ({
-          {
+          type: "line",
-            type: "line",
+          name: item.name,
-            name: `电池平均温度`,
+          showSymbol: false,
-            areaStyle: {
+          smooth: true,
-              // color:'#FFBD00'
+          areaStyle: {
-            },
+            opacity: 0.35
-            data: ydata,
           },
-        ],
+          data: item.data
-      });
+        })),
+      },true);
     },
   },
 };

src/views/ems/dzjk/sbjk/ssyx/PocpjwdChart.vue

@@ -6,7 +6,7 @@
     <div slot="header">
       <span class="card-title">PCS最高温度</span>
     </div>
-    <div style="height: 360px" id="pocpjwdChart" />
+    <div ref="chartRef" style="height: 360px" />
   </el-card>
 </template>
 
@@ -14,17 +14,23 @@
 <script>
 import * as echarts from "echarts";
 import resize from "@/mixins/ems/resize";
-import { pcsMaxTemp } from "@/api/ems/dzjk";
+import { getPointConfigCurve } from "@/api/ems/site";
 
 export default {
   mixins: [resize],
+  props: {
+    displayData: {
+      type: Array,
+      default: () => []
+    }
+  },
   data() {
     return {
       chart: null,
     };
   },
   mounted() {
-    this.chart = echarts.init(document.querySelector("#pocpjwdChart"));
+    this.chart = echarts.init(this.$refs.chartRef);
   },
   beforeDestroy() {
     if (!this.chart) {
@@ -35,38 +41,53 @@ export default {
   },
   methods: {
     init(siteId,timeRange) {
-      this.chart.showLoading();
       const [startTime='', endTime=''] = timeRange;
-      pcsMaxTemp(siteId,startTime,endTime)
+      const query = {
-        .then((response) => {
+        siteId,
-          this.setOption(response?.data?.pcsMaxTempList || []);
+        rangeType: "custom",
-        })
+        startTime: this.normalizeDateTime(startTime, false),
-        .finally(() => {
+        endTime: this.normalizeDateTime(endTime, true)
-          this.chart.hideLoading();
+      };
-        });
+      const rows = (this.displayData || []).filter(
-    },
+        (item) =>
-    setOption(data) {
+          item &&
-      let xdata = [],
+          item.fieldCode === "SBJK_SSYX__curvePcsMaxTemp" &&
-        series = [];
+          item.useFixedDisplay !== 1 &&
-      data.forEach((element, index) => {
+          item.dataPoint
-        if (index === 0) {
+      );
-          xdata = (element.maxTempVoList || []).map((i) => i.createDate);
+      const tasks = rows.map((row) => {
-        }
+        const pointId = String(row.dataPoint || "").trim();
-        series.push({
+        if(!pointId) return Promise.resolve(null);
-          type: "line",
+        return getPointConfigCurve({
-          name: `${element.deviceId}最高温度`,
+           ...query,
-          areaStyle: {
+           pointId
-            // color:'#FFBD00'
+        }).then((response) => {
-          },
+           const list = response?.data || [];
-          data: (element.maxTempVoList || []).map((i) => {
+           return {
-            return {
+             name: (row.deviceName || "") + (row.fieldName || row.fieldCode || pointId),
-              value: i.temp,
+             data: list
-              year: i.dateDay
+               .map((item) => [this.parseToTimestamp(item.dataTime), Number(item.pointValue)])
-            }
+               .filter((item) => item[0] && !Number.isNaN(item[1]))
-          }),
+           };
-        });
+        }).catch(() => null);
       });
-      this.chart.setOption({
+      Promise.all(tasks).then((series) => {
+        this.setOption((series || []).filter(Boolean));
+      });
+    },
+    normalizeDateTime(value, endOfDay) {
+      const raw = String(value || "").trim();
+      if (!raw) return "";
+      if (raw.includes(" ")) return raw;
+      return `${raw} ${endOfDay ? "23:59:59" : "00:00:00"}`;
+    },
+    parseToTimestamp(value) {
+      if (!value) return null;
+      const t = new Date(value).getTime();
+      return Number.isNaN(t) ? null : t;
+    },
+    setOption(seriesData = []) {
+      this.chart && this.chart.setOption({
         legend: {
           left: "center",
           top: "5",
@@ -83,26 +104,13 @@ export default {
           show:true,
           trigger: "axis",
           axisPointer: {
-            // 坐标轴指示器，坐标轴触发有效
+            type: "cross",
-            type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
-          },
-          formatter :(params)=>{
-            if(params.length <= 0) return
-            let result = (params[0].data.year || '')+' '+params[0].name + '<div>'
-            params.forEach(item=>{
-              const {color,seriesName,value} = item
-              result +=  `<div style="position: relative;padding-left:20px;line-height: 20px;">
-                <div style="position: absolute;top:50%;left:0;width:12px;height:12px;border-radius:100%;background: ${color};transform: translateY(-50%)"></div>
-                <span>${seriesName}</span><span style="margin-left:20px;font-weight: 700">${value}</span></div>`
-            })
-            result+='</div>'
-            return result
           }
         },
         textStyle: {
           color: "#333333",
         },
-        xAxis: { type: "category", data: xdata },
+        xAxis: { type: "time" },
         yAxis: {
           type: "value",
         },
@@ -117,8 +125,17 @@ export default {
             end: 100,
           },
         ],
-        series,
+        series: seriesData.map(item => ({
-      });
+          type: "line",
+          name: item.name,
+          showSymbol: false,
+          smooth: true,
+          areaStyle: {
+            opacity: 0.35
+          },
+          data: item.data
+        })),
+      },true);
     },
   },
 };

src/views/ems/dzjk/sbjk/ssyx/index.vue

@@ -2,33 +2,65 @@
 <template>
 <div class="ssyx-ems-dashboard-editor-container">
 <!--  6个方块-->
-  <real-time-base-info :data="runningHeadData"/>
+  <real-time-base-info :display-data="runningDisplayData" :loading="runningHeadLoading" @field-click="handleHeadFieldClick"/>
   <!-- 时间选择 -->
   <date-range-select ref="dateRangeSelect" @updateDate="updateDate" style="margin-top:20px;"/>
 <!--  echart图表-->
   <el-row :gutter="32" style="background:#fff;margin:30px 0;">
     <el-col :xs="24" :sm="12" :lg="12">
-      <cnglqx-chart ref='cnglqx'/>
+      <cnglqx-chart ref='cnglqx' :display-data="runningDisplayData"/>
     </el-col>
     <el-col :xs="24" :sm="12" :lg="12">
-      <pocpjwd-chart ref='pocpjwd'/>
+      <pocpjwd-chart ref='pocpjwd' :display-data="runningDisplayData"/>
     </el-col>
   </el-row>
   <el-row :gutter="32" style="margin:30px 0;">
     <el-col :xs="24" :sm="12" :lg="12">
-      <dcpjsoc-chart ref="dcpjsoc"/>
+      <dcpjsoc-chart ref="dcpjsoc" :display-data="runningDisplayData"/>
     </el-col>
     <el-col :xs="24" :sm="12" :lg="12">
-      <dcpjwd-chart ref="dcpjwd"/>
+      <dcpjwd-chart ref="dcpjwd" :display-data="runningDisplayData"/>
     </el-col>
   </el-row>
+
+  <el-dialog
+    :visible.sync="curveDialogVisible"
+    :title="curveDialogTitle"
+    width="1000px"
+    append-to-body
+    class="ems-dialog"
+    :close-on-click-modal="false"
+    destroy-on-close
+    @opened="handleCurveDialogOpened"
+    @closed="handleCurveDialogClosed"
+  >
+    <div class="curve-tools">
+      <el-date-picker
+        v-model="curveCustomRange"
+        type="datetimerange"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        range-separator="至"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        style="width: 440px"
+      />
+      <el-button type="primary" size="mini" :loading="curveLoading" @click="loadCurveData">查询</el-button>
+    </div>
+    <div v-loading="curveLoading" ref="curveChartRef" style="height: 380px;"></div>
+  </el-dialog>
 </div>
 </template>
 
 <style scoped lang="scss">
-
+.curve-tools {
+  margin-bottom: 10px;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
 </style>
 <script>
+import * as echarts from "echarts";
 import DateRangeSelect from '@/components/Ems/DateRangeSelect/index.vue'
 import RealTimeBaseInfo from "./../RealTimeBaseInfo.vue";
 import CnglqxChart from './CnglqxChart.vue'
@@ -36,7 +68,8 @@ import PocpjwdChart from './PocpjwdChart.vue'
 import DcpjwdChart from './DcpjwdChart.vue'
 import DcpjsocChart from './DcpjsocChart.vue'
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import {getRunningHeadInfo} from '@/api/ems/dzjk'
+import {getProjectDisplayData} from '@/api/ems/dzjk'
+import {getPointConfigCurve} from "@/api/ems/site";
 import intervalUpdate from "@/mixins/ems/intervalUpdate";
 
 export default {
@@ -45,16 +78,183 @@ export default {
   mixins:[getQuerySiteId,intervalUpdate],
   data() {
     return {
-      runningHeadData:{},//运行信息
+      runningDisplayData: [], //单站监控项目配置展示数据
       timeRange:[],
-      isInit:true
+      isInit:true,
+      runningHeadLoading: false,
+      curveDialogVisible: false,
+      curveDialogTitle: "点位曲线",
+      curveChart: null,
+      curveLoading: false,
+      curveCustomRange: [],
+      curveQuery: {
+        siteId: "",
+        pointId: "",
+        pointType: "data",
+        rangeType: "custom",
+        startTime: "",
+        endTime: "",
+      },
+    }
+  },
+  beforeDestroy() {
+    if (this.curveChart) {
+      this.curveChart.dispose();
+      this.curveChart = null;
     }
   },
   methods:{
+    handleHeadFieldClick(item) {
+      const pointId = String(item?.pointId || item?.raw?.dataPoint || "").trim();
+      if (!pointId) {
+        this.$message.warning("该字段未配置点位，无法查询曲线");
+        return;
+      }
+      this.openCurveDialog({
+        pointId,
+        title: item?.title || item?.raw?.fieldName || pointId,
+      });
+    },
+    openCurveDialog({pointId, title}) {
+      const range = this.getDefaultCurveRange();
+      this.curveCustomRange = range;
+      this.curveDialogTitle = `点位曲线 - ${title || pointId}`;
+      this.curveQuery = {
+        siteId: this.siteId,
+        pointId,
+        pointType: "data",
+        rangeType: "custom",
+        startTime: range[0],
+        endTime: range[1],
+      };
+      this.curveDialogVisible = true;
+    },
+    handleCurveDialogOpened() {
+      if (!this.curveChart && this.$refs.curveChartRef) {
+        this.curveChart = echarts.init(this.$refs.curveChartRef);
+      }
+      this.loadCurveData();
+    },
+    handleCurveDialogClosed() {
+      if (this.curveChart) {
+        this.curveChart.dispose();
+        this.curveChart = null;
+      }
+      this.curveLoading = false;
+    },
+    getDefaultCurveRange() {
+      const end = new Date();
+      const start = new Date(end.getTime() - 24 * 60 * 60 * 1000);
+      return [this.formatDateTime(start), this.formatDateTime(end)];
+    },
+    formatDateTime(date) {
+      const d = new Date(date);
+      const pad = (num) => String(num).padStart(2, "0");
+      return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`;
+    },
+    formatCurveTime(value) {
+      if (value === undefined || value === null || value === "") {
+        return "";
+      }
+      const raw = String(value).trim();
+      const normalized = raw
+        .replace("T", " ")
+        .replace(/\.\d+/, "")
+        .replace(/Z$/, "")
+        .replace(/([+-]\d{2}:?\d{2})$/, "")
+        .trim();
+      const matched = normalized.match(/^(\d{4}-\d{2}-\d{2})\s+(\d{2}:\d{2})/);
+      if (matched) {
+        return `${matched[1]} ${matched[2]}`;
+      }
+      return normalized.slice(0, 16);
+    },
+    loadCurveData() {
+      if (!this.curveQuery.siteId || !this.curveQuery.pointId) {
+        this.$message.warning("点位信息不完整，无法查询曲线");
+        return;
+      }
+      if (!this.curveCustomRange || this.curveCustomRange.length !== 2) {
+        this.$message.warning("请选择查询时间范围");
+        return;
+      }
+      this.curveQuery.startTime = this.curveCustomRange[0];
+      this.curveQuery.endTime = this.curveCustomRange[1];
+      const query = {
+        siteId: this.curveQuery.siteId,
+        pointId: this.curveQuery.pointId,
+        pointType: "data",
+        rangeType: "custom",
+        startTime: this.curveQuery.startTime,
+        endTime: this.curveQuery.endTime,
+      };
+      this.curveLoading = true;
+      getPointConfigCurve(query).then((response) => {
+        const rows = response?.data || [];
+        this.renderCurveChart(rows);
+      }).catch(() => {
+        this.renderCurveChart([]);
+      }).finally(() => {
+        this.curveLoading = false;
+      });
+    },
+    renderCurveChart(rows = []) {
+      if (!this.curveChart) return;
+      const xData = rows.map(item => this.formatCurveTime(item.dataTime));
+      const yData = rows.map(item => item.pointValue);
+      this.curveChart.clear();
+      this.curveChart.setOption({
+        legend: {},
+        grid: {
+          containLabel: true,
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            type: "cross",
+          },
+        },
+        textStyle: {
+          color: "#333333",
+        },
+        xAxis: {
+          type: "category",
+          data: xData,
+        },
+        yAxis: {
+          type: "value",
+        },
+        dataZoom: [
+          {
+            type: "inside",
+            start: 0,
+            end: 100,
+          },
+          {
+            start: 0,
+            end: 100,
+          },
+        ],
+        series: [
+          {
+            name: this.curveDialogTitle,
+            type: "line",
+            data: yData,
+            connectNulls: true,
+          },
+        ],
+      });
+      if (!rows.length) {
+        this.$message.warning("当前时间范围暂无曲线数据");
+      }
+    },
     //6个方块数据
     getRunningHeadData(){
-      getRunningHeadInfo(this.siteId).then(response => {
+      this.runningHeadLoading = true
-        this.runningHeadData = response?.data || {}
+      return getProjectDisplayData(this.siteId).then((displayResponse) => {
+        this.runningDisplayData = displayResponse?.data || []
+      }).finally(() => {
+        this.runningHeadLoading = false
       })
     },
     // 更新时间范围 重置图表
@@ -71,8 +271,9 @@ export default {
       this.updateInterval(this.updateData)
     },
     updateData(){
-      this.getRunningHeadData()
+      this.getRunningHeadData().finally(() => {
-      this.updateChart()
+        this.updateChart()
+      })
     },
     init(){
       this.$refs.dateRangeSelect.init(true)

src/views/ems/dzjk/sbjk/xf/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="loading">
+  <div>
     <el-card
         v-for="(item,index) in list"
         :key="index+'ylLise'"
@@ -25,7 +25,7 @@
           <el-button type="primary" round size="small" style="margin-right:20px;" @click="pointDetail(item,'point')">
             详细
           </el-button>
-          <el-badge :value="item.alarmNum || 0" class="item">
+          <el-badge :hidden="!item.alarmNum" :value="item.alarmNum || 0" class="item">
             <i
                 class="el-icon-message-solid alarm-icon"
                 @click="pointDetail(item,'alarmPoint')"
@@ -37,8 +37,11 @@
         <el-col v-for="(tempDataItem,tempDataIndex) in tempData" :key="tempDataIndex+'hdTempData'" :span="12"
                 class="device-info-col">
             <span class="pointer" @click="showChart(tempDataItem.title,item.deviceId)">
-              <span class="left">{{ tempDataItem.title }}</span> <span class="right">{{ item[tempDataItem.attr] || '' }}<span
+              <span class="left">{{ tempDataItem.title }}</span>
-                v-html="tempDataItem.unit"></span></span>
+              <span class="right">
+                <i v-if="isPointLoading(item[tempDataItem.attr])" class="el-icon-loading point-loading-icon"></i>
+                <span v-else>{{ displayValue(item[tempDataItem.attr]) }}<span v-html="tempDataItem.unit"></span></span>
+              </span>
             </span>
         </el-col>
       </el-row>
@@ -74,6 +77,12 @@ export default {
     }
   },
   methods: {
+    displayValue(value) {
+      return value === undefined || value === null || value === "" ? "-" : value;
+    },
+    isPointLoading(value) {
+      return this.loading && (value === undefined || value === null || value === "" || value === "-");
+    },
     // 查看设备电位表格
     pointDetail(row, dataType) {
       const {deviceId} = row
@@ -129,4 +138,16 @@ export default {
     }
   }
 }
+
+.point-loading-icon {
+  color: #409eff;
+  display: inline-block;
+  transform-origin: center;
+  animation: pointLoadingSpinPulse 1.1s linear infinite;
+}
+@keyframes pointLoadingSpinPulse {
+  0% { opacity: 0.45; transform: rotate(0deg) scale(0.9); }
+  50% { opacity: 1; transform: rotate(180deg) scale(1.08); }
+  100% { opacity: 0.45; transform: rotate(360deg) scale(0.9); }
+}
 </style>

src/views/ems/dzjk/sbjk/yl/index.vue

@@ -1,102 +1,471 @@
 <template>
-  <div v-loading="loading">
+  <div>
+    <div class="pcs-tags">
+      <el-tag
+        size="small"
+        :type="selectedSectionKey ? 'info' : 'primary'"
+        :effect="selectedSectionKey ? 'plain' : 'dark'"
+        class="pcs-tag-item"
+        @click="handleTagClick('')"
+      >
+        全部
+      </el-tag>
+      <el-tag
+        v-for="(group, index) in sectionGroups"
+        :key="index + 'ylTag'"
+        size="small"
+        :type="selectedSectionKey === group.sectionKey ? 'primary' : 'info'"
+        :effect="selectedSectionKey === group.sectionKey ? 'dark' : 'plain'"
+        class="pcs-tag-item"
+        @click="handleTagClick(group.sectionKey)"
+      >
+        {{ group.displayName || group.sectionName || "冷却" }}
+      </el-tag>
+    </div>
     <el-card
-        v-for="(item,index) in list"
+      v-for="(group, index) in filteredSectionGroups"
-        :key="index+'ylLise'"
+      :key="index + 'ylSection'"
-        class="sbjk-card-container running-card-container"
+      class="sbjk-card-container list running-card-container"
-        shadow="always">
+      shadow="always"
+    >
       <div slot="header">
-        <span class="large-title">{{ item.deviceName }}</span>
+        <span class="large-title">{{ group.displayName || group.sectionName || "冷却" }}</span>
         <div class="info">
-          <div>数据更新时间：{{ item.dataUpdateTime || '-' }}</div>
+          <div>状态：{{ group.statusText }}</div>
-        </div>
+          <div>数据更新时间：{{ group.updateTimeText }}</div>
-        <div class="alarm">
-          <el-button type="primary" round size="small" style="margin-right:20px;" @click="pointDetail(item,'point')">
-            详细
-          </el-button>
-          <el-badge :value="item.alarmNum || 0" class="item">
-            <i
-                class="el-icon-message-solid alarm-icon"
-                @click="pointDetail(item,'alarmPoint')"
-            ></i>
-          </el-badge>
         </div>
       </div>
       <el-row class="device-info-row">
-        <el-col v-for="(tempDataItem,tempDataIndex) in tempData" :key="tempDataIndex+'ylTempData'" :span="8"
+        <el-col
-                class="device-info-col">
+          v-for="(item, dataIndex) in group.items"
-            <span class="pointer" @click="showChart(tempDataItem.title,item.deviceId)">
+          :key="dataIndex + 'ylField'"
-              <span class="left">{{ tempDataItem.title }}</span> <span class="right">{{ item[tempDataItem.attr] }}<span
+          :span="8"
-                v-html="tempDataItem.unit"></span></span>
+          class="device-info-col"
+          :class="{ 'field-disabled': !item.pointId }"
+        >
+          <div class="field-click-wrapper" @click="handleFieldClick(item)">
+            <span class="left">{{ item.fieldName }}</span>
+            <span class="right">
+              <i v-if="isPointLoading(item.fieldValue)" class="el-icon-loading point-loading-icon"></i>
+              <span v-else>{{ displayValue(item.fieldValue) | formatNumber }}</span>
             </span>
+          </div>
         </el-col>
       </el-row>
     </el-card>
-    <el-empty v-show="list.length<=0" :image-size="200"></el-empty>
+
-    <point-chart ref="pointChart" :site-id="siteId"/>
+    <el-dialog
-    <point-table ref="pointTable"/>
+      :visible.sync="curveDialogVisible"
+      :title="curveDialogTitle"
+      width="1000px"
+      append-to-body
+      class="ems-dialog"
+      :close-on-click-modal="false"
+      destroy-on-close
+      @opened="handleCurveDialogOpened"
+      @closed="handleCurveDialogClosed"
+    >
+      <div class="curve-tools">
+        <el-date-picker
+          v-model="curveCustomRange"
+          type="datetimerange"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          range-separator="至"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          style="width: 440px"
+        />
+        <el-button type="primary" size="mini" :loading="curveLoading" @click="loadCurveData">查询</el-button>
+      </div>
+      <div v-loading="curveLoading" ref="curveChartRef" style="height: 380px;"></div>
+    </el-dialog>
   </div>
 </template>
 
-
 <script>
+import * as echarts from "echarts";
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import {getCoolingDataList} from '@/api/ems/dzjk'
 import intervalUpdate from "@/mixins/ems/intervalUpdate";
-import pointChart from "./../PointChart.vue";
+import { getProjectDisplayData } from "@/api/ems/dzjk";
-import PointTable from "@/views/ems/site/sblb/PointTable.vue";
+import { getDeviceList, getPointConfigCurve } from "@/api/ems/site";
 
 export default {
-  name: 'DzjkSbjkYl',
+  name: "DzjkSbjkYl",
   mixins: [getQuerySiteId, intervalUpdate],
-  components: {pointChart, PointTable},
   data() {
     return {
       loading: false,
-      list: [],
+      displayData: [],
-      tempData: [
+      selectedSectionKey: "",
-        {title: '供水温度', attr: 'gsTemp', unit: '&#8451;'},
+      coolingDeviceList: [],
-        {title: '回水温度', attr: 'hsTemp', unit: '&#8451;'},
+      curveDialogVisible: false,
-        {title: '供水压力', attr: 'gsPressure', unit: 'bar'},
+      curveDialogTitle: "点位曲线",
-        {title: '回水压力', attr: 'hsPressure', unit: 'bar'},
+      curveChart: null,
-        {title: '冷源水温度', attr: 'lysTemp', unit: '&#8451;'},
+      curveLoading: false,
-        {title: 'VB01开度', attr: 'vb01Kd', unit: '%'},
+      curveCustomRange: [],
-        {title: 'VB02开度', attr: 'vb02Kd', unit: '%'},
+      curveQuery: {
-      ]
+        siteId: "",
-    }
+        pointId: "",
+        pointType: "data",
+        rangeType: "custom",
+        startTime: "",
+        endTime: "",
+      },
+    };
+  },
+  computed: {
+    moduleDisplayData() {
+      return (this.displayData || []).filter((item) => item.menuCode === "SBJK_YL");
+    },
+    ylTemplateFields() {
+      const source = this.moduleDisplayData || [];
+      const result = [];
+      const seen = new Set();
+      source.forEach((item) => {
+        const fieldName = String(item?.fieldName || "").trim();
+        if (!fieldName || seen.has(fieldName)) {
+          return;
+        }
+        seen.add(fieldName);
+        result.push(fieldName);
+      });
+      return result.length > 0 ? result : this.fallbackFields;
+    },
+    sectionGroups() {
+      const source = this.moduleDisplayData || [];
+      const devices = (this.coolingDeviceList || []).length > 0
+        ? this.coolingDeviceList
+        : [{ deviceId: "", deviceName: "冷却" }];
+      return devices.map((device, index) => {
+        const deviceId = String(device?.deviceId || device?.id || "").trim();
+        const sectionKey = deviceId || `COOLING_${index}`;
+        const displayName = String(device?.deviceName || device?.name || deviceId || `冷却${index + 1}`).trim();
+        const exactRows = source.filter((item) => String(item?.deviceId || "").trim() === deviceId);
+        const fallbackRows = source.filter((item) => !String(item?.deviceId || "").trim());
+
+        const exactValueMap = {};
+        exactRows.forEach((item) => {
+          const key = String(item?.fieldName || "").trim();
+          if (key) {
+            exactValueMap[key] = item;
+          }
+        });
+        const fallbackValueMap = {};
+        fallbackRows.forEach((item) => {
+          const key = String(item?.fieldName || "").trim();
+          if (key && fallbackValueMap[key] === undefined) {
+            fallbackValueMap[key] = item;
+          }
+        });
+
+        const items = (this.ylTemplateFields || []).map((fieldName) => {
+          const row = exactValueMap[fieldName] || fallbackValueMap[fieldName] || {};
+          return {
+            fieldName,
+            fieldValue: row.fieldValue,
+            valueTime: row.valueTime,
+            pointId: String(row?.dataPoint || "").trim(),
+            raw: row,
+          };
+        });
+
+        const statusItem = (items || []).find((it) => String(it.fieldName || "").includes("状态"));
+        const timestamps = [...exactRows, ...fallbackRows]
+          .map((it) => new Date(it?.valueTime).getTime())
+          .filter((ts) => !isNaN(ts));
+
+        return {
+          sectionName: displayName,
+          sectionKey,
+          displayName,
+          deviceId,
+          items,
+          statusText: this.displayValue(statusItem ? statusItem.fieldValue : "-"),
+          updateTimeText: timestamps.length > 0 ? this.formatDate(new Date(Math.max(...timestamps))) : "-",
+        };
+      });
+    },
+    displaySectionGroups() {
+      if (this.sectionGroups.length > 0) {
+        return this.sectionGroups;
+      }
+      return [
+        {
+          sectionName: "冷却参数",
+          items: this.fallbackFields.map((fieldName) => ({ fieldName, fieldValue: "-" })),
+          statusText: "-",
+          updateTimeText: "-",
+        },
+      ];
+    },
+    filteredSectionGroups() {
+      const groups = this.displaySectionGroups || [];
+      if (!this.selectedSectionKey) {
+        return groups;
+      }
+      return groups.filter((group) => group.sectionKey === this.selectedSectionKey);
+    },
+    fallbackFields() {
+      return ["供水温度", "回水温度", "供水压力", "回水压力", "冷源水温度", "VB01开度", "VB02开度"];
+    },
   },
   methods: {
-    // 查看设备电位表格
+    handleFieldClick(item) {
-    pointDetail(row, dataType) {
+      const pointId = String(item?.pointId || item?.raw?.dataPoint || "").trim();
-      const {deviceId} = row
+      if (!pointId) {
-      this.$refs.pointTable.showTable({siteId: this.siteId, deviceId, deviceCategory: 'COOLING'}, dataType)
+        this.$message.warning("该字段未配置点位，无法查询曲线");
+        return;
+      }
+      this.openCurveDialog({
+        pointId,
+        title: item?.fieldName || pointId,
+      });
     },
-    showChart(pointName, deviceId) {
+    openCurveDialog({ pointId, title }) {
-      pointName && this.$refs.pointChart.showChart({pointName, deviceCategory: 'COOLING', deviceId})
+      const range = this.getDefaultCurveRange();
+      this.curveCustomRange = range;
+      this.curveDialogTitle = `点位曲线 - ${title || pointId}`;
+      this.curveQuery = {
+        siteId: this.siteId,
+        pointId,
+        pointType: "data",
+        rangeType: "custom",
+        startTime: range[0],
+        endTime: range[1],
+      };
+      this.curveDialogVisible = true;
+    },
+    handleCurveDialogOpened() {
+      if (!this.curveChart && this.$refs.curveChartRef) {
+        this.curveChart = echarts.init(this.$refs.curveChartRef);
+      }
+      this.loadCurveData();
+    },
+    handleCurveDialogClosed() {
+      if (this.curveChart) {
+        this.curveChart.dispose();
+        this.curveChart = null;
+      }
+      this.curveLoading = false;
+    },
+    getDefaultCurveRange() {
+      const end = new Date();
+      const start = new Date(end.getTime() - 24 * 60 * 60 * 1000);
+      return [this.formatDateTime(start), this.formatDateTime(end)];
+    },
+    formatDateTime(date) {
+      const d = new Date(date);
+      const p = (n) => String(n).padStart(2, "0");
+      return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}:${p(d.getSeconds())}`;
+    },
+    formatCurveTime(value) {
+      if (value === undefined || value === null || value === "") {
+        return "";
+      }
+      const raw = String(value).trim();
+      const normalized = raw
+        .replace("T", " ")
+        .replace(/\.\d+/, "")
+        .replace(/Z$/, "")
+        .replace(/([+-]\d{2}:?\d{2})$/, "")
+        .trim();
+      const matched = normalized.match(/^(\d{4}-\d{2}-\d{2})\s+(\d{2}:\d{2})/);
+      if (matched) {
+        return `${matched[1]} ${matched[2]}`;
+      }
+      return normalized.slice(0, 16);
+    },
+    loadCurveData() {
+      if (!this.curveQuery.siteId || !this.curveQuery.pointId) {
+        this.$message.warning("点位信息不完整，无法查询曲线");
+        return;
+      }
+      if (!this.curveCustomRange || this.curveCustomRange.length !== 2) {
+        this.$message.warning("请选择查询时间范围");
+        return;
+      }
+      this.curveQuery.startTime = this.curveCustomRange[0];
+      this.curveQuery.endTime = this.curveCustomRange[1];
+      const query = {
+        siteId: this.curveQuery.siteId,
+        pointId: this.curveQuery.pointId,
+        pointType: "data",
+        rangeType: "custom",
+        startTime: this.curveQuery.startTime,
+        endTime: this.curveQuery.endTime,
+      };
+      this.curveLoading = true;
+      getPointConfigCurve(query)
+        .then((response) => {
+          const rows = response?.data || [];
+          this.renderCurveChart(rows);
+        })
+        .catch(() => {
+          this.renderCurveChart([]);
+        })
+        .finally(() => {
+          this.curveLoading = false;
+        });
+    },
+    renderCurveChart(rows = []) {
+      if (!this.curveChart) return;
+      const xData = rows.map((item) => this.formatCurveTime(item.dataTime));
+      const yData = rows.map((item) => item.pointValue);
+      this.curveChart.clear();
+      this.curveChart.setOption({
+        legend: {},
+        grid: {
+          containLabel: true,
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            type: "cross",
+          },
+        },
+        textStyle: {
+          color: "#333333",
+        },
+        xAxis: {
+          type: "category",
+          data: xData,
+        },
+        yAxis: {
+          type: "value",
+        },
+        dataZoom: [
+          {
+            type: "inside",
+            start: 0,
+            end: 100,
+          },
+          {
+            start: 0,
+            end: 100,
+          },
+        ],
+        series: [
+          {
+            name: this.curveDialogTitle,
+            type: "line",
+            data: yData,
+            connectNulls: true,
+          },
+        ],
+      });
+      if (!rows.length) {
+        this.$message.warning("当前时间范围暂无曲线数据");
+      }
+    },
+    handleTagClick(sectionKey) {
+      this.selectedSectionKey = sectionKey || "";
+    },
+    displayValue(value) {
+      return value === undefined || value === null || value === "" ? "-" : value;
+    },
+    isPointLoading(value) {
+      return this.loading && (value === undefined || value === null || value === "" || value === "-");
+    },
+    formatDate(date) {
+      if (!(date instanceof Date) || isNaN(date.getTime())) {
+        return "-";
+      }
+      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())}`;
+    },
+    getCoolingDeviceList() {
+      return getDeviceList(this.siteId)
+        .then((response) => {
+          const list = response?.data || [];
+          this.coolingDeviceList = list.filter((item) => item.deviceCategory === "COOLING");
+        })
+        .catch(() => {
+          this.coolingDeviceList = [];
+        });
     },
     updateData() {
-      this.loading = true
+      this.loading = true;
-      getCoolingDataList(this.siteId).then(response => {
+      Promise.all([getProjectDisplayData(this.siteId), this.getCoolingDeviceList()])
-        this.list = JSON.parse(JSON.stringify(response?.data || []));
+        .then(([response]) => {
-      }).finally(() => {
+          this.displayData = response?.data || [];
-        this.loading = false
+        })
-      })
+        .finally(() => {
+          this.loading = false;
+        });
     },
     init() {
-      this.updateData()
+      this.updateData();
-      this.updateInterval(this.updateData)
+      this.updateInterval(this.updateData);
+    },
+  },
+  beforeDestroy() {
+    if (this.curveChart) {
+      this.curveChart.dispose();
+      this.curveChart = null;
     }
   },
-  mounted() {
+};
-
-  }
-}
 </script>
 
 <style scoped lang="scss">
 .sbjk-card-container {
-  &:not(:last-child) {
+  &.list:not(:last-child) {
     margin-bottom: 25px;
   }
+
+  .info {
+    float: right;
+    text-align: right;
+    font-size: 12px;
+    color: #666;
+    line-height: 18px;
+  }
+}
+
+.pcs-tags {
+  margin: 0 0 12px;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  justify-content: flex-start;
+  align-items: center;
+}
+
+.pcs-tag-item {
+  cursor: pointer;
+}
+
+.device-info-col {
+  cursor: pointer;
+}
+
+.field-click-wrapper {
+  width: 100%;
+}
+
+.device-info-col.field-disabled {
+  cursor: not-allowed;
+  opacity: 0.8;
+}
+
+.curve-tools {
+  margin-bottom: 10px;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
+.point-loading-icon {
+  color: #409eff;
+  display: inline-block;
+  transform-origin: center;
+  animation: pointLoadingSpinPulse 1.1s linear infinite;
+}
+@keyframes pointLoadingSpinPulse {
+  0% { opacity: 0.45; transform: rotate(0deg) scale(0.9); }
+  50% { opacity: 1; transform: rotate(180deg) scale(1.08); }
+  100% { opacity: 0.45; transform: rotate(360deg) scale(0.9); }
 }
 </style>

src/views/ems/dzjk/tjbb/dbbb/index.vue

@@ -1,19 +1,17 @@
-
 <template>
   <div style="width:100%" v-loading="loading">
-    <!--    搜索栏-->
     <el-form :inline="true" class="select-container">
       <el-form-item label="时间选择">
         <el-date-picker
-            v-model="dateRange"
+          v-model="dateRange"
-            type="daterange"
+          type="daterange"
-            range-separator="至"
+          range-separator="至"
-            start-placeholder="开始日期"
+          start-placeholder="开始日期"
-            end-placeholder="结束日期"
+          end-placeholder="结束日期"
-            value-format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
-            :clearable="false"
+          :clearable="false"
-            :picker-options="pickerOptions"
+          :picker-options="pickerOptions"
-            :default-value="defaultDateRange"
+          :default-value="defaultDateRange"
         ></el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -22,183 +20,221 @@
       <el-form-item>
         <el-button @click="onReset" native-type="button">重置</el-button>
       </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="exportTable" native-type="button">导出</el-button>
+      </el-form-item>
     </el-form>
-    <!--表格-->
+
     <el-table
-          class="common-table"
+      class="common-table"
-          :data="tableData"
+      :data="tableData"
-          stripe
+      stripe
-          style="width: 100%;margin-top:25px;">
+      style="width: 100%; margin-top: 25px;"
-<!--        汇总列-->
+    >
-          <el-table-column label="汇总">
+      <el-table-column label="汇总">
-            <el-table-column
+        <el-table-column prop="dataTime" label="日期" width="120"></el-table-column>
-              prop="dataTime"
+      </el-table-column>
-              label="日期"
+
-              width="120">
+      <el-table-column label="充电量" align="center">
-            </el-table-column>
+        <el-table-column align="center" prop="activePeakKwh" label="尖"></el-table-column>
-          </el-table-column>
+        <el-table-column align="center" prop="activeHighKwh" label="峰"></el-table-column>
-<!--充电量列-->
+        <el-table-column align="center" prop="activeFlatKwh" label="平"></el-table-column>
-          <el-table-column  label="充电量" align="center">
+        <el-table-column align="center" prop="activeValleyKwh" label="谷"></el-table-column>
-            <el-table-column
+        <el-table-column align="center" prop="activeTotalKwh" label="总"></el-table-column>
-              align="center"
+      </el-table-column>
-              prop="activePeakKwh"
+
-              label="尖">
+      <el-table-column label="放电量" align="center">
-            </el-table-column>
+        <el-table-column align="center" prop="reActivePeakKwh" label="尖"></el-table-column>
-            <el-table-column
+        <el-table-column align="center" prop="reActiveHighKwh" label="峰"></el-table-column>
-              align="center"
+        <el-table-column align="center" prop="reActiveFlatKwh" label="平"></el-table-column>
-              prop="activeHighKwh"
+        <el-table-column align="center" prop="reActiveValleyKwh" label="谷"></el-table-column>
-              label="峰">
+        <el-table-column align="center" prop="reActiveTotalKwh" label="总"></el-table-column>
-            </el-table-column>
+      </el-table-column>
-            <el-table-column
+
-                align="center"
+      <el-table-column label="效率(%)" align="center">
-              prop="activeFlatKwh"
+        <el-table-column align="center" prop="effect"></el-table-column>
-              label="平">
+      </el-table-column>
-            </el-table-column>
+
-            <el-table-column
+      <el-table-column label="备注" align="center" fixed="right" min-width="260">
-                align="center"
+        <template slot-scope="scope">
-              prop="activeValleyKwh"
+          <div class="remark-cell">
-              label="谷">
+            <span class="remark-text">{{ scope.row.remark || "-" }}</span>
-            </el-table-column>
+            <el-button type="text" @click="editRemark(scope.row)">编辑</el-button>
-            <el-table-column
+          </div>
-                align="center"
+        </template>
-              prop="activeTotalKwh"
+      </el-table-column>
-              label="总">
+    </el-table>
-            </el-table-column>
+
-          </el-table-column>
+    <el-pagination
-        <!--充电量列-->
+      v-show="tableData.length > 0"
-          <el-table-column  label="放电量" align="center">
+      background
-            <el-table-column
+      @size-change="handleSizeChange"
-                align="center"
+      @current-change="handleCurrentChange"
-              prop="reActivePeakKwh"
+      :current-page="pageNum"
-              label="尖">
+      :page-size="pageSize"
-            </el-table-column>
+      :page-sizes="[10, 20, 30, 40]"
-            <el-table-column
+      layout="total, sizes, prev, pager, next, jumper"
-                align="center"
+      :total="totalSize"
-              prop="reActiveHighKwh"
+      style="margin-top: 15px; text-align: center"
-              label="峰">
+    >
-            </el-table-column>
+    </el-pagination>
-            <el-table-column
-                align="center"
-              prop="reActiveFlatKwh"
-              label="平">
-            </el-table-column>
-            <el-table-column
-                align="center"
-              prop="reActiveValleyKwh"
-              label="谷">
-            </el-table-column>
-            <el-table-column
-                align="center"
-              prop="reActiveTotalKwh"
-              label="总">
-            </el-table-column>
-          </el-table-column>
-<!--        效率-->
-          <el-table-column label="效率(%)" align="center">
-            <el-table-column
-                align="center"
-              prop="effect">
-            </el-table-column>
-          </el-table-column>
-        </el-table>
-        <el-pagination
-            v-show="tableData.length>0"
-            background
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="pageNum"
-            :page-size="pageSize"
-            :page-sizes="[10, 20, 30, 40]"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="totalSize"
-            style="margin-top:15px;text-align: center"
-        >
-        </el-pagination>
   </div>
 </template>
 
-
 <script>
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import { getAmmeterData} from '@/api/ems/dzjk'
+import { batchGetBizRemark, getAmmeterData, saveBizRemark } from "@/api/ems/dzjk";
-import {formatDate} from "@/filters/ems";
+import { formatDate } from "@/filters/ems";
+
+const BIZ_TYPE = "stats_report";
+const REPORT_KEY = "DBBB";
+
 export default {
-  name:'DzjkTjbbDbbb',
+  name: "DzjkTjbbDbbb",
   mixins: [getQuerySiteId],
   data() {
     return {
-      loading:false,
+      loading: false,
-      pickerOptions:{
+      pickerOptions: {
         disabledDate(time) {
           return time.getTime() > Date.now();
         },
       },
-      defaultDateRange:[],//默认展示的时间
+      defaultDateRange: [],
-      dateRange:[],
+      dateRange: [],
-      tableData:[],
+      tableData: [],
-      pageSize:10,//分页栏当前每个数据总数
+      pageSize: 10,
-      pageNum:1,//分页栏当前页数
+      pageNum: 1,
-      totalSize:0,//table表格数据总数
+      totalSize: 0,
-    }
+    };
   },
-  methods:{
+  methods: {
-    // 搜索
+    buildRemarkKey(dataTime) {
-    onSearch(){
+      return `${this.siteId}_${dataTime || ""}`;
-      this.pageNum =1//每次搜索从1开始搜索
-      this.getData()
     },
-    // 重置
+    loadRemarks(rows) {
-    onReset(){
+      if (!rows.length) return Promise.resolve({});
-      this.dateRange=this.defaultDateRange
+      return batchGetBizRemark({
-      this.pageNum =1//每次搜索从1开始搜索
+        bizType: BIZ_TYPE,
-      this.getData()
+        bizKey1: REPORT_KEY,
+        bizKey2List: rows.map(row => this.buildRemarkKey(row.dataTime)),
+      }).then(response => response?.data || {});
+    },
+    applyRemarks(rows, remarkMap) {
+      rows.forEach(row => {
+        this.$set(row, "remark", remarkMap[this.buildRemarkKey(row.dataTime)] || "");
+      });
+    },
+    exportTable() {
+      if (!this.dateRange?.length) return;
+      const [startTime, endTime] = this.dateRange;
+      this.download(
+        "ems/statsReport/exportAmmeterDataFromDaily",
+        {
+          siteId: this.siteId,
+          startTime,
+          endTime,
+        },
+        `电表报表_${startTime}-${endTime}.xlsx`
+      );
+    },
+    onSearch() {
+      this.pageNum = 1;
+      this.getData();
+    },
+    onReset() {
+      this.dateRange = this.defaultDateRange;
+      this.pageNum = 1;
+      this.getData();
     },
-    // 分页
     handleSizeChange(val) {
       this.pageSize = val;
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
-        this.getData()
+        this.getData();
-      })
+      });
     },
     handleCurrentChange(val) {
-      this.pageNum = val
+      this.pageNum = val;
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
-        this.getData()
+        this.getData();
-      })
+      });
     },
-    // 获取数据
+    editRemark(row) {
-    getData(){
+      this.$prompt("请输入备注", "编辑备注", {
-      this.loading=true
+        inputValue: row.remark || "",
-      const {siteId,pageNum,pageSize} =this
+        inputType: "textarea",
-      const [startTime='',endTime='']=(this.dateRange || [])
+        inputPlaceholder: "可输入该日报表备注",
-      getAmmeterData({siteId:siteId,startTime,endTime,pageSize,pageNum}).then(response=>{
+        confirmButtonText: "保存",
-        this.tableData=response?.rows || [];
+        cancelButtonText: "取消",
-        this.totalSize = response?.total || 0
-      }).finally(()=> {
-        this.loading = false
       })
+        .then(({ value }) => {
+          return saveBizRemark({
+            bizType: BIZ_TYPE,
+            bizKey1: REPORT_KEY,
+            bizKey2: this.buildRemarkKey(row.dataTime),
+            remark: value || "",
+          }).then(() => {
+            this.$set(row, "remark", value || "");
+            this.$message.success("备注保存成功");
+          });
+        })
+        .catch(() => {});
     },
-    init(){
+    getData() {
-      this.dateRange=[]
+      this.loading = true;
-      this.tableData=[]
+      const { siteId, pageNum, pageSize } = this;
-      this.totalSize=0
+      const [startTime = "", endTime = ""] = this.dateRange || [];
-      this.pageSize=10
+      getAmmeterData({ siteId, startTime, endTime, pageSize, pageNum })
-      this.pageNum = 1
+        .then(response => {
-      const now = new Date().getTime();
+          const rows = response?.rows || [];
-      const lastMonth = new Date(now-30 * 24 * 60 * 60 * 1000).getTime();
+          this.tableData = rows;
-      this.defaultDateRange = [formatDate(lastMonth), formatDate(now)];
+          this.totalSize = response?.total || 0;
-      this.dateRange=[formatDate(lastMonth), formatDate(now)];
+          return this.loadRemarks(rows);
-      this.getData()
+        })
+        .then(remarkMap => {
+          this.applyRemarks(this.tableData, remarkMap || {});
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    init() {
+      this.dateRange = [];
+      this.tableData = [];
+      this.totalSize = 0;
+      this.pageSize = 10;
+      this.pageNum = 1;
+      const now = new Date();
+      const lastDay = now.getTime();
+      const firstDay = new Date(new Date().setDate(1)).getTime();
+      this.defaultDateRange = [formatDate(firstDay), formatDate(lastDay)];
+      this.dateRange = [formatDate(firstDay), formatDate(lastDay)];
+      this.getData();
     },
   },
-}
+};
 </script>
 
 <style scoped lang="scss">
-::v-deep{
+::v-deep {
-  .common-table.el-table .el-table__header-wrapper th, .common-table.el-table .el-table__fixed-header-wrapper th{
+  .common-table.el-table .el-table__header-wrapper th,
+  .common-table.el-table .el-table__fixed-header-wrapper th {
     border-bottom: 1px solid #dfe6ec;
   }
 }
 
+.remark-cell {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+}
+
+.remark-text {
+  flex: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  text-align: left;
+}
 </style>

src/views/ems/dzjk/tjbb/dcdqx/index.vue

@@ -1,22 +1,23 @@
 <template>
   <el-card
-    shadow="always"
+      shadow="always"
-    class="common-card-container time-range-card"
+      class="common-card-container time-range-card"
-    style="margin-top: 20px"
+      style="margin-top: 20px"
   >
     <div slot="header" class="time-range-header">
       <span class="card-title"> </span>
-      <date-range-select ref="dateRangeSelect" @updateDate="updateDate" />
+      <date-range-select ref="dateRangeSelect" @updateDate="updateDate"/>
     </div>
     <div class="card-main" v-loading="loading">
       <el-button-group class="ems-btns-group">
         <el-button
-          v-for="(item, index) in btnList"
+            v-for="(item, index) in btnList"
-          :key="index + 'dcdqxBtns'"
+            :key="index + 'dcdqxBtns'"
-          size="mini"
+            size="mini"
-          :class="{ activeBtn: activeBtn === item.id }"
+            :class="{ activeBtn: activeBtn === item.id }"
-          @click="changeDataType(item.id)"
+            @click="changeDataType(item.id)"
-          >{{ item.name }}</el-button
+        >{{ item.name }}
+        </el-button
         >
       </el-button-group>
       <div id="dcdEchart" style="height: 310px"></div>
@@ -28,12 +29,13 @@
 import * as echarts from "echarts";
 import resize from "@/mixins/ems/resize";
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import { getStackData, getStackNameList } from "@/api/ems/dzjk";
+import {getStackData} from "@/api/ems/dzjk";
-import { formatDate } from "@/filters/ems";
+import {formatDate} from "@/filters/ems";
 import DateRangeSelect from "@/components/Ems/DateRangeSelect/index.vue";
+
 export default {
   name: "DzjkTjbbDcdqx",
-  components: { DateRangeSelect },
+  components: {DateRangeSelect},
   mixins: [resize, getQuerySiteId],
   data() {
     return {
@@ -46,10 +48,10 @@ export default {
       loading: false,
       activeBtn: "1",
       btnList: [
-        { name: "堆平均维度", id: "1", attr: ["temp"], source: ["有功功率"] },
+        {name: "堆平均维度", id: "1", attr: ["temp"], source: ["有功功率"]},
-        { name: "堆电压", id: "2", attr: ["voltage"], source: ["堆电压"] },
+        {name: "堆电压", id: "2", attr: ["voltage"], source: ["堆电压"]},
-        { name: "堆电流", id: "3", attr: ["current"], source: ["堆电流"] },
+        {name: "堆电流", id: "3", attr: ["current"], source: ["堆电流"]},
-        { name: "堆soc", id: "4", attr: ["soc"], source: ["堆soc"] },
+        {name: "堆soc", id: "4", attr: ["soc"], source: ["堆soc"]},
       ],
     };
   },
@@ -66,7 +68,7 @@ export default {
       this.getData();
     },
     getData() {
-      const { siteId, activeBtn } = this;
+      const {siteId, activeBtn} = this;
       const [start = "", end = ""] = this.dateRange || [];
       //接口调用完成之后 设置图表、结束loading
       this.loading = true;
@@ -76,12 +78,12 @@ export default {
         endTime: formatDate(end),
         dataType: activeBtn,
       })
-        .then((response) => {
+          .then((response) => {
-          this.setOption(response?.data || []);
+            this.setOption(response?.data || []);
-        })
+          })
-        .finally(() => {
+          .finally(() => {
-          this.loading = false;
+            this.loading = false;
-        });
+          });
     },
     compareDate(date1, date2) {
       console.log("比较时间", date1, date2);
@@ -92,9 +94,9 @@ export default {
       const [date1_Y = "", date1_M = "", date1_D = ""] = date1.split("-"); //根据空格区分[年月日,小时]
       const [date2_Y = "", date2_M = "", date2_D = ""] = date2.split("-"); //根据空格区分[年月日,小时]
       return (
-        (date1_Y === date2_Y && date1_M === date2_M && date1_D - date2_D) ||
+          (date1_Y === date2_Y && date1_M === date2_M && date1_D - date2_D) ||
-        (date1_Y === date2_Y && date1_M - date2_M) ||
+          (date1_Y === date2_Y && date1_M - date2_M) ||
-        date1_Y - date2_Y
+          date1_Y - date2_Y
       );
     },
     setOption(data) {
@@ -106,7 +108,7 @@ export default {
       const source = [];
       const sourceTop = ["日期"];
       let map = {},
-        mapArr = [];
+          mapArr = [];
       // 生成所有{日期:[],日期:[]}格式的对象和所有包含所有日期的[日期1,日期2...]
       data.forEach((item) => {
         item.dataList.forEach((inner) => {
@@ -136,38 +138,54 @@ export default {
       });
       source.unshift(sourceTop);
       this.chart.setOption(
-        {
+          {
-          grid: {
+            grid: {
-            containLabel: true,
+              containLabel: true,
-          },
-          legend: {
-            left: "center",
-            bottom: "15",
-          },
-          tooltip: {
-            trigger: "axis",
-            axisPointer: {
-              // 坐标轴指示器，坐标轴触发有效
-              type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
             },
+            legend: {
+              left: "center",
+              top: "10",
+            },
+            tooltip: {
+              trigger: "axis",
+              axisPointer: {
+                // 坐标轴指示器，坐标轴触发有效
+                type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+              },
+            },
+            textStyle: {
+              color: "#333333",
+            },
+            xAxis: {
+              type: "category",
+            },
+            yAxis: {
+              type: "value",
+            },
+            dataZoom: [
+              {
+                type: "inside",
+                start: 0,
+                end: 100,
+              },
+              {
+                start: 0,
+                end: 100,
+              },
+            ],
+            dataset: {source},
+            series: source[0].slice(1).map((item) => {
+              return {
+                type: "line",
+                smooth: true,
+                connectNulls: true,
+                areaStyle: {
+                  opacity: 0.7,
+                },
+              };
+            }),
           },
-          textStyle: {
+          true
-            color: "#333333",
-          },
-          xAxis: {
-            type: "category",
-          },
-          yAxis: {
-            type: "value",
-          },
-          dataset: { source },
-          series: source[0].slice(1).map((item) => {
-            return {
-              type: "line",
-            };
-          }),
-        },
-        true
       );
     },
     initChart() {
@@ -176,7 +194,7 @@ export default {
     init() {
       this.$nextTick(() => {
         this.initChart();
-        this.$refs.dateRangeSelect.init();
+        this.$refs.dateRangeSelect.init(true);
       });
     },
   },

src/views/ems/dzjk/tjbb/dcwd/index.vue

@@ -147,6 +147,9 @@ export default {
       if(val){
         this.search.clusterId=''
         this.getClusterList()
+      } else {
+        this.search.clusterId=''
+        this.clusterOptions=[]
       }
     },
     //表格数据
@@ -170,8 +173,15 @@ export default {
       })
     },
     async getClusterList(){
+      const currentStackId = String(this.search.stackId || '')
+      if (!currentStackId) {
+        this.clusterOptions = []
+        this.search.clusterId = ''
+        return
+      }
       this.clusterloading =true
       await getClusterNameList({stackDeviceId: this.search.stackId, siteId: this.siteId}).then(response => {
+        if (String(this.search.stackId || '') !== currentStackId) return
         const data = JSON.parse(JSON.stringify(response?.data || []))
         this.clusterOptions = data
         this.search.clusterId = data.length > 0 ? data[0].id : ''
@@ -200,4 +210,3 @@ export default {
   }
 }
 </script>
-

src/views/ems/dzjk/tjbb/glqx/index.vue

@@ -1,15 +1,14 @@
 <template>
   <el-card
-    shadow="always"
+      shadow="always"
-    class="common-card-container time-range-card"
+      class="common-card-container time-range-card"
-    style="margin-top: 20px"
+      style="margin-top: 20px"
   >
     <div slot="header" class="time-range-header">
       <span class="card-title">功率曲线</span>
       <date-range-select
-        ref="dateRangeSelect"
+          ref="dateRangeSelect"
-        @reset="resetTime"
+          @updateDate="updateDate"
-        @updateDate="updateDate"
       />
     </div>
     <div class="card-main" v-loading="loading">
@@ -22,12 +21,13 @@
 import * as echarts from "echarts";
 import resize from "@/mixins/ems/resize";
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import { getPcsNameList, getPowerData } from "@/api/ems/dzjk";
+import {getPowerData} from "@/api/ems/dzjk";
-import { formatDate } from "@/filters/ems";
+import {formatDate} from "@/filters/ems";
 import DateRangeSelect from "@/components/Ems/DateRangeSelect/index.vue";
+
 export default {
   name: "DzjkTjbbGlqx",
-  components: { DateRangeSelect },
+  components: {DateRangeSelect},
   mixins: [resize, getQuerySiteId],
   data() {
     return {
@@ -38,7 +38,6 @@ export default {
       },
       dateRange: [],
       loading: false,
-      dateRangeInit: true,
     };
   },
   methods: {
@@ -47,30 +46,22 @@ export default {
       this.dateRange = data || [];
       this.getData();
     },
-    resetTime() {
-      this.dateRangeInit = true;
-    },
     getData() {
-      const { siteId } = this;
+      const {siteId} = this;
       let [start = "", end = ""] = this.dateRange || [];
       //接口调用完成之后 设置图表、结束loading
       this.loading = true;
-      if (this.dateRangeInit) {
-        start = "";
-        end = "";
-        this.dateRangeInit = false;
-      }
       getPowerData({
         siteId,
         startDate: formatDate(start),
         endDate: formatDate(end),
       })
-        .then((response) => {
+          .then((response) => {
-          this.setOption(response?.data || []);
+            this.setOption(response?.data || []);
-        })
+          })
-        .finally(() => {
+          .finally(() => {
-          this.loading = false;
+            this.loading = false;
-        });
+          });
     },
     setOption(data) {
       const source = [["日期", "电网功率", "负载功率", "储能功率", "光伏功率"]];
@@ -84,47 +75,78 @@ export default {
         ]);
       });
       this.chart.setOption(
-        {
+          {
-          grid: {
+            grid: {
-            containLabel: true,
+              containLabel: true,
-          },
-          legend: {
-            left: "center",
-            bottom: "15",
-          },
-          tooltip: {
-            trigger: "axis",
-            axisPointer: {
-              // 坐标轴指示器，坐标轴触发有效
-              type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
             },
-          },
+            legend: {
-          textStyle: {
+              left: "center",
-            color: "#333333",
+              top: "10",
-          },
-          xAxis: {
-            type: "category",
-          },
-          yAxis: {
-            type: "value",
-          },
-          dataset: { source },
-          series: [
-            {
-              type: "line",
             },
-            {
+            tooltip: {
-              type: "line",
+              trigger: "axis",
+              axisPointer: {
+                // 坐标轴指示器，坐标轴触发有效
+                type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+              },
             },
-            {
+            textStyle: {
-              type: "line",
+              color: "#333333",
             },
-            {
+            xAxis: {
-              type: "line",
+              type: "category",
             },
-          ],
+            yAxis: {
-        },
+              type: "value",
-        true
+            },
+            dataset: {source},
+            dataZoom: [
+              {
+                type: "inside",
+                start: data.length > 500 ? 90 : 0,
+                end: 100,
+              },
+              {
+                start: data.length > 500 ? 90 : 0,
+                end: 100,
+              },
+            ],
+            series: [
+              {
+                type: "line",
+                smooth: true,
+                connectNulls: true,
+                areaStyle: {
+                  opacity: 0.7,
+                },
+              },
+              {
+                type: "line",
+                smooth: true,
+                connectNulls: true,
+                areaStyle: {
+                  opacity: 0.7,
+                },
+              },
+              {
+                type: "line",
+                smooth: true,
+                connectNulls: true,
+                areaStyle: {
+                  opacity: 0.7,
+                },
+              },
+              {
+                type: "line",
+                smooth: true,
+                connectNulls: true,
+                areaStyle: {
+                  opacity: 0.7,
+                },
+              },
+            ],
+          },
+          true
       );
     },
     initChart() {
@@ -133,7 +155,6 @@ export default {
     },
     init() {
       this.$nextTick(() => {
-        this.dateRangeInit = true;
         this.initChart();
         this.$refs.dateRangeSelect.init();
       });

src/views/ems/dzjk/tjbb/gltj/Dlzb.vue

@@ -125,6 +125,12 @@ export default {
         this.totalChargedCap=totalChargedCap
         this.totalDisChargedCap=totalDisChargedCap
         this.efficiency=efficiency
+      }).catch(() => {
+        this.setOption([], '')
+        this.totalChargedCap=''
+        this.totalDisChargedCap=''
+        this.efficiency=''
+        // 错误提示由全局请求拦截器处理，这里兜底避免出现 Uncaught (in promise)
       }).finally(() => {
         this.loading=false;
       })

src/views/ems/dzjk/tjbb/pcsqx/index.vue

@@ -1,22 +1,23 @@
 <template>
   <el-card
-    shadow="always"
+      shadow="always"
-    class="common-card-container time-range-card"
+      class="common-card-container time-range-card"
-    style="margin-top: 20px"
+      style="margin-top: 20px"
   >
     <div slot="header" class="time-range-header">
       <span class="card-title"> </span>
-      <date-range-select ref="dateRangeSelect" @updateDate="updateDate" />
+      <date-range-select ref="dateRangeSelect" @updateDate="updateDate"/>
     </div>
     <div class="card-main" v-loading="loading">
       <el-button-group class="ems-btns-group">
         <el-button
-          v-for="(item, index) in btnList"
+            v-for="(item, index) in btnList"
-          :key="index + 'flqxcBtns'"
+            :key="index + 'flqxcBtns'"
-          size="mini"
+            size="mini"
-          :class="{ activeBtn: activeBtn === item.id }"
+            :class="{ activeBtn: activeBtn === item.id }"
-          @click="changeDataType(item.id)"
+            @click="changeDataType(item.id)"
-          >{{ item.name }}</el-button
+        >{{ item.name }}
+        </el-button
         >
       </el-button-group>
       <div id="pcsEchart" style="height: 310px"></div>
@@ -28,12 +29,13 @@
 import * as echarts from "echarts";
 import resize from "@/mixins/ems/resize";
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import { getPCSData, getPcsNameList } from "@/api/ems/dzjk";
+import {getPCSData} from "@/api/ems/dzjk";
-import { formatDate } from "@/filters/ems";
+import {formatDate} from "@/filters/ems";
 import DateRangeSelect from "@/components/Ems/DateRangeSelect/index.vue";
+
 export default {
   name: "DzjkTjbbPcsqx",
-  components: { DateRangeSelect },
+  components: {DateRangeSelect},
   mixins: [resize, getQuerySiteId],
   data() {
     return {
@@ -82,7 +84,7 @@ export default {
       this.getData();
     },
     getData() {
-      const { siteId, activeBtn } = this;
+      const {siteId, activeBtn} = this;
       const [start = "", end = ""] = this.dateRange || [];
       this.loading = true;
       //接口调用完成之后 设置图表、结束loading
@@ -92,12 +94,12 @@ export default {
         endTime: formatDate(end),
         dataType: activeBtn,
       })
-        .then((response) => {
+          .then((response) => {
-          this.setOption(response?.data || []);
+            this.setOption(response?.data || []);
-        })
+          })
-        .finally(() => {
+          .finally(() => {
-          this.loading = false;
+            this.loading = false;
-        });
+          });
     },
     compareDate(date1, date2) {
       console.log("比较时间", date1, date2);
@@ -108,9 +110,9 @@ export default {
       const [date1_Y = "", date1_M = "", date1_D = ""] = date1.split("-"); //根据空格区分[年月日,小时]
       const [date2_Y = "", date2_M = "", date2_D = ""] = date2.split("-"); //根据空格区分[年月日,小时]
       return (
-        (date1_Y === date2_Y && date1_M === date2_M && date1_D - date2_D) ||
+          (date1_Y === date2_Y && date1_M === date2_M && date1_D - date2_D) ||
-        (date1_Y === date2_Y && date1_M - date2_M) ||
+          (date1_Y === date2_Y && date1_M - date2_M) ||
-        date1_Y - date2_Y
+          date1_Y - date2_Y
       );
     },
     setOption(data) {
@@ -122,7 +124,7 @@ export default {
       const source = [];
       const sourceTop = ["日期"];
       let map = {},
-        mapArr = [];
+          mapArr = [];
       // 生成所有{日期:[],日期:[]}格式的对象和所有包含所有日期的[日期1,日期2...]
       data.forEach((item) => {
         item.dataList.forEach((inner) => {
@@ -152,38 +154,54 @@ export default {
       });
       source.unshift(sourceTop);
       this.chart.setOption(
-        {
+          {
-          grid: {
+            grid: {
-            containLabel: true,
+              containLabel: true,
-          },
-          legend: {
-            left: "center",
-            bottom: "15",
-          },
-          tooltip: {
-            trigger: "axis",
-            axisPointer: {
-              // 坐标轴指示器，坐标轴触发有效
-              type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
             },
+            legend: {
+              left: "center",
+              top: "10",
+            },
+            tooltip: {
+              trigger: "axis",
+              axisPointer: {
+                // 坐标轴指示器，坐标轴触发有效
+                type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+              },
+            },
+            textStyle: {
+              color: "#333333",
+            },
+            xAxis: {
+              type: "category",
+            },
+            yAxis: {
+              type: "value",
+            },
+            dataZoom: [
+              {
+                type: "inside",
+                start: 0,
+                end: 100,
+              },
+              {
+                start: 0,
+                end: 100,
+              },
+            ],
+            dataset: {source},
+            series: source[0].slice(1).map((item) => {
+              return {
+                type: "line",
+                smooth: true,
+                connectNulls: true,
+                areaStyle: {
+                  opacity: 0.7,
+                },
+              };
+            }),
           },
-          textStyle: {
+          true
-            color: "#333333",
-          },
-          xAxis: {
-            type: "category",
-          },
-          yAxis: {
-            type: "value",
-          },
-          dataset: { source },
-          series: source[0].slice(1).map((item) => {
-            return {
-              type: "line",
-            };
-          }),
-        },
-        true
       );
     },
     initChart() {
@@ -192,7 +210,7 @@ export default {
     init() {
       this.$nextTick(() => {
         this.initChart();
-        this.$refs.dateRangeSelect.init();
+        this.$refs.dateRangeSelect.init(true);
       });
     },
   },

src/views/ems/dzjk/tjbb/sybb/index.vue

@@ -1,18 +1,17 @@
 <template>
   <div style="width:100%" v-loading="loading">
-    <!--    搜索栏-->
     <el-form :inline="true" class="select-container">
       <el-form-item label="时间选择">
         <el-date-picker
-            v-model="dateRange"
+          v-model="dateRange"
-            type="daterange"
+          type="daterange"
-            range-separator="至"
+          range-separator="至"
-            start-placeholder="开始日期"
+          start-placeholder="开始日期"
-            end-placeholder="结束日期"
+          end-placeholder="结束日期"
-            value-format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
-            :clearable="false"
+          :clearable="false"
-            :picker-options="pickerOptions"
+          :picker-options="pickerOptions"
-            :default-value="defaultDateRange"
+          :default-value="defaultDateRange"
         ></el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -21,109 +20,81 @@
       <el-form-item>
         <el-button @click="onReset" native-type="button">重置</el-button>
       </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="exportTable" native-type="button">导出</el-button>
+      </el-form-item>
     </el-form>
-    <!--表格-->
+
     <el-table
-        class="common-table"
+      class="common-table"
-        :data="tableData"
+      :data="tableData"
-        stripe
+      :summary-method="getSummaries"
-        style="width: 100%;margin-top:25px;">
+      show-summary
-      <!--        汇总列-->
+      stripe
-      <el-table-column label="汇总">
+      style="width: 100%; margin-top: 25px;"
-        <el-table-column
+    >
-            prop="dataTime"
+      <el-table-column label="汇总" min-width="100px" align="center">
-            label="日期"
+        <el-table-column prop="dataTime" label="日期" min-width="100px" align="center"></el-table-column>
-            width="120">
+        <el-table-column prop="dayType" label="日期类型" min-width="100px" align="center"></el-table-column>
-        </el-table-column>
+        <el-table-column prop="weatherDesc" label="天气情况" min-width="180px" align="center"></el-table-column>
       </el-table-column>
-      <!--充电量列-->
+
       <el-table-column label="充电价格" align="center">
-        <el-table-column
+        <el-table-column align="center" prop="activePeakPrice" label="尖"></el-table-column>
-            align="center"
+        <el-table-column align="center" prop="activeHighPrice" label="峰"></el-table-column>
-            prop="activePeakPrice"
+        <el-table-column align="center" prop="activeFlatPrice" label="平"></el-table-column>
-            label="尖">
+        <el-table-column align="center" prop="activeValleyPrice" label="谷"></el-table-column>
-        </el-table-column>
+        <el-table-column align="center" prop="activeTotalPrice" label="总"></el-table-column>
-        <el-table-column
-            align="center"
-            prop="activeHighPrice"
-            label="峰">
-        </el-table-column>
-        <el-table-column
-            align="center"
-            prop="activeFlatPrice"
-            label="平">
-        </el-table-column>
-        <el-table-column
-            align="center"
-            prop="activeValleyPrice"
-            label="谷">
-        </el-table-column>
-        <el-table-column
-            align="center"
-            prop="activeTotalPrice"
-            label="总">
-        </el-table-column>
       </el-table-column>
-      <!--充电量列-->
+
       <el-table-column label="放电价格" align="center">
-        <el-table-column
+        <el-table-column align="center" prop="reActivePeakPrice" label="尖"></el-table-column>
-            align="center"
+        <el-table-column align="center" prop="reActiveHighPrice" label="峰"></el-table-column>
-            prop="reActivePeakPrice"
+        <el-table-column align="center" prop="reActiveFlatPrice" label="平"></el-table-column>
-            label="尖">
+        <el-table-column align="center" prop="reActiveValleyPrice" label="谷"></el-table-column>
-        </el-table-column>
+        <el-table-column align="center" prop="reActiveTotalPrice" label="总"></el-table-column>
-        <el-table-column
+      </el-table-column>
-            align="center"
+
-            prop="reActiveHighPrice"
+      <el-table-column label="" align="center">
-            label="峰">
+        <el-table-column prop="actualRevenue" label="实际收益" align="center"></el-table-column>
-        </el-table-column>
+      </el-table-column>
-        <el-table-column
+
-            align="center"
+      <el-table-column label="备注" align="center" fixed="right" min-width="260">
-            prop="reActiveFlatPrice"
+        <template slot-scope="scope">
-            label="平">
+          <div class="remark-cell">
-        </el-table-column>
+            <span class="remark-text">{{ scope.row.remark || "-" }}</span>
-        <el-table-column
+            <el-button type="text" @click="editRemark(scope.row)">编辑</el-button>
-            align="center"
+          </div>
-            prop="reActiveValleyPrice"
+        </template>
-            label="谷">
-        </el-table-column>
-        <el-table-column
-            align="center"
-            prop="reActiveTotalPrice"
-            label="总">
-        </el-table-column>
       </el-table-column>
-      <!--        效率-->
-      <!--          <el-table-column label="效率(%)" align="center">-->
-      <!--            <el-table-column-->
-      <!--                align="center"-->
-      <!--              prop="effect">-->
-      <!--            </el-table-column>-->
-      <!--          </el-table-column>-->
     </el-table>
+
     <el-pagination
-        v-show="tableData.length>0"
+      v-show="tableData.length > 0"
-        background
+      background
-        @size-change="handleSizeChange"
+      @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
+      @current-change="handleCurrentChange"
-        :current-page="pageNum"
+      :current-page="pageNum"
-        :page-size="pageSize"
+      :page-size="pageSize"
-        :page-sizes="[10, 20, 30, 40]"
+      :page-sizes="[10, 20, 30, 40]"
-        layout="total, sizes, prev, pager, next, jumper"
+      layout="total, sizes, prev, pager, next, jumper"
-        :total="totalSize"
+      :total="totalSize"
-        style="margin-top:15px;text-align: center"
+      style="margin-top: 15px; text-align: center"
     >
     </el-pagination>
   </div>
 </template>
 
-
 <script>
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import {getAmmeterRevenueData} from '@/api/ems/dzjk'
+import { batchGetBizRemark, getAmmeterRevenueData, saveBizRemark } from "@/api/ems/dzjk";
-import {formatDate} from "@/filters/ems";
+import { formatDate } from "@/filters/ems";
+
+const BIZ_TYPE = "stats_report";
+const REPORT_KEY = "SYBB";
 
 export default {
-  name: 'DzjkTjbbSybb',
+  name: "DzjkTjbbSybb",
   mixins: [getQuerySiteId],
   data() {
     return {
@@ -133,73 +104,213 @@ export default {
           return time.getTime() > Date.now();
         },
       },
-      defaultDateRange: [],//默认展示的时间
+      defaultDateRange: [],
       dateRange: [],
       tableData: [],
-      pageSize: 10,//分页栏当前每个数据总数
+      summaryTotals: {},
-      pageNum: 1,//分页栏当前页数
+      pageSize: 10,
-      totalSize: 0,//table表格数据总数
+      pageNum: 1,
-    }
+      totalSize: 0,
+    };
   },
   methods: {
-    // 搜索
+    buildRemarkKey(dataTime) {
+      return `${this.siteId}_${dataTime || ""}`;
+    },
+    loadRemarks(rows) {
+      if (!rows.length) return Promise.resolve({});
+      return batchGetBizRemark({
+        bizType: BIZ_TYPE,
+        bizKey1: REPORT_KEY,
+        bizKey2List: rows.map(row => this.buildRemarkKey(row.dataTime)),
+      }).then(response => response?.data || {});
+    },
+    applyRemarks(rows, remarkMap) {
+      rows.forEach(row => {
+        this.$set(row, "remark", remarkMap[this.buildRemarkKey(row.dataTime)] || "");
+      });
+    },
+    toScaledInt(value) {
+      const num = Number(value);
+      return Number.isFinite(num) ? Math.round(num * 1000) : 0;
+    },
+    sumRowsByProp(rows, prop) {
+      const total = (rows || []).reduce((sum, row) => sum + this.toScaledInt(row?.[prop]), 0);
+      return total / 1000;
+    },
+    formatSummaryNumber(value) {
+      const num = Number(value);
+      if (!Number.isFinite(num)) return "";
+      return num.toFixed(3).replace(/\.?0+$/, "");
+    },
+    buildSummaryTotals(rows) {
+      const numericProps = [
+        "activePeakPrice",
+        "activeHighPrice",
+        "activeFlatPrice",
+        "activeValleyPrice",
+        "activeTotalPrice",
+        "reActivePeakPrice",
+        "reActiveHighPrice",
+        "reActiveFlatPrice",
+        "reActiveValleyPrice",
+        "reActiveTotalPrice",
+        "actualRevenue",
+      ];
+      return numericProps.reduce((result, prop) => {
+        result[prop] = this.sumRowsByProp(rows, prop);
+        return result;
+      }, {});
+    },
+    getSummaries({ columns, data }) {
+      return columns.map((column, index) => {
+        if (index === 0) return "合计";
+        const prop = column.property;
+        if (!prop) return "";
+        if (Object.prototype.hasOwnProperty.call(this.summaryTotals, prop)) {
+          return this.formatSummaryNumber(this.summaryTotals[prop]);
+        }
+        const hasNumericValue = (data || []).some(item => Number.isFinite(Number(item?.[prop])));
+        return hasNumericValue ? this.formatSummaryNumber(this.sumRowsByProp(data, prop)) : "";
+      });
+    },
+    exportTable() {
+      if (!this.dateRange?.length) return;
+      const [startTime, endTime] = this.dateRange;
+      this.download(
+        "ems/statsReport/exportAmmeterRevenueData",
+        {
+          siteId: this.siteId,
+          startTime,
+          endTime,
+        },
+        `收益报表_${startTime}-${endTime}.xlsx`
+      );
+    },
     onSearch() {
-      this.pageNum = 1//每次搜索从1开始搜索
+      this.pageNum = 1;
-      this.getData()
+      this.getData();
     },
-    // 重置
     onReset() {
-      this.dateRange = this.defaultDateRange
+      this.dateRange = this.defaultDateRange;
-      this.pageNum = 1//每次搜索从1开始搜索
+      this.pageNum = 1;
-      this.getData()
+      this.getData();
     },
-    // 分页
     handleSizeChange(val) {
       this.pageSize = val;
       this.$nextTick(() => {
-        this.getData()
+        this.getData();
-      })
+      });
     },
     handleCurrentChange(val) {
-      this.pageNum = val
+      this.pageNum = val;
       this.$nextTick(() => {
-        this.getData()
+        this.getData();
-      })
+      });
     },
-    // 获取数据
+    editRemark(row) {
-    getData() {
+      this.$prompt("请输入备注", "编辑备注", {
-      this.loading = true
+        inputValue: row.remark || "",
-      const {siteId, pageNum, pageSize} = this
+        inputType: "textarea",
-      const [startTime = '', endTime = ''] = (this.dateRange || [])
+        inputPlaceholder: "可输入该日报表备注",
-//http://localhost:8089/ems/statsReport/getAmmeterRevenueData?siteId=021_DDS_01&startTime=2025-10-14&endTime=2025-10-15&pageSize=10&pageNum=1
+        confirmButtonText: "保存",
-      getAmmeterRevenueData({siteId: siteId, startTime, endTime, pageSize, pageNum}).then(response => {
+        cancelButtonText: "取消",
-        this.tableData = response?.rows || [];
-        this.totalSize = response?.total || 0
-      }).finally(() => {
-        this.loading = false
       })
+        .then(({ value }) => {
+          return saveBizRemark({
+            bizType: BIZ_TYPE,
+            bizKey1: REPORT_KEY,
+            bizKey2: this.buildRemarkKey(row.dataTime),
+            remark: value || "",
+          }).then(() => {
+            this.$set(row, "remark", value || "");
+            this.$message.success("备注保存成功");
+          });
+        })
+        .catch(() => {});
+    },
+    getData() {
+      this.loading = true;
+      const { siteId, pageNum, pageSize } = this;
+      const [startTime = "", endTime = ""] = this.dateRange || [];
+
+      getAmmeterRevenueData({ siteId, startTime, endTime, pageSize, pageNum })
+        .then(pageResponse => {
+          const rows = pageResponse?.rows || [];
+          const total = Number(pageResponse?.total || 0);
+          this.totalSize = total;
+          this.tableData = rows;
+
+          const tasks = [this.loadRemarks(rows)];
+          if (total > 0) {
+            tasks.push(
+              getAmmeterRevenueData({
+                siteId,
+                startTime,
+                endTime,
+                pageNum: 1,
+                pageSize: total,
+              })
+            );
+          }
+          return Promise.all(tasks);
+        })
+        .then(([remarkMap, allResponse]) => {
+          this.applyRemarks(this.tableData, remarkMap || {});
+          const allRows = allResponse?.rows || allResponse?.data || [];
+          this.summaryTotals = this.buildSummaryTotals(allRows);
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
     init() {
-      this.dateRange = []
+      this.dateRange = [];
-      this.tableData = []
+      this.tableData = [];
-      this.totalSize = 0
+      this.summaryTotals = {};
-      this.pageSize = 10
+      this.totalSize = 0;
-      this.pageNum = 1
+      this.pageSize = 10;
-      const now = new Date().getTime();
+      this.pageNum = 1;
-      const lastMonth = new Date(now - 30 * 24 * 60 * 60 * 1000).getTime();
+      const now = new Date();
-      this.defaultDateRange = [formatDate(lastMonth), formatDate(now)];
+      const lastDay = now.getTime();
-      this.dateRange = [formatDate(lastMonth), formatDate(now)];
+      const firstDay = new Date(new Date().setDate(1)).getTime();
-      this.getData()
+      this.defaultDateRange = [formatDate(firstDay), formatDate(lastDay)];
+      this.dateRange = [formatDate(firstDay), formatDate(lastDay)];
+      this.getData();
     },
   },
-}
+};
 </script>
 
 <style scoped lang="scss">
 ::v-deep {
-  .common-table.el-table .el-table__header-wrapper th, .common-table.el-table .el-table__fixed-header-wrapper th {
+  .common-table.el-table {
-    border-bottom: 1px solid #dfe6ec;
+    .el-table__header-wrapper th,
+    .common-table.el-table .el-table__fixed-header-wrapper th {
+      border-bottom: 1px solid #dfe6ec;
+    }
+
+    .el-table__footer-wrapper {
+      tbody td.el-table__cell {
+        color: #000;
+        font-weight: bolder;
+      }
+    }
   }
 }
 
+.remark-cell {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+}
+
+.remark-text {
+  flex: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  text-align: left;
+}
 </style>

src/views/ems/dzjk/zxlt/index copy 2.vue

@@ -1,577 +0,0 @@
-<template>
-  <div class="ems-dashboard-editor-container" v-loading="loading">
-    <div class="container" v-show="!empty">
-      <!-- 云、电脑 -->
-      <div class="top">
-        <div class="cloud-container">
-          <div class="cloud">
-            <span style="z-index: 2; position: relative">云</span>
-          </div>
-        </div>
-        <div class="double-arrows">
-          <div class="top-arrows"></div>
-          <div class="bottom-arrows"></div>
-        </div>
-        <div class="computer">
-          <img src="@/assets/images/ems/computer.png" alt="" />
-          <span style="z-index: 2; position: relative">ems</span>
-        </div>
-      </div>
-      <div class="outer-border">
-        <!--            电表-->
-        <div class="row-lists-container" v-if="showDb">
-          <div class="row-title">电表({{ db.length }})</div>
-          <div class="row-lists">
-            <div v-for="item in db" :key="item.deviceId" class="row-items">
-              <div
-                class="status"
-                :class="
-                  item.communicationStatus === '0' ? 'status-running' : ''
-                "
-              >
-                {{ communicationStatusOptions[item.communicationStatus] }}
-              </div>
-              <div class="row-items-img">
-                <img
-                  class="img-db"
-                  :src="require('@/assets/images/ems/db.png')"
-                />
-                <div class="name">{{ item.deviceName }}</div>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <!--            液冷-->
-        <div class="row-lists-container" v-if="showLq">
-          <div class="row-title">冷却({{ lq.length }})</div>
-          <div class="row-lists">
-            <div v-for="item in lq" :key="item.deviceId" class="row-items">
-              <div
-                class="status"
-                :class="
-                  item.communicationStatus === '0' ? 'status-running' : ''
-                "
-              >
-                {{ communicationStatusOptions[item.communicationStatus] }}
-              </div>
-              <div class="row-items-img">
-                <img
-                  class="img-lq"
-                  :src="require('@/assets/images/ems/lq.png')"
-                />
-                <div class="name">{{ item.deviceName }}</div>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <!--            PCS-->
-        <div class="row-lists-container" v-if="showPcs">
-          <div class="row-lists">
-            <div class="row-title">PCS({{ pcs.length }})</div>
-            <div
-              v-for="(item, index) in pcs"
-              :key="item.deviceId"
-              class="row-items row-items-pcs"
-            >
-              <!-- pcs -->
-              <div class="parent-dash">
-                <div
-                  class="status"
-                  :class="
-                    item.communicationStatus === '0' ? 'status-running' : ''
-                  "
-                >
-                  {{ communicationStatusOptions[item.communicationStatus] }}
-                </div>
-                <div class="row-items-img">
-                  <img
-                    class="img-pcs"
-                    :src="require('@/assets/images/ems/pcs.png')"
-                  />
-                  <div class="name">{{ item.deviceName }}</div>
-                </div>
-              </div>
-              <!-- 子设备 bms -->
-              <div
-                v-if="item.children && item.children.length > 0"
-                class="children-dash"
-              >
-                <div
-                  class="row-children-title"
-                  v-if="bmsHasParentLength > 0 && index === 0"
-                >
-                  BMS({{ bmsHasParentLength }})
-                </div>
-                <div
-                  v-for="(childrenItem, childrenIndex) in item.children"
-                  :key="childrenIndex + 'childrenBms'"
-                  class="children-dash-items"
-                >
-                  <div
-                    class="status"
-                    :class="
-                      childrenItem.communicationStatus === '0'
-                        ? 'status-running'
-                        : ''
-                    "
-                  >
-                    {{
-                      communicationStatusOptions[
-                        childrenItem.communicationStatus
-                      ]
-                    }}
-                  </div>
-                  <div class="row-items-img">
-                    <img
-                      class="img-pcs"
-                      :src="require('@/assets/images/ems/bms.png')"
-                    />
-                    <div class="name">{{ childrenItem.deviceName }}</div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <div class="row-lists-container" v-if="showPcs">
-          <div class="row-title">PCS({{ pcs.length }})</div>
-          <div class="row-lists">
-            <div
-              v-for="item in bmsNoParent"
-              :key="item.deviceId"
-              class="row-items row-items-pcs"
-            >
-              <!-- pcs -->
-              <div class="parent-dash">
-                <div
-                  class="status"
-                  :class="
-                    item.communicationStatus === '0' ? 'status-running' : ''
-                  "
-                >
-                  {{ communicationStatusOptions[item.communicationStatus] }}
-                </div>
-                <div class="row-items-img">
-                  <img :src="require('@/assets/images/ems/bms.png')" />
-                  <div class="name">{{ item.deviceName }}</div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <!--            bms没有上级设备-->
-        <div class="row-lists-container" v-if="bmsNoParent.length > 0">
-          <div class="row-title">BMS({{ bmsNoParent.length }})</div>
-          <div class="row-lists">
-            <div
-              v-for="item in bmsNoParent"
-              :key="item.deviceId"
-              class="row-items row-items-pcs"
-            >
-              <!-- pcs -->
-              <div class="parent-dash">
-                <div
-                  class="status"
-                  :class="
-                    item.communicationStatus === '0' ? 'status-running' : ''
-                  "
-                >
-                  {{ communicationStatusOptions[item.communicationStatus] }}
-                </div>
-                <div class="row-items-img">
-                  <img :src="require('@/assets/images/ems/bms.png')" />
-                  <div class="name">{{ item.deviceName }}</div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <el-empty v-show="empty" :image-size="200"></el-empty>
-  </div>
-</template>
-
-<script>
-import { getDeviceList } from "@/api/ems/site";
-import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import { mapState } from "vuex";
-export default {
-  name: "DzjkZxlt",
-  mixins: [getQuerySiteId],
-  data() {
-    return {
-      loading: false,
-      pcs: [],
-      bms: [],
-      db: [],
-      lq: [],
-      pcsHasChildren: [],
-      pcsNoChildren: [],
-      bmsNoParent: [],
-    };
-  },
-  computed: {
-    ...mapState({
-      communicationStatusOptions: (state) =>
-        state.ems.communicationStatusOptions,
-    }),
-
-    showPcs() {
-      return this.pcs.length > 0;
-    },
-    showBms() {
-      return this.bms.length > 0;
-    },
-    showDb() {
-      return this.db.length > 0;
-    },
-    showLq() {
-      return this.lq.length > 0;
-    },
-    bmsHasParentLength() {
-      let count = 0;
-      this.pcs.forEach((item) => (count += item.children.length));
-      return count;
-    },
-    empty() {
-      return !this.showBms && !this.showPcs && !this.showDb && !this.showLq;
-    },
-  },
-  methods: {
-    init() {
-      this.pcs = [];
-      this.bms = [];
-      this.lq = [];
-      this.db = [];
-      this.bmsNoParent = [];
-      this.loading = true;
-      getDeviceList(this.siteId)
-        .then((response) => {
-          const data = JSON.parse(JSON.stringify(response?.data || []));
-          let pcs = [],
-            bms = [],
-            db = [],
-            lq = [],
-            bmsNoParent = [];
-          data.forEach((item) => {
-            // 电表
-            if (item.deviceCategory === "AMMETER") {
-              db.push({ ...item, children: [] });
-            } else if (item.deviceCategory === "PCS") {
-              // pcs
-              pcs.push({ ...item, children: [] });
-            } else if (item.deviceCategory === "STACK") {
-              // bms
-              bms.push({ ...item, children: [] });
-            } else if (item.deviceCategory === "COOLING") {
-              // 液冷
-              lq.push({ ...item, children: [] });
-            }
-          });
-          bms.forEach((item, index) => {
-            if (item.parentId) {
-              pcs
-                .find((pcsItem) => pcsItem.deviceId === item.parentId)
-                .children.push(item);
-            } else {
-              bmsNoParent.push(item);
-            }
-          });
-          this.pcs = pcs;
-          this.bms = bms;
-          this.lq = lq;
-          this.db = db;
-          this.pcsHasChildren = pcs.filter((item) => item.children.length > 0);
-          this.pcsNoChildren = pcs.filter((item) => item.children.length === 0);
-          this.bmsNoParent = bmsNoParent;
-        })
-        .finally(() => {
-          this.loading = false;
-        });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-$sqDistance: 30px;
-$borderColor: #174a8e;
-$lineColor: #86bcc7;
-
-.ems-dashboard-editor-container {
-  background-color: #ffffff;
-  padding: 0;
-  color: #666666;
-
-  .container {
-    display: flex;
-    position: relative;
-  }
-  //云 、计算机 、箭头
-  .top {
-    z-index: 2;
-    width: fit-content;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    // position: absolute;
-    // top: 50%;
-    // left: 0;
-    // transform: translateY(-50%);
-    //云 样式
-    .cloud-container {
-      margin: 0 auto;
-      .cloud {
-        width: 60px;
-        height: 26px;
-        background: #cbebfd;
-        border-radius: 100px;
-        position: relative;
-        text-align: center;
-        font-weight: bold;
-        font-size: 14px;
-        line-height: 26px;
-      }
-      .cloud:before,
-      .cloud:after {
-        content: "";
-        position: absolute;
-        background: #cbebfd;
-        width: 30px;
-        height: 30px;
-        border-radius: 100%;
-      }
-      .cloud:before {
-        top: -9px;
-        left: 8px;
-      }
-      .cloud:after {
-        top: -6px;
-        right: 9px;
-      }
-    }
-    //双箭头
-    .double-arrows {
-      height: fit-content;
-      margin: 0 10px;
-      text-align: center;
-      .top-arrows,
-      .bottom-arrows {
-        height: 4px;
-        width: 30px;
-        background-color: #5ea9df;
-        margin: 0 10px;
-        position: relative;
-        &::after {
-          content: "";
-          position: absolute;
-          left: 0;
-          width: 0;
-          height: 0;
-        }
-      }
-      .top-arrows {
-        vertical-align: super;
-      }
-      .top-arrows::after {
-        top: -4px;
-        border-bottom: 6px solid transparent;
-        border-left: 6px solid transparent;
-        border-right: 6px solid #5ea9df;
-        border-top: 6px solid transparent;
-        left: -11px;
-      }
-      .bottom-arrows {
-        margin-top: 8px;
-        &::after {
-          top: -4px;
-          border-top: 6px solid transparent;
-          border-left: 6px solid #5ea9df;
-          border-right: 6px solid transparent;
-          border-bottom: 6px solid transparent;
-          right: -11px;
-          left: auto;
-        }
-      }
-    }
-
-    //电脑
-    .computer {
-      text-align: center;
-      font-size: 14px;
-      line-height: 16px;
-      font-weight: bold;
-      position: relative;
-      background: #fff;
-      img {
-        width: 80px;
-        height: auto;
-        display: block;
-      }
-    }
-  }
-  .outer-border {
-    position: relative;
-    width: fit-content;
-    border: 1.5px solid $borderColor;
-    border-radius: 5px;
-    padding-left: 120px;
-    padding-right: 20px;
-    margin-left: -40px;
-  }
-
-  // 设备列表
-  .row-lists-container {
-    font-size: 10px;
-    position: relative;
-    padding: 10px;
-    .row-title {
-      position: absolute;
-      left: -$sqDistance - 30px;
-      top: calc(50% + 10px);
-      transform: translateY(-50%);
-      color: #000;
-      font-weight: bolder;
-    }
-    .row-lists {
-      display: flex;
-      position: relative;
-      .row-items {
-        position: relative;
-        padding: 5px 0;
-        &:not(:first-child) {
-          margin-left: $sqDistance; //和外层父元素上下padding一致
-        }
-        &::before {
-          content: "";
-          display: block;
-          height: 3px;
-          width: $sqDistance - 2px;
-          background: $lineColor;
-          position: absolute;
-          left: -$sqDistance;
-          top: calc(50% + 10px);
-          transform: scale(1, 0.4);
-        }
-        // 一列 第一个设备最上面的线
-        &:first-child {
-          &::before {
-            width: $sqDistance + 20px;
-            // top: -$sqDistance - 20px;
-          }
-        }
-        // 一列 最后一个设备最下面的线
-        // &:last-child {
-        //   &::after {
-        //     content: "";
-        //     display: block;
-        //     width: 3px;
-        //     height: $sqDistance - 2px;
-        //     background: $lineColor;
-        //     position: absolute;
-        //     bottom: -$sqDistance;
-        //     left: 50%;
-        //     transform: scale(0.4, 1);
-        //   }
-        // }
-        // 设备状态
-        .status {
-          margin: 0 auto 4px;
-          width: fit-content;
-          height: 18px;
-          padding: 0 8px;
-          box-sizing: border-box;
-          text-align: center;
-          font-size: 8px;
-          line-height: 18px;
-          border: 1px solid #08ffff;
-          border-radius: 2px;
-          background: #aaaaaa;
-          color: #ffffff;
-          &.status-running {
-            background: #00c69c;
-          }
-        }
-        // 图片+设备名称
-        .row-items-img {
-          position: relative;
-          padding-top: 12px;
-          img {
-            width: 80px;
-            height: auto;
-            display: block;
-            &.img-lq {
-              width: 50px;
-            }
-            &.img-pcs {
-              width: 50px;
-            }
-            &.img-db {
-              width: 56px;
-            }
-          }
-          .name {
-            position: absolute;
-            top: 1px;
-            left: 0;
-            color: #666;
-            white-space: nowrap;
-          }
-        }
-      }
-    }
-  }
-
-  //子设备
-  .row-lists-container-children {
-    margin: 10px 0 0 $sqDistance;
-    .parent-dash {
-      position: relative;
-      &::before {
-        content: "";
-        display: block;
-        height: 40px;
-        width: 3px;
-        background: #ec7f8c;
-        position: absolute;
-        left: 20%;
-        top: -40px;
-        transform: scale(0.4, 1) rotate(-40deg);
-      }
-    }
-  }
-  .parent-dash {
-    width: fit-content;
-  }
-  .children-dash {
-    margin: $sqDistance 0 0 $sqDistance;
-    position: relative;
-    .row-children-title {
-      position: absolute;
-      left: -$sqDistance - 30px;
-      top: calc(50% + 10px);
-      transform: translateY(-50%);
-      color: #000;
-      font-weight: bolder;
-    }
-    .children-dash-items {
-      position: relative;
-      &::before {
-        content: "";
-        display: block;
-        height: $sqDistance;
-        width: 3px;
-        background: #ec7f8c;
-        position: absolute;
-        left: 20%;
-        top: -$sqDistance;
-        transform: scale(0.4, 1) rotate(-40deg);
-      }
-    }
-  }
-}
-</style>

src/views/ems/dzjk/zxlt/index copy.vue

@@ -1,614 +0,0 @@
-<template>
-    <div class="ems-dashboard-editor-container" v-loading="loading" >
-      <div class="container" v-show="!empty">
-        <div class="top">
-          <div class="cloud-container">
-            <div class="cloud">
-              <span style="z-index:2;position: relative;">云</span>
-            </div>
-          </div>
-          <div class="double-arrows">
-            <div class="top-arrows"></div>
-            <div class="bottom-arrows"></div>
-          </div>
-          <div class="computer">
-            <img src="@/assets/images/ems/computer.png" alt="">
-            <span style="z-index:2;position: relative;">ems</span>
-          </div>
-          <div class="arrow"></div>
-        </div>
-        <div class="bottom">
-<!--          四列设备-->
-          <div class="zxlt-row">
-<!--            bms、pcs 下级和上级在一列 -->
-            <div class="row-lists pcs-row-lists" v-if="showPcsAndBms">
-              <div class="item-square">
-                <div class="row-lists-title" v-if="showPcs">PCS({{pcs.length}})</div>
-                <div class="row-lists-title" v-if="showBms">BMS({{bms.length}})</div>
-              </div>
-<!--              上下级块 class区分-->
-              <div class="item-square pcs-has-children-item-square" :class="{'no-bms-list':!showBms}" v-for="(item,index) in pcsHasChildren" :key="index+'pcsHasChildren'">
-                <!--                左边的上级 上级只有一个-->
-                <div class="item-lists parent-item-lists">
-                  <!--                  上级设备-->
-                  <div class="items normal-items-arrow">
-                    <div class="items-inner">
-                      <div style="text-align: center;margin-bottom:10px;">
-                        <div class="status" :class="item.communicationStatus === '0' ?'status-normal' : 'status-warn'">通讯状态:{{communicationStatusOptions[item.communicationStatus] || '-'}}</div>
-                      </div>
-                      <img v-if="item.pictureUrl" :src="item.pictureUrl">
-                      <img v-else :src="require('@/assets/images/ems/pcs.png')"/>
-                      <div class="name">{{item.deviceName}}</div>
-                    </div>
-                  </div>
-                </div>
-<!--                右边的下级 下级有多个-->
-                <div class="item-lists children-item-lists">
-<!--                  下级设备 循环生成-->
-                  <div class="items children-items-arrow bms-children-arrow" v-for="children in  item.children" :key="children.deviceId">
-                    <div class="items-inner">
-                        <div style="text-align: center;margin-bottom:10px;">
-                          <div class="status" :class="children.communicationStatus === '0' ?'status-normal' : 'status-warn'">通讯状态:{{communicationStatusOptions[children.communicationStatus] || '-'}}</div>
-                        </div>
-                        <img v-if="children.pictureUrl" :src="children.pictureUrl">
-                        <img v-else :src="require('@/assets/images/ems/bms.png')"/>
-                        <div class="name">{{children.deviceName}}</div>
-                    </div>
-                  </div>
-                </div>
-
-              </div>
-<!--                没有上下级关系的bms、pcs-->
-              <div class="item-square" :class="{'no-bms-list':!showBms}">
-<!--                左边没有下级的pcs-->
-                <div class="item-lists">
-                  <div class="items normal-items-arrow" v-for="item in  pcsNoChildren" :key="item.deviceId">
-                    <div class="items-inner">
-                      <div style="text-align: center;margin-bottom:10px;">
-                        <div class="status" :class="item.communicationStatus === '0' ?'status-normal' : 'status-warn'">通讯状态:{{communicationStatusOptions[item.communicationStatus] || '-'}}</div>
-                      </div>
-                      <img v-if="item.pictureUrl" :src="item.pictureUrl">
-                      <img v-else :src="require('@/assets/images/ems/pcs.png')"/>
-                      <div class="name">{{item.deviceName}}</div>
-                    </div>
-                  </div>
-                </div>
-                <!--                右边没有上级的bms-->
-                <div class="item-lists">
-                  <!--                  下级设备 循环生成-->
-                  <div class="items children-items-arrow" v-for="item in  bmsNoParent" :key="item.deviceId">
-                    <div class="items-inner">
-                      <div style="text-align: center;margin-bottom:10px;">
-                        <div class="status" :class="item.communicationStatus === '0' ?'status-normal' : 'status-warn'">通讯状态:{{communicationStatusOptions[item.communicationStatus] || '-'}}</div>
-                      </div>
-                      <img v-if="item.pictureUrl" :src="item.pictureUrl">
-                      <img v-else :src="require('@/assets/images/ems/bms.png')"/>
-                      <div class="name">{{item.deviceName}}</div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-<!--            电表-->
-            <div class="row-lists" v-if="showDb">
-              <div class="item-square">
-                <div class="row-lists-title" style="width:100%;">电表({{db.length}})</div>
-              </div>
-              <div class="item-square">
-                <!--                左边的下级 下级有多个-->
-                <div class="item-lists">
-                  <!--                  下级设备 循环生成-->
-                  <div class="items normal-items-arrow" v-for="item in  db" :key="item.deviceId">
-                    <div class="items-inner">
-                      <div style="text-align: center;margin-bottom:10px;">
-                        <div class="status" :class="item.communicationStatus === '0' ?'status-normal' : 'status-warn'">通讯状态:{{communicationStatusOptions[item.communicationStatus] || '-'}}</div>
-                      </div>
-                      <img v-if="item.pictureUrl" :src="item.pictureUrl">
-                      <img v-else :src="require('@/assets/images/ems/bms.png')"/>
-                      <div class="name">{{item.deviceName}}</div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-
-            </div>
-<!--冷却-->
-            <div class="row-lists" v-if="showLq">
-              <div class="item-square">
-                <div class="row-lists-title" style="width:100%;">冷却({{lq.length}})</div>
-              </div>
-              <div class="item-square">
-                <div class="item-lists">
-                  <div class="items normal-items-arrow" v-for="item in  lq" :key="item.deviceId">
-                    <div class="items-inner">
-                      <div style="text-align: center;margin-bottom:10px;">
-                        <div class="status" :class="item.communicationStatus === '0' ?'status-normal' : 'status-warn'">通讯状态:{{communicationStatusOptions[item.communicationStatus] || '-'}}</div>
-                      </div>
-                      <img v-if="item.pictureUrl" :src="item.pictureUrl">
-                      <img v-else :src="require('@/assets/images/ems/bms.png')"/>
-                      <div class="name">{{item.deviceName}}</div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <el-empty v-show="empty" :image-size="200"></el-empty>
-    </div>
-</template>
-
-
-<script>
-import {getDeviceList} from'@/api/ems/site'
-import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import {mapState} from "vuex";
-export default {
-  name: 'DzjkZxlt',
-  mixins: [getQuerySiteId],
-  data() {
-    return {
-      loading:false,
-      pcs :[],
-      bms:[],
-      db:[],
-      lq:[],
-      pcsHasChildren:[],
-      pcsNoChildren:[],
-      bmsNoParent:[]
-    }
-  },
-  computed:{
-    ...mapState({
-      communicationStatusOptions:(state)=>state.ems.communicationStatusOptions
-    }),
-
-    showPcs(){
-      return this.pcs.length>0
-    },
-    showBms(){
-      return this.bms.length>0
-    },
-    showDb(){
-      return this.db.length>0
-    },
-    showLq(){
-      return this.lq.length>0
-    },
-    showPcsAndBms(){
-      return this.showPcs || this.showBms
-    },
-    empty(){
-      return !this.showBms && !this.showPcs && !this.showDb && !this.showLq
-    },
-
-  },
-  methods: {
-    init(){
-      this.pcs = []
-      this.bms = []
-      this.lq=[]
-      this.db=[]
-      this.bmsNoParent=[]
-      this.loading = true
-      getDeviceList(this.siteId).then(response => {
-        const data =JSON.parse(JSON.stringify(response?.data || []))
-        let pcs = [],bms=[],db=[],lq=[],bmsNoParent=[]
-        data.forEach(item=>{
-          // 电表
-          if(item.deviceCategory === 'AMMETER'){
-            db.push({...item,children:[]})
-          }else if(item.deviceCategory === 'PCS'){
-            // pcs
-            pcs.push({...item,children:[]})
-          }else if(item.deviceCategory === 'STACK'){
-            // bms
-            bms.push({...item,children:[]})
-          }else if(item.deviceCategory === 'COOLING'){
-            // 液冷
-            lq.push({...item,children:[]})
-          }
-        })
-        bms.forEach((item,index)=>{
-          if(item.parentId){
-            pcs.find(pcsItem=>pcsItem.deviceId === item.parentId).children.push(item)
-          }else{
-            bmsNoParent.push(item)
-          }
-        })
-        this.pcs = pcs
-        this.bms = bms
-        this.lq=lq
-        this.db=db
-        this.pcsHasChildren = pcs.filter(item=>item.children.length > 0)
-        this.pcsNoChildren = pcs.filter(item=>item.children.length === 0)
-        this.bmsNoParent = bmsNoParent
-      }).finally(() => {
-        this.loading = false
-      })
-    }
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-$distance:60px;
-$arrowDistance:80px;//margin:60+quare的padding10
-$arrowColoe:#5ea9df;
-$lineColoe:#5ea9df;
-.ems-dashboard-editor-container {
-  background-color: #ffffff;
-  padding:0;
-  .container{
-    position: relative;
-    overflow-x: auto;
-  }
-  //云 、计算机 、箭头
-  .top{
-    width: 280px;
-    font-size: 30px;
-    line-height: 40px;
-    font-weight: 500;
-    display: flex;
-    flex-direction: column;
-    //云 样式
-    .cloud-container{
-      padding-top:40px;
-      margin:0 auto;
-      .cloud {
-        width: 150px;
-        height: 60px;
-        background: #cbebfd;
-        border-radius: 200px;
-        position: relative;
-        text-align: center;
-        color:#666666;
-      }
-      .cloud:before, .cloud:after {
-        content: '';
-        position: absolute;
-        background:#cbebfd;
-        width: 80px;
-        height: 80px;
-        border-radius: 50%;
-      }
-      .cloud:before {
-        top: -28px;
-        left: 20px;
-      }
-      .cloud:after {
-        top: -31px;
-        right: 20px;
-      }
-    }
-    //双箭头
-    .double-arrows {
-      height: 50px;
-      margin:20px 0;
-      text-align: center;
-      .top-arrows,.bottom-arrows{
-        height: 100%;
-        width: 6px;
-        background-color: $arrowColoe;
-        display: inline-block;
-        margin: 0 10px;
-        position: relative;
-        vertical-align: super;
-        &::after {
-          content: '';
-          position: absolute;
-          left:0;
-          width: 0;
-          height: 0;
-
-        }
-      }
-      .top-arrows{
-        vertical-align: super;
-      }
-      .top-arrows::after {
-        bottom: -24px;
-        border-bottom: 12px solid transparent;
-        border-left: 12px solid transparent;
-        border-right: 12px solid transparent;
-        border-top: 14px solid $arrowColoe;
-        left: -9px;
-      }
-      .bottom-arrows{
-        margin-top:12px;
-        &::after {
-          top: -24px;
-          border-top: 12px solid transparent;
-          border-left: 12px solid transparent;
-          border-right: 12px solid transparent;
-          border-bottom: 14px solid $arrowColoe;
-          left: -9px;
-        }
-      }
-
-    }
-
-    //电脑
-    .computer{
-      margin:20px auto;
-      text-align: center;
-      color:#666666;
-      position: relative;
-      img {
-        width: auto;
-        height: 100px;
-        display: block;
-      }
-    }
-    .arrow{
-      height: 50px;
-      width: 30px;
-      border-radius: 5px;
-      background-color: $arrowColoe;
-      position: relative;
-      margin:0 auto;
-      &::after{
-        content: "";
-        position: absolute;
-        width: 0;
-        height: 0;
-        left: -9px;
-        border-top: 24px solid $arrowColoe;
-        border-left: 24px solid transparent;
-        border-bottom: 24px solid transparent;
-        border-right: 24px solid transparent;
-        bottom: -44px;
-      }
-    }
-
-  }
-  .bottom{
-    z-index:1;
-    box-sizing: border-box;
-    margin-top:50px;
-    .zxlt-row{
-      display: flex;
-      padding:20px $distance;
-      position: relative;
-      width: fit-content;
-      &:before{
-        content: '';
-        display: block;
-        width:calc(100% - 100px);
-        height:1px;
-        background-color: $lineColoe;
-        position:absolute;
-        top:0;
-        left: $distance/2;
-      }
-      .row-lists{
-        height: fit-content;
-        position: relative;
-        &:before{
-          content: '';
-          display: block;
-          height: 100%;
-          width: 1px;
-          position: absolute;
-          left:-($distance/2);
-          top:-20px;
-          background-color: $lineColoe;
-        }
-        //pcs列 bms右侧的边框
-        &.pcs-row-lists{
-          &:after{
-            content: '';
-            display: block;
-            height: 100%;
-            width: 1px;
-            position: absolute;
-            right:-(($distance/2) + 1);
-            top:-20px;
-            background-color: $lineColoe;
-          }
-        }
-        &:not(:last-child){
-          margin-right: $distance;
-        }
-        .item-square{
-          //左右 两列
-          display: flex;
-          vertical-align: middle;
-          align-items: flex-start;
-          padding:10px;
-          border-radius: 5px;
-          &:not(:last-child){
-            margin-bottom: 40px;
-          }
-          .row-lists-title{
-            font-size: 20px;
-            line-height: 20px;
-            color: #333333;
-            font-weight: 500;
-            text-align: center;
-            flex: 1;
-          }
-          .item-lists{
-            position: relative;
-            &:not(:last-child){
-              margin-right:$distance;
-            }
-            //每个设备
-            .items{
-              background-color: #cbebfd;
-              position: relative;
-              border-radius: 5px;
-              padding: 10px;
-              box-shadow: 0 0 10px rgba(0, 0, 0, 0.1), 0 0 0 rgba(0, 0, 0, 0.5);
-              //普通设备 箭头方向
-              &.normal-items-arrow{
-                &:before{
-                  content: '';
-                  display: block;
-                  width:($arrowDistance/2) - 15;
-                  height: 4px;
-                  background-color: $arrowColoe;
-                  position: absolute;
-                  top:50%;
-                  left: -($arrowDistance/2);
-                  transform: translateY(-50%);
-                }
-                &:after{
-                  content: '';
-                  display: block;
-                  height: 0;
-                  width: 0;
-                  border-left: 10px solid #5ea9df;
-                  border-right: 10px solid transparent;
-                  border-bottom: 10px solid transparent;
-                  border-top: 10px solid transparent;
-                  position: absolute;
-                  top: 50%;
-                  left: -15px;
-                  transform: translateY(-50%);
-                }
-              }
-              //下级的箭头
-              &.children-items-arrow{
-                &:before{
-                  content: '';
-                  display: block;
-                  width:($arrowDistance/2) - 15;
-                  height: 4px;
-                  background-color: $arrowColoe;
-                  position: absolute;
-                  top:50%;
-                  right: -($arrowDistance/2);
-                  transform: translateY(-50%);
-                }
-                &:after{
-                  content: '';
-                  display: block;
-                  height: 0;
-                  width: 0;
-                  border-right: 10px solid #5ea9df;
-                  border-left: 10px solid transparent;
-                  border-bottom: 10px solid transparent;
-                  border-top: 10px solid transparent;
-                  position: absolute;
-                  top: 50%;
-                  right: -15px;
-                  transform: translateY(-50%);
-                }
-              }
-              &:not(:last-child){
-                margin-bottom: 15px;
-              }
-
-              .items-inner{
-                background-color: #ffffff;
-                border-radius: 5px;
-                padding:10px;
-                width:130px;
-                text-align: center;
-              }
-
-              img{
-                width: 80px;
-                height: auto;
-                display: block;
-                z-index:2;
-                margin: 0 auto;
-              }
-              .name{
-                text-align: center;
-                margin-top:10px;
-                font-size: 14px;
-                line-height: 20px;
-                z-index:2;
-              }
-              .status{
-                z-index:2;
-                margin-top:10px;
-                font-size: 14px;
-                line-height: 20px;
-                position: relative;
-                padding-left:20px;
-                display: inline;
-                &.status-normal {
-                  &:before {
-                    content: "";
-                    display: block;
-                    width: 15px;
-                    height: 15px;
-                    border-radius: 50%;
-                    background-color: #05AEA3;
-                    position: absolute;
-                    top:50%;
-                    left:0;
-                    transform: translate(0,-50%);
-                  }
-                }
-                &.status-warn{
-                  &:before{
-                    content: "";
-                    display: inline-block;
-                    width: 15px;
-                    height: 15px;
-                    border-radius: 50%;
-                    background-color: #FC6B69;
-                    position: absolute;
-                    top:50%;
-                    left:0;
-                    transform: translate(0,-50%);
-                  }
-                }
-              }
-            }
-          }
-          .children-item-lists{
-            //todo 手动修改
-            &:before{
-              content: '';
-              display: block;
-              width:40px;
-              height: 4px;
-              background-color: $arrowColoe;
-              position: absolute;
-              top:50%;
-              left: -50px;
-              transform:translateY(-50%);
-            }
-            &:after{
-              content: '';
-              display: block;
-              height: 0;
-              width: 0;
-              border-left: 10px solid #5ea9df;
-              border-right: 10px solid transparent;
-              border-bottom: 10px solid transparent;
-              border-top: 10px solid transparent;
-              position: absolute;
-              top: 50%;
-              left: -14px;
-              transform:translateY(-50%);
-            }
-          }
-        }
-        .pcs-has-children-item-square{
-          vertical-align: middle;
-          align-items: center;
-          background-color: #ffefad;
-        }
-        .no-bms-list{
-          .item-lists{
-            &:not(:last-child){
-              margin-right:0;
-            }
-          }
-        }
-      }
-    }
-
-
-  }
-}
-</style>
-
-

src/views/ems/dzjk/zxlt/index.vue

@@ -34,7 +34,7 @@
                   <div
                       class="status"
                       :class="
-                      item.deviceStatus === '2' ? 'status-running' : ''
+                      item.deviceStatus === '1' ? 'status-running' : ''
                     "
                   >
                     {{ deviceStatusOptions[item.deviceStatus] }}
@@ -68,7 +68,7 @@
                   <div
                       class="status"
                       :class="
-                      item.deviceStatus === '2' ? 'status-running' : ''
+                      item.deviceStatus === '1' ? 'status-running' : ''
                     "
                   >
                     {{ deviceStatusOptions[item.deviceStatus] }}
@@ -107,7 +107,7 @@
                   <div
                       class="status"
                       :class="
-                      item.deviceStatus === '2' ? 'status-running' : ''
+                      item.deviceStatus === '1' ? 'status-running' : ''
                     "
                   >
                     {{ deviceStatusOptions[item.deviceStatus] }}
@@ -150,7 +150,7 @@
                   <div
                       class="status"
                       :class="
-                      item.deviceStatus === '2' ? 'status-running' : ''
+                      item.deviceStatus === '1' ? 'status-running' : ''
                     "
                   >
                     {{ deviceStatusOptions[item.deviceStatus] }}
@@ -171,7 +171,7 @@
                   <div
                       class="status"
                       :class="
-                      item.children[0].deviceStatus === '2'
+                      item.children[0].deviceStatus === '1'
                         ? 'status-running'
                         : ''
                     "

src/views/ems/home/index.vue

@@ -1,25 +1,25 @@
 <template>
-    <div class="ems-dashboard-editor-container" v-loading="loading">
+    <div class="ems-dashboard-editor-container">
      <zd-info></zd-info>
       <div class="ems-content-container ems-content-container-padding">
         <div class="content-title">数据概览</div>
         <el-row :gutter="15" style="background:#fff;margin:30px 0;">
-          <el-col :xs="24" :sm="12" :lg="12">
+          <el-col :xs="24" :sm="12" :lg="12" v-loading="chartLoading.dlzbchart">
               <dlzb-chart ref="dlzbchart"/>
           </el-col>
-          <el-col :xs="24" :sm="12" :lg="12">
+          <el-col :xs="24" :sm="12" :lg="12" v-loading="chartLoading.xtxlchart">
               <xtxl-chart ref="xtxlchart"/>
           </el-col>
         </el-row>
 
         <el-row :gutter="15" style="background:#fff;margin:0;">
-          <el-col :xs="24" :sm="8" :lg="8">
+          <el-col :xs="24" :sm="8" :lg="8" v-loading="chartLoading.gjqsChart">
               <gjqs-chart ref="gjqsChart"/>
           </el-col>
-          <el-col :xs="24" :sm="8" :lg="8">
+          <el-col :xs="24" :sm="8" :lg="8" v-loading="chartLoading.sbgjzbChart">
               <sbgjzb-chart ref="sbgjzbChart"/>
           </el-col>
-          <el-col :xs="24" :sm="8" :lg="8">
+          <el-col :xs="24" :sm="8" :lg="8" v-loading="chartLoading.gjdjfbChart">
               <gjdjfb-chart ref="gjdjfbChart"/>
           </el-col>
         </el-row>
@@ -47,24 +47,45 @@ export default {
   },
   data() {
     return {
-      loading:false,
+      chartLoading: {
+        dlzbchart: false,
+        xtxlchart: false,
+        gjqsChart: false,
+        sbgjzbChart: false,
+        gjdjfbChart: false
+      }
     }
   },
   methods: {
-
+    setChartLoading(loading) {
+      this.chartLoading = {
+        dlzbchart: loading,
+        xtxlchart: loading,
+        gjqsChart: loading,
+        sbgjzbChart: loading,
+        gjdjfbChart: loading
+      }
+    },
+    hideChartLoading(key) {
+      this.$set(this.chartLoading, key, false)
+    }
   },
   mounted() {
-    this.loading = true
+    this.setChartLoading(true)
     dataList().then(response => {
       const data = JSON.parse(JSON.stringify(response?.data || {}))
       this.$refs.dlzbchart.initChart(data?.elecDataList || [])
+      this.hideChartLoading('dlzbchart')
       this.$refs.xtxlchart.initChart(data?.sysEfficList || [])
+      this.hideChartLoading('xtxlchart')
       this.$refs.gjqsChart.initChart(data?.alarmDataList || [])
+      this.hideChartLoading('gjqsChart')
       this.$refs.sbgjzbChart.initChart(data?.deviceAlarmList || [])
+      this.hideChartLoading('sbgjzbChart')
       this.$refs.gjdjfbChart.initChart(data?.alarmLevelList || [])
-
+      this.hideChartLoading('gjdjfbChart')
-    }).finally(() => {
+    }).catch(() => {
-      this.loading = false
+      this.setChartLoading(false)
     })
   }
 }

src/views/ems/site/dataCorrection/AddChargeDataCorrection.vue

@@ -0,0 +1,183 @@
+<template>
+  <el-dialog
+    :visible.sync="dialogVisible"
+    :close-on-press-escape="false"
+    :close-on-click-modal="false"
+    :show-close="false"
+    destroy-on-close
+    lock-scroll
+    append-to-body
+    width="760px"
+    class="ems-dialog"
+    :title="mode === 'add' ? '新增充放电收益修正' : '编辑充放电收益修正'"
+  >
+    <el-form
+      ref="formRef"
+      v-loading="loading"
+      :model="formData"
+      :rules="rules"
+      label-width="120px"
+      size="medium"
+      class="form-grid"
+    >
+      <el-form-item label="站点" prop="siteId">
+        <el-input v-model="formData.siteId" placeholder="请先在顶部选择站点" disabled />
+      </el-form-item>
+      <el-form-item label="数据日期" prop="dateTime">
+        <el-date-picker
+          v-model="formData.dateTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择数据日期"
+          style="width: 100%"
+        />
+      </el-form-item>
+
+      <el-form-item label="总充电量" prop="totalChargeData">
+        <el-input-number v-model="formData.totalChargeData" :controls="false" :min="-999999999" :max="999999999" :step="0.001" :precision="3" style="width: 100%" />
+      </el-form-item>
+
+      <el-form-item label="总放电量" prop="totalDischargeData">
+        <el-input-number v-model="formData.totalDischargeData" :controls="false" :min="-999999999" :max="999999999" :step="0.001" :precision="3" style="width: 100%" />
+      </el-form-item>
+      <el-form-item label="当日充电量" prop="chargeData">
+        <el-input-number v-model="formData.chargeData" :controls="false" :min="-999999999" :max="999999999" :step="0.001" :precision="3" style="width: 100%" />
+      </el-form-item>
+
+      <el-form-item label="当日放电量" prop="dischargeData">
+        <el-input-number v-model="formData.dischargeData" :controls="false" :min="-999999999" :max="999999999" :step="0.001" :precision="3" style="width: 100%" />
+      </el-form-item>
+
+      <el-form-item label="累计收益" prop="totalRevenue">
+        <el-input-number v-model="formData.totalRevenue" :controls="false" :min="-999999999" :max="999999999" :step="0.0001" :precision="4" style="width: 100%" />
+      </el-form-item>
+
+      <el-form-item label="当日收益" prop="dayRevenue">
+        <el-input-number v-model="formData.dayRevenue" :controls="false" :min="-999999999" :max="999999999" :step="0.0001" :precision="4" style="width: 100%" />
+      </el-form-item>
+
+      <el-form-item label="备注" prop="remark" class="full-row">
+        <el-input v-model="formData.remark" type="textarea" :rows="3" maxlength="300" show-word-limit />
+      </el-form-item>
+    </el-form>
+
+    <div slot="footer">
+      <el-button @click="closeDialog">取消</el-button>
+      <el-button type="primary" :loading="saving" @click="saveDialog">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import {
+  addDailyChargeData,
+  getDailyChargeDataDetail,
+  updateDailyChargeData,
+} from '@/api/ems/site'
+
+const buildEmptyForm = () => ({
+  id: '',
+  siteId: '',
+  dateTime: '',
+  totalChargeData: null,
+  totalDischargeData: null,
+  chargeData: null,
+  dischargeData: null,
+  totalRevenue: null,
+  dayRevenue: null,
+  remark: '',
+})
+
+export default {
+  name: 'AddChargeDataCorrection',
+  data() {
+    return {
+      dialogVisible: false,
+      mode: 'add',
+      loading: false,
+      saving: false,
+      formData: buildEmptyForm(),
+      rules: {
+        siteId: [{ required: true, message: '请先在顶部选择站点', trigger: 'blur' }],
+        dateTime: [{ required: true, message: '请选择数据日期', trigger: 'change' }],
+      },
+    }
+  },
+  methods: {
+    getRouteSiteId() {
+      const siteId = this.$route?.query?.siteId
+      return siteId === undefined || siteId === null ? '' : String(siteId).trim()
+    },
+    showDialog(id, siteId = '') {
+      this.dialogVisible = true
+      if (id) {
+        this.mode = 'edit'
+        this.formData.id = id
+        this.fetchDetail(id)
+      } else {
+        this.mode = 'add'
+        this.formData = buildEmptyForm()
+        this.formData.siteId = siteId || this.getRouteSiteId()
+      }
+    },
+    fetchDetail(id) {
+      this.loading = true
+      getDailyChargeDataDetail(id)
+        .then((res) => {
+          this.formData = Object.assign(buildEmptyForm(), res?.data || {})
+        })
+        .finally(() => {
+          this.loading = false
+        })
+    },
+    saveDialog() {
+      this.$refs.formRef.validate((valid) => {
+        if (!valid) return
+        this.saving = true
+        const request = this.mode === 'add' ? addDailyChargeData : updateDailyChargeData
+        const payload = {
+          id: this.formData.id,
+          siteId: this.formData.siteId,
+          dateTime: this.formData.dateTime,
+          totalChargeData: this.formData.totalChargeData,
+          totalDischargeData: this.formData.totalDischargeData,
+          chargeData: this.formData.chargeData,
+          dischargeData: this.formData.dischargeData,
+          totalRevenue: this.formData.totalRevenue,
+          dayRevenue: this.formData.dayRevenue,
+          remark: this.formData.remark,
+        }
+        request(payload)
+          .then((res) => {
+            if (res?.code === 200) {
+              this.$emit('update')
+              this.closeDialog()
+            }
+          })
+          .finally(() => {
+            this.saving = false
+          })
+      })
+    },
+    closeDialog() {
+      this.dialogVisible = false
+      this.formData = buildEmptyForm()
+      this.$nextTick(() => {
+        this.$refs.formRef && this.$refs.formRef.resetFields()
+      })
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.form-grid {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  column-gap: 16px;
+
+  .full-row {
+    grid-column: 1 / span 2;
+  }
+}
+</style>

src/views/ems/site/dataCorrection/AddDataCorrection.vue

@@ -0,0 +1,218 @@
+<template>
+  <el-dialog
+    :visible.sync="dialogVisible"
+    :close-on-press-escape="false"
+    :close-on-click-modal="false"
+    :show-close="false"
+    destroy-on-close
+    lock-scroll
+    append-to-body
+    width="760px"
+    class="ems-dialog"
+    :title="mode === 'add' ? '新增数据修正' : '编辑数据修正'"
+  >
+    <el-form
+      ref="formRef"
+      v-loading="loading"
+      :model="formData"
+      :rules="rules"
+      label-width="120px"
+      size="medium"
+      class="form-grid"
+    >
+      <el-form-item label="站点" prop="siteId">
+        <el-input v-model="formData.siteId" placeholder="请先在顶部选择站点" disabled />
+      </el-form-item>
+      <el-form-item label="数据日期" prop="dataDate">
+        <el-date-picker
+          v-model="formData.dataDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择数据日期"
+          style="width: 100%"
+        />
+      </el-form-item>
+      <el-form-item label="数据小时" prop="dataHour">
+        <el-input-number
+          v-model="formData.dataHour"
+          :controls="false"
+          :min="0"
+          :max="23"
+          :step="1"
+          :precision="0"
+          placeholder="0-23"
+          style="width: 100%"
+        />
+      </el-form-item>
+
+      <el-form-item label="尖充电差值" prop="peakChargeDiff">
+        <el-input-number v-model="formData.peakChargeDiff" :controls="false" :min="-999999999" :max="999999999" :step="0.001" :precision="3" style="width: 100%" />
+      </el-form-item>
+      <el-form-item label="尖放电差值" prop="peakDischargeDiff">
+        <el-input-number v-model="formData.peakDischargeDiff" :controls="false" :min="-999999999" :max="999999999" :step="0.001" :precision="3" style="width: 100%" />
+      </el-form-item>
+
+      <el-form-item label="峰充电差值" prop="highChargeDiff">
+        <el-input-number v-model="formData.highChargeDiff" :controls="false" :min="-999999999" :max="999999999" :step="0.001" :precision="3" style="width: 100%" />
+      </el-form-item>
+      <el-form-item label="峰放电差值" prop="highDischargeDiff">
+        <el-input-number v-model="formData.highDischargeDiff" :controls="false" :min="-999999999" :max="999999999" :step="0.001" :precision="3" style="width: 100%" />
+      </el-form-item>
+
+      <el-form-item label="平充电差值" prop="flatChargeDiff">
+        <el-input-number v-model="formData.flatChargeDiff" :controls="false" :min="-999999999" :max="999999999" :step="0.001" :precision="3" style="width: 100%" />
+      </el-form-item>
+      <el-form-item label="平放电差值" prop="flatDischargeDiff">
+        <el-input-number v-model="formData.flatDischargeDiff" :controls="false" :min="-999999999" :max="999999999" :step="0.001" :precision="3" style="width: 100%" />
+      </el-form-item>
+
+      <el-form-item label="谷充电差值" prop="valleyChargeDiff">
+        <el-input-number v-model="formData.valleyChargeDiff" :controls="false" :min="-999999999" :max="999999999" :step="0.001" :precision="3" style="width: 100%" />
+      </el-form-item>
+      <el-form-item label="谷放电差值" prop="valleyDischargeDiff">
+        <el-input-number v-model="formData.valleyDischargeDiff" :controls="false" :min="-999999999" :max="999999999" :step="0.001" :precision="3" style="width: 100%" />
+      </el-form-item>
+
+      <el-form-item label="计算时间" prop="calcTime" class="full-row">
+        <el-date-picker
+          v-model="formData.calcTime"
+          type="datetime"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="请选择计算时间"
+          style="width: 100%"
+        />
+      </el-form-item>
+
+      <el-form-item label="备注" prop="remark" class="full-row">
+        <el-input v-model="formData.remark" type="textarea" :rows="3" maxlength="300" show-word-limit />
+      </el-form-item>
+    </el-form>
+
+    <div slot="footer">
+      <el-button @click="closeDialog">取消</el-button>
+      <el-button type="primary" :loading="saving" @click="saveDialog">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import {
+  addDailyEnergyData,
+  getDailyEnergyDataDetail,
+  updateDailyEnergyData,
+} from '@/api/ems/site'
+
+const buildEmptyForm = () => ({
+  id: '',
+  siteId: '',
+  dataDate: '',
+  dataHour: null,
+  peakChargeDiff: null,
+  peakDischargeDiff: null,
+  highChargeDiff: null,
+  highDischargeDiff: null,
+  flatChargeDiff: null,
+  flatDischargeDiff: null,
+  valleyChargeDiff: null,
+  valleyDischargeDiff: null,
+  calcTime: '',
+  remark: '',
+})
+
+export default {
+  name: 'AddDataCorrection',
+  data() {
+    return {
+      dialogVisible: false,
+      mode: 'add',
+      loading: false,
+      saving: false,
+      formData: buildEmptyForm(),
+      rules: {
+        siteId: [{ required: true, message: '请先在顶部选择站点', trigger: 'blur' }],
+        dataDate: [{ required: true, message: '请选择数据日期', trigger: 'change' }],
+        dataHour: [
+          {
+            validator: (rule, value, callback) => {
+              if (value === '' || value === null || value === undefined) {
+                callback()
+                return
+              }
+              if (Number.isInteger(value) && value >= 0 && value <= 23) {
+                callback()
+                return
+              }
+              callback(new Error('数据小时需为 0-23 的整数'))
+            },
+            trigger: 'change',
+          },
+        ],
+      },
+    }
+  },
+  methods: {
+    getRouteSiteId() {
+      const siteId = this.$route?.query?.siteId
+      return siteId === undefined || siteId === null ? '' : String(siteId).trim()
+    },
+    showDialog(id, siteId = '') {
+      this.dialogVisible = true
+      if (id) {
+        this.mode = 'edit'
+        this.formData.id = id
+        this.fetchDetail(id)
+      } else {
+        this.mode = 'add'
+        this.formData = buildEmptyForm()
+        this.formData.siteId = siteId || this.getRouteSiteId()
+      }
+    },
+    fetchDetail(id) {
+      this.loading = true
+      getDailyEnergyDataDetail(id)
+        .then((res) => {
+          this.formData = Object.assign(buildEmptyForm(), res?.data || {})
+        })
+        .finally(() => {
+          this.loading = false
+        })
+    },
+    saveDialog() {
+      this.$refs.formRef.validate((valid) => {
+        if (!valid) return
+        this.saving = true
+        const request = this.mode === 'add' ? addDailyEnergyData : updateDailyEnergyData
+        request(this.formData)
+          .then((res) => {
+            if (res?.code === 200) {
+              this.$emit('update')
+              this.closeDialog()
+            }
+          })
+          .finally(() => {
+            this.saving = false
+          })
+      })
+    },
+    closeDialog() {
+      this.dialogVisible = false
+      this.formData = buildEmptyForm()
+      this.$nextTick(() => {
+        this.$refs.formRef && this.$refs.formRef.resetFields()
+      })
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.form-grid {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  column-gap: 16px;
+
+  .full-row {
+    grid-column: 1 / span 2;
+  }
+}
+</style>

src/views/ems/site/dataCorrection/DailyChargeDataTab.vue

@@ -0,0 +1,187 @@
+<template>
+  <div style="background-color: #ffffff" v-loading="loading">
+    <el-form :inline="true" class="select-container" @submit.native.prevent>
+      <el-form-item label="数据日期">
+        <el-date-picker
+          v-model="form.dateTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          clearable
+          placeholder="请选择日期"
+          style="width: 180px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button native-type="button" type="primary" @click="onSearch">搜索</el-button>
+        <el-button native-type="button" @click="onReset">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-button type="primary" @click="openDialog('')">新增</el-button>
+
+    <el-table
+      :data="tableData"
+      class="common-table"
+      max-height="620px"
+      stripe
+      style="width: 100%; margin-top: 20px"
+    >
+      <el-table-column label="站点" prop="siteId" min-width="120" />
+      <el-table-column label="数据日期" prop="dateTime" width="120" />
+      <el-table-column label="总充电量" prop="totalChargeData" min-width="110" />
+      <el-table-column label="总放电量" prop="totalDischargeData" min-width="110" />
+      <el-table-column label="当日充电量" prop="chargeData" min-width="110" />
+      <el-table-column label="当日放电量" prop="dischargeData" min-width="110" />
+      <el-table-column label="累计收益" prop="totalRevenue" min-width="110" />
+      <el-table-column label="当日收益" prop="dayRevenue" min-width="110" />
+      <el-table-column label="备注" prop="remark" min-width="180" show-overflow-tooltip />
+      <el-table-column fixed="right" label="操作" width="150">
+        <template slot-scope="scope">
+          <el-button size="mini" type="warning" @click="openDialog(scope.row.id)">编辑</el-button>
+          <el-button size="mini" type="danger" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-pagination
+      v-show="tableData.length > 0"
+      background
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="pageNum"
+      :page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40]"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="totalSize"
+      style="margin-top: 15px; text-align: center"
+    />
+
+    <add-charge-data-correction ref="addChargeDataCorrection" @update="getData" />
+  </div>
+</template>
+
+<script>
+import {
+  deleteDailyChargeData,
+  getDailyChargeDataList,
+} from '@/api/ems/site'
+import AddChargeDataCorrection from './AddChargeDataCorrection.vue'
+
+export default {
+  name: 'DailyChargeDataTab',
+  components: { AddChargeDataCorrection },
+  data() {
+    return {
+      loading: false,
+      form: {
+        siteId: '',
+        dateTime: '',
+      },
+      tableData: [],
+      pageSize: 10,
+      pageNum: 1,
+      totalSize: 0,
+    }
+  },
+  watch: {
+    '$route.query.siteId'(newSiteId) {
+      const normalizedSiteId = this.normalizeSiteId(newSiteId)
+      if (normalizedSiteId === this.form.siteId) {
+        return
+      }
+      this.form.siteId = normalizedSiteId
+      this.onSearch()
+    },
+  },
+  mounted() {
+    this.form.siteId = this.normalizeSiteId(this.$route.query.siteId)
+    this.getData()
+  },
+  methods: {
+    normalizeSiteId(siteId) {
+      return siteId === undefined || siteId === null ? '' : String(siteId).trim()
+    },
+    handleSizeChange(val) {
+      this.pageSize = val
+      this.pageNum = 1
+      this.getData()
+    },
+    handleCurrentChange(val) {
+      this.pageNum = val
+      this.getData()
+    },
+    onSearch() {
+      this.pageNum = 1
+      this.getData()
+    },
+    onReset() {
+      this.form = {
+        siteId: this.form.siteId,
+        dateTime: '',
+      }
+      this.pageNum = 1
+      this.getData()
+    },
+    getData() {
+      if (!this.form.siteId) {
+        this.tableData = []
+        this.totalSize = 0
+        return
+      }
+      this.loading = true
+      const params = {
+        pageNum: this.pageNum,
+        pageSize: this.pageSize,
+        siteId: this.form.siteId,
+      }
+      if (this.form.dateTime) {
+        params.dateTime = this.form.dateTime
+      }
+      getDailyChargeDataList(params)
+        .then((res) => {
+          this.tableData = res?.rows || []
+          this.totalSize = res?.total || 0
+        })
+        .finally(() => {
+          this.loading = false
+        })
+    },
+    openDialog(id) {
+      this.$refs.addChargeDataCorrection.showDialog(id, this.form.siteId)
+    },
+    handleDelete(row) {
+      this.$confirm('确认要删除该条数据吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        showClose: false,
+        closeOnClickModal: false,
+        type: 'warning',
+        beforeClose: (action, instance, done) => {
+          if (action === 'confirm') {
+            instance.confirmButtonLoading = true
+            deleteDailyChargeData(row.id)
+              .then((res) => {
+                if (res?.code === 200) {
+                  done()
+                }
+              })
+              .finally(() => {
+                instance.confirmButtonLoading = false
+              })
+          } else {
+            done()
+          }
+        },
+      })
+        .then(() => {
+          this.$message.success('删除成功!')
+          this.getData()
+        })
+        .catch(() => {})
+    },
+  },
+}
+</script>
+
+<style scoped>
+</style>

src/views/ems/site/dataCorrection/DailyEnergyDataTab.vue

@@ -0,0 +1,191 @@
+<template>
+  <div style="background-color: #ffffff" v-loading="loading">
+    <el-form :inline="true" class="select-container" @submit.native.prevent>
+      <el-form-item label="数据日期">
+        <el-date-picker
+          v-model="form.dataDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          clearable
+          placeholder="请选择日期"
+          style="width: 180px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button native-type="button" type="primary" @click="onSearch">搜索</el-button>
+        <el-button native-type="button" @click="onReset">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-button type="primary" @click="openDialog('')">新增</el-button>
+
+    <el-table
+      :data="tableData"
+      class="common-table"
+      max-height="620px"
+      stripe
+      style="width: 100%; margin-top: 20px"
+    >
+      <el-table-column label="站点" prop="siteId" width="130" />
+      <el-table-column label="数据日期" prop="dataDate" width="120" />
+      <el-table-column label="data_hour" prop="dataHour" width="100" />
+      <el-table-column label="尖充" prop="peakChargeDiff" min-width="90" />
+      <el-table-column label="尖放" prop="peakDischargeDiff" min-width="90" />
+      <el-table-column label="峰充" prop="highChargeDiff" min-width="90" />
+      <el-table-column label="峰放" prop="highDischargeDiff" min-width="90" />
+      <el-table-column label="平充" prop="flatChargeDiff" min-width="90" />
+      <el-table-column label="平放" prop="flatDischargeDiff" min-width="90" />
+      <el-table-column label="谷充" prop="valleyChargeDiff" min-width="90" />
+      <el-table-column label="谷放" prop="valleyDischargeDiff" min-width="90" />
+      <el-table-column label="计算时间" prop="calcTime" min-width="170" />
+      <el-table-column label="备注" prop="remark" min-width="180" show-overflow-tooltip />
+      <el-table-column fixed="right" label="操作" width="150">
+        <template slot-scope="scope">
+          <el-button size="mini" type="warning" @click="openDialog(scope.row.id)">编辑</el-button>
+          <el-button size="mini" type="danger" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-pagination
+      v-show="tableData.length > 0"
+      background
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="pageNum"
+      :page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40]"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="totalSize"
+      style="margin-top: 15px; text-align: center"
+    />
+
+    <add-data-correction ref="addDataCorrection" @update="getData" />
+  </div>
+</template>
+
+<script>
+import {
+  deleteDailyEnergyData,
+  getDailyEnergyDataList,
+} from '@/api/ems/site'
+import AddDataCorrection from './AddDataCorrection.vue'
+
+export default {
+  name: 'DailyEnergyDataTab',
+  components: { AddDataCorrection },
+  data() {
+    return {
+      loading: false,
+      form: {
+        siteId: '',
+        dataDate: '',
+      },
+      tableData: [],
+      pageSize: 10,
+      pageNum: 1,
+      totalSize: 0,
+    }
+  },
+  watch: {
+    '$route.query.siteId'(newSiteId) {
+      const normalizedSiteId = this.normalizeSiteId(newSiteId)
+      if (normalizedSiteId === this.form.siteId) {
+        return
+      }
+      this.form.siteId = normalizedSiteId
+      this.onSearch()
+    },
+  },
+  mounted() {
+    this.form.siteId = this.normalizeSiteId(this.$route.query.siteId)
+    this.getData()
+  },
+  methods: {
+    normalizeSiteId(siteId) {
+      return siteId === undefined || siteId === null ? '' : String(siteId).trim()
+    },
+    handleSizeChange(val) {
+      this.pageSize = val
+      this.pageNum = 1
+      this.getData()
+    },
+    handleCurrentChange(val) {
+      this.pageNum = val
+      this.getData()
+    },
+    onSearch() {
+      this.pageNum = 1
+      this.getData()
+    },
+    onReset() {
+      this.form = {
+        siteId: this.form.siteId,
+        dataDate: '',
+      }
+      this.pageNum = 1
+      this.getData()
+    },
+    getData() {
+      if (!this.form.siteId) {
+        this.tableData = []
+        this.totalSize = 0
+        return
+      }
+      this.loading = true
+      const params = {
+        pageNum: this.pageNum,
+        pageSize: this.pageSize,
+        siteId: this.form.siteId,
+      }
+      if (this.form.dataDate) {
+        params.dataDate = this.form.dataDate
+      }
+      getDailyEnergyDataList(params)
+        .then((res) => {
+          this.tableData = res?.rows || []
+          this.totalSize = res?.total || 0
+        })
+        .finally(() => {
+          this.loading = false
+        })
+    },
+    openDialog(id) {
+      this.$refs.addDataCorrection.showDialog(id, this.form.siteId)
+    },
+    handleDelete(row) {
+      this.$confirm('确认要删除该条数据吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        showClose: false,
+        closeOnClickModal: false,
+        type: 'warning',
+        beforeClose: (action, instance, done) => {
+          if (action === 'confirm') {
+            instance.confirmButtonLoading = true
+            deleteDailyEnergyData(row.id)
+              .then((res) => {
+                if (res?.code === 200) {
+                  done()
+                }
+              })
+              .finally(() => {
+                instance.confirmButtonLoading = false
+              })
+          } else {
+            done()
+          }
+        },
+      })
+        .then(() => {
+          this.$message.success('删除成功!')
+          this.getData()
+        })
+        .catch(() => {})
+    },
+  },
+}
+</script>
+
+<style scoped>
+</style>

src/views/ems/site/dataCorrection/index.vue

@@ -0,0 +1,30 @@
+<template>
+  <div class="ems-dashboard-editor-container" style="background-color: #ffffff">
+    <el-tabs v-model="activeTab">
+      <el-tab-pane label="充放电量修正" name="energy" lazy>
+        <daily-energy-data-tab />
+      </el-tab-pane>
+      <el-tab-pane label="充放电收益修正" name="charge" lazy>
+        <daily-charge-data-tab />
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import DailyChargeDataTab from './DailyChargeDataTab.vue'
+import DailyEnergyDataTab from './DailyEnergyDataTab.vue'
+
+export default {
+  name: 'DataCorrection',
+  components: { DailyEnergyDataTab, DailyChargeDataTab },
+  data() {
+    return {
+      activeTab: 'energy',
+    }
+  },
+}
+</script>
+
+<style scoped>
+</style>

src/views/ems/site/mqtt/AddMqtt.vue

@@ -2,9 +2,7 @@
   <el-dialog :visible.sync="dialogTableVisible" :close-on-press-escape="false" :close-on-click-modal="false" :show-close="false" destroy-on-close lock-scroll append-to-body width="400px"  class="ems-dialog" :title="mode === 'add'?'新增配置':`编辑配置` " >
     <el-form v-loading="loading>0" ref="addTempForm" :model="formData" :rules="rules" size="medium" label-width="140px">
       <el-form-item label="站点" prop="siteId">
-        <el-select v-model="formData.siteId" :disabled="mode === 'edit'" placeholder="请选择站点" :loading="searchLoading" loading-text="正在加载数据">
+        <el-input v-model="formData.siteId" placeholder="请先在顶部选择站点" disabled />
-            <el-option v-for="(item,index) in siteList" :key="index+'zdxeSelect'" :label="item.siteName" :value="item.siteId" ></el-option>
-          </el-select>
       </el-form-item>
       <el-form-item label="消息等级" prop="qos">
         <el-select v-model="formData.qos" placeholder="请选择消息等级">
@@ -30,13 +28,10 @@
 </template>
 <script>
 import {editMqtt,addMqtt,getMqttDetail} from "@/api/ems/site";
-import {getAllSites} from '@/api/ems/zddt'
 export default {
   data() {
     return {
       loading:0,
-      siteList:[],
-      searchLoading:false,
       dialogTableVisible:false,
       mode:'',
       formData: {
@@ -48,7 +43,7 @@ export default {
       },
       rules: {
         siteId:[
-          { required: true, message: '请选择站点', trigger: 'blur'},
+          { required: true, message: '请先在顶部选择站点', trigger: 'blur'},
         ],
         qos:[
           { required: true, message: '请选择消息等级', trigger: 'blur'},
@@ -63,23 +58,20 @@ export default {
     }
   },
   methods: {
-    showDialog(id){
+    getRouteSiteId() {
+      const siteId = this.$route?.query?.siteId
+      return siteId === undefined || siteId === null ? '' : String(siteId).trim()
+    },
+    showDialog(id, siteId = ''){
       this.dialogTableVisible = true
-      this.getZdList()
       if(id){
         this.mode = 'edit'
         this.formData.id = id
         this.getDetail(id)
       }else{
         this.mode = 'add'
+        this.formData.siteId = siteId || this.getRouteSiteId()
       }
-    },
-     //获取站点列表
-    getZdList(){
-      this.searchLoading=true
-      getAllSites().then(response => {
-        this.siteList = response?.data || []
-      }).finally(() => {this.searchLoading=false})
     },
     getDetail(id){
       getMqttDetail(id).then(response => {
@@ -132,6 +124,8 @@ export default {
       // 清空所有数据
       this.formData= {
         id:'',//设备唯一标识
+        siteId:'',
+        qos:'',
         mqttTopic:'',
         topicName:''
       }

src/views/ems/site/mqtt/index.vue

@@ -1,11 +1,6 @@
 <template>
   <div class="ems-dashboard-editor-container" style="background-color: #ffffff" v-loading="loading">
     <el-form :inline="true" class="select-container">
-      <el-form-item label="站点选择">
-        <el-select v-model="form.siteId" placeholder="请选择换电站名称" :loading="searchLoading" loading-text="正在加载数据" clearable>
-          <el-option :label="item.siteName" :value="item.siteId" v-for="(item,index) in siteList" :key="index+'zdxeSelect'"></el-option>
-        </el-select>
-      </el-form-item>
       <el-form-item label="订阅topic">
         <el-input
             v-model="form.mqttTopic"
@@ -90,12 +85,21 @@
 
 <script>
 import {deleteMqtt,getMqttList} from '@/api/ems/site'
-import {getAllSites} from '@/api/ems/zddt'
 import AddMqtt from './AddMqtt.vue'
 export default {
   name: "Mqtt",
   components: {AddMqtt},
   computed: { },
+  watch: {
+    '$route.query.siteId'(newSiteId) {
+      const normalizedSiteId = this.hasValidSiteId(newSiteId) ? String(newSiteId).trim() : ''
+      if (normalizedSiteId === this.form.siteId) {
+        return
+      }
+      this.form.siteId = normalizedSiteId
+      this.onSearch()
+    }
+  },
   data() {
     return {
       form:{
@@ -103,8 +107,6 @@ export default {
         topicName:'',
         mqttTopic:''
       },
-      siteList:[],
-      searchLoading:false,
       loading:false,
       tableData:[],
       pageSize:10,//分页栏当前每个数据总数
@@ -113,6 +115,9 @@ export default {
     }
   },
   methods:{
+    hasValidSiteId(siteId) {
+      return !!(siteId !== undefined && siteId !== null && String(siteId).trim())
+    },
     // 分页
     handleSizeChange(val) {
       this.pageSize = val;
@@ -133,22 +138,19 @@ export default {
     },
     onReset(){
       this.form={
-        siteId:'',
+        siteId:this.form.siteId,
         topicName:'',
         mqttTopic:''
       }
       this.pageNum =1//每次搜索从1开始搜索
       this.getData()
     },
-    //获取站点列表
-    getZdList(){
-      this.searchLoading=true
-      return getAllSites().then(response => {
-        this.siteList = response?.data || []
-      //  if( this.siteList.length>0 ) this.siteId = this.siteList[0].siteId
-      }).finally(() => {this.searchLoading=false})
-    },
     getData(){
+      if (!this.form.siteId) {
+        this.tableData = []
+        this.totalSize = 0
+        return
+      }
       this.loading=true;
       const {mqttTopic,topicName,siteId} = this.form;
       const {pageNum,pageSize} = this;
@@ -158,7 +160,7 @@ export default {
       }).finally(() => {this.loading=false})
     },
     addPowerConfig(id=''){
-      this.$refs.addMqtt.showDialog(id);
+      this.$refs.addMqtt.showDialog(id, this.form.siteId);
     },
     deleteMqtt(row){
       this.$confirm(`确认要删除该配置吗?`, {
@@ -193,8 +195,7 @@ export default {
     },
   },
   mounted() {
-    this.loading=true
+    this.form.siteId = this.hasValidSiteId(this.$route.query.siteId) ? String(this.$route.query.siteId).trim() : ''
-    this.getZdList()
     this.getData()
   }
 }

src/views/ems/site/powerTariff/AddPowerTariff.vue

@@ -5,9 +5,7 @@
       <div class="items-container">
         <div class="item-title">站点:</div>
         <div class="item-content">
-          <el-select v-model="siteId" :disabled="mode === 'edit'" placeholder="请选择站点" :loading="searchLoading" loading-text="正在加载数据">
+          <el-input v-model="siteId" placeholder="请先在顶部选择站点" disabled />
-            <el-option :label="item.siteName" :value="item.siteId" v-for="(item,index) in siteList" :key="index+'zdxeSelect'"></el-option>
-          </el-select>
         </div>
       </div>
       <div class="items-container">
@@ -103,15 +101,12 @@
 </template>
 <script>
 import {addPriceConfig,editPriceConfig,detailPriceConfig} from '@/api/ems/powerTariff'
-import {getAllSites} from '@/api/ems/zddt'
 export default {
   data() {
     return {
       mode:'',
       id:'',
-      searchLoading:false,
       siteId:'',
-      siteList:[],
       powerDate:'',//时间
       //尖-peak,峰-high,平-flat,谷=valley
       priceTypeOptions:[{
@@ -137,6 +132,10 @@ export default {
     }
   },
   methods: {
+    getRouteSiteId() {
+      const siteId = this.$route?.query?.siteId
+      return siteId === undefined || siteId === null ? '' : String(siteId).trim()
+    },
     addRow(){
       this.hoursOptions.push({
         startTime:'',
@@ -147,15 +146,7 @@ export default {
     deleteRow(index){
       this.hoursOptions.splice(index,1)
     },
-    //获取站点列表
+    showDialog(id, siteId = ''){
-    getZdList(){
-      this.searchLoading=true
-      getAllSites().then(response => {
-        this.siteList = response?.data || []
-      }).finally(() => {this.searchLoading=false})
-    },
-    showDialog(id){
-      this.getZdList()
       this.id = id
       if(id) {
         this.mode='edit'
@@ -172,11 +163,12 @@ export default {
         }).finally(()=>this.loading = false)
       }else {
         this.mode='add'
+        this.siteId = siteId || this.getRouteSiteId()
       }
       this.dialogTableVisible=true
     },
     saveDialog() {
-      if(this.siteId === '') return this.$message.error('请选择站点')
+      if(this.siteId === '') return this.$message.error('请先在顶部选择站点')
       if(this.powerDate === '') return this.$message.error('请选择时间')
       let priceArr=[]
       this.priceTypeOptions.forEach(item=>{
@@ -244,8 +236,6 @@ export default {
       this.mode=''
       this.id=''
       this.siteId=''
-      this.siteList=[]
-      this.searchLoading=false
       this.powerDate=''
       this.hoursOptions=[]
       this.priceTypeOptions.forEach(item=>{
@@ -303,4 +293,4 @@ export default {
   }
 }
 
-</style>
+</style>

src/views/ems/site/powerTariff/index.vue

@@ -1,11 +1,6 @@
 <template>
   <div class="ems-dashboard-editor-container" style="background-color: #ffffff" v-loading="loading">
     <el-form :inline="true" class="select-container">
-      <el-form-item label="站点选择">
-        <el-select v-model="siteId" placeholder="请选择换电站名称" :loading="searchLoading" loading-text="正在加载数据" @change="onSearch" clearable>
-          <el-option :label="item.siteName" :value="item.siteId" v-for="(item,index) in siteList" :key="index+'zdxeSelect'"></el-option>
-        </el-select>
-      </el-form-item>
       <el-form-item label="年份选择">
         <el-date-picker
             v-model="defaultYear"
@@ -33,7 +28,7 @@
           :key="item.id"
       >
         <div slot="header" class="time-range-header">
-          <span class="card-title">{{siteList.find(i=>i.siteId===item.siteId).siteName || item.siteId || ''}}-{{item.month}}月电价时段划分</span>
+          <span class="card-title">{{item.siteId || ''}}-{{item.month}}月电价时段划分</span>
           <div>
             <el-button type="primary" size="mini" @click="addPowerConfig(item.id)">编辑</el-button>
             <el-button type="warning" size="mini" @click="deletePowerConfig(item)">删除</el-button>
@@ -61,21 +56,28 @@
 
 <script>
 import {energyPriceConfig,listPriceConfig} from '@/api/ems/powerTariff'
-import {getAllSites} from '@/api/ems/zddt'
 import AddPowerTariff from './AddPowerTariff.vue'
 import DateTimeSelect from "@/views/ems/search/DateTimeSelect.vue";
 export default {
   name: "PowerTariff",
   components: {DateTimeSelect, AddPowerTariff},
   computed: { },
+  watch: {
+    '$route.query.siteId'(newSiteId) {
+      const normalizedSiteId = this.hasValidSiteId(newSiteId) ? String(newSiteId).trim() : ''
+      if (normalizedSiteId === this.siteId) {
+        return
+      }
+      this.siteId = normalizedSiteId
+      this.onSearch()
+    }
+  },
   data() {
     return {
       loading:false,
       pageNum:1,
       pageSize:40,
-      searchLoading:false,
       siteId:'',
-      siteList:[],
       tableData:[],
       tableTotal:0,
       defaultYear:'',
@@ -93,6 +95,9 @@ export default {
     }
   },
   methods:{
+    hasValidSiteId(siteId) {
+      return !!(siteId !== undefined && siteId !== null && String(siteId).trim())
+    },
     resetTableData(){
       this.tableData=[]
       this.tableTotal=0
@@ -102,19 +107,16 @@ export default {
     onSearch(){
       this.getData(true)
     },
-    //获取站点列表
-    getZdList(){
-      this.searchLoading=true
-      return getAllSites().then(response => {
-        this.siteList = response?.data || []
-       if( this.siteList.length>0 ) this.siteId = this.siteList[0].siteId
-      }).finally(() => {this.searchLoading=false})
-    },
     changeDefaultYear(){
       this.getData(true)
     },
     getData(reset=false){
       reset && this.resetTableData()
+      if (!this.siteId) {
+        this.tableData = []
+        this.tableTotal = 0
+        return
+      }
       if(!reset && this.tableData.length>=this.tableTotal) return
       this.loading=true;
       const date = new Date(this.defaultYear).getFullYear()
@@ -127,7 +129,7 @@ export default {
       }).finally(() => {this.loading=false})
     },
     addPowerConfig(id=''){
-      this.$refs.addPowerTariff.showDialog(id);
+      this.$refs.addPowerTariff.showDialog(id, this.siteId);
     },
     deletePowerConfig(row){
       this.$confirm(`确认要删除${row.month}月的电价配置吗?`, {
@@ -163,10 +165,8 @@ export default {
   },
   mounted() {
     this.defaultYear = new Date()
-    this.loading=true
+    this.siteId = this.hasValidSiteId(this.$route.query.siteId) ? String(this.$route.query.siteId).trim() : ''
-    this.getZdList().then(()=>{
+    this.getData(true)
-      this.getData(true)
-    })
   }
 }
 </script>

src/views/ems/site/sbbh/AddDevice.vue

@@ -1,766 +0,0 @@
-<template>
-  <el-dialog
-    v-loading="loading"
-    width="90%"
-    :visible.sync="dialogTableVisible"
-    class="ems-dialog"
-    title="保护方案"
-    :close-on-click-modal="false"
-    :show-close="false"
-  >
-    <el-form
-      v-loading="loading > 0"
-      ref="addTempForm"
-      :model="formData"
-      :rules="rules"
-      size="medium"
-      label-width="140px"
-    >
-      <el-form-item label="站点" prop="siteId">
-        <el-select
-          v-model="formData.siteId"
-          placeholder="请选择"
-          :style="{ width: '50%' }"
-          @change="changeType"
-        >
-          <el-option
-            :label="item.siteName"
-            :value="item.siteId"
-            v-for="(item, index) in siteList"
-            :key="index + 'siteOptions'"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="设备保护名称" prop="faultName">
-        <el-input
-          v-model="formData.faultName"
-          placeholder="请输入"
-          clearable
-          :style="{ width: '50%' }"
-        >
-        </el-input>
-      </el-form-item>
-      <el-form-item label="处理方案描述" prop="description">
-        <el-input
-            v-model="formData.description"
-            type="textarea"
-            :rows="2"
-            placeholder="请输入"
-            clearable
-            :style="{ width: '50%' }"
-        >
-        </el-input>
-      </el-form-item>
-      <el-form-item label="是否告警" prop="isAlert">
-        <el-checkbox
-          v-model="formData.isAlert"
-          :true-label="1"
-          :false-label="0"
-        ></el-checkbox>
-      </el-form-item>
-      <el-form-item label="告警等级" prop="faultLevel">
-        <el-radio-group v-model="formData.faultLevel" :style="{ width: '50%' }" :disabled="mode === 'edit'">
-          <el-radio :label="1">等级1</el-radio>
-          <el-radio :label="2">等级2</el-radio>
-          <el-radio :label="3">等级3</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <div class="items-container">
-        <div class="item-title">
-          保护前提:
-          <div style="display: inline-block; margin-left: 20px">
-            <el-form-item label="延时" prop="faultDelaySeconds">
-              <el-input
-                  v-model="formData.faultDelaySeconds"
-                  placeholder="请输入"
-                  clearable
-                  :style="{ width: '200px', display: 'inline-block' }"
-              ></el-input>
-            </el-form-item>
-          </div>
-        </div>
-        <div>
-          <el-button
-            @click.native.prevent="addRow('protectionSettings')"
-            block
-            type="primary"
-            size="mini"
-            style="margin-bottom: 20px"
-          >
-            新增保护前提
-          </el-button>
-        </div>
-        <div class="item-content">
-          <div class="time-lists-container">
-            <div class="time-lists time-lists-title">
-              <div>设备类型</div>
-              <div>点位</div>
-              <div>故障值比较符号</div>
-              <div>故障值</div>
-              <div>释放值比较符号</div>
-              <div>释放值</div>
-              <div>关系</div>
-              <div>操作</div>
-            </div>
-            <div
-              class="time-lists"
-              v-for="(item, index) in protectionSettings"
-              :key="'protectionSettings' + index"
-            >
-              <div>
-                <el-cascader
-                    v-model="item.deviceId"
-                    :options="childOptions"
-                    :show-all-levels="false"
-                    @change="(v)=>handleChange(v,'protectionSettings',index)"
-                ></el-cascader>
-              </div>
-              <div>
-                <el-autocomplete
-                  v-model="item.point"
-                  placeholder="请输入点位"
-                  clearable
-                  :fetch-suggestions="
-                    (q, c) =>
-                      querySearchAsync(q, c, index, 'protectionSettings')
-                  "
-                  @select="(v) => handleSelect(v, index, 'protectionSettings')"
-                ></el-autocomplete>
-              </div>
-
-              <div>
-                <el-select v-model="item.faultOperator" placeholder="请选择">
-                  <el-option
-                    v-for="(value, key) in comparisonOperatorOptions"
-                    :key="key + 'faultOperator'"
-                    :label="key"
-                    :value="value"
-                  ></el-option>
-                </el-select>
-              </div>
-              <div>
-                <el-input placeholder="请输入故障值" v-model="item.faultValue">
-                </el-input>
-              </div>
-              <div>
-                <el-select v-model="item.releaseOperator" placeholder="请选择">
-                  <el-option
-                    v-for="(value, key) in comparisonOperatorOptions"
-                    :key="key + 'releaseOperator'"
-                    :label="key"
-                    :value="value"
-                  ></el-option>
-                </el-select>
-              </div>
-              <div>
-                <el-input
-                  placeholder="请输入释放值"
-                  v-model="item.releaseValue"
-                >
-                </el-input>
-              </div>
-              <div>
-                <el-select v-model="item.relationNext" placeholder="请选择">
-                  <el-option
-                    v-for="(value, key) in relationWithPoint"
-                    :key="key + 'relation'"
-                    :label="key"
-                    :value="value"
-                  ></el-option>
-                </el-select>
-              </div>
-              <div>
-                <el-button
-                  @click.native.prevent="deleteRow(index,'protectionSettings')"
-                  type="warning"
-                  size="mini"
-                >
-                  删除
-                </el-button>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="items-container">
-        <div class="item-title">
-          保护方案:
-          <div style="display: inline-block; margin-left: 20px">
-            <el-form-item label="延时" prop="releaseDelaySeconds">
-              <el-input
-                  v-model="formData.releaseDelaySeconds"
-                  placeholder="请输入"
-                  clearable
-                  :style="{ width: '200px', display: 'inline-block' }"
-              ></el-input>
-            </el-form-item>
-          </div>
-        </div>
-        <div>
-          <el-button
-            @click.native.prevent="addRow('protectionPlan')"
-            block
-            type="primary"
-            size="mini"
-            style="margin-bottom: 20px"
-          >
-            新增保护方案
-          </el-button>
-        </div>
-        <div class="item-content">
-          <div class="time-lists-container">
-            <div class="time-lists time-lists-title">
-              <div>设备类型</div>
-              <div>点位</div>
-              <div>故障值比较符号</div>
-              <div>故障值</div>
-              <div>操作</div>
-            </div>
-            <div
-              class="time-lists"
-              v-for="(item, index) in protectionPlan"
-              :key="'protectionPlan' + index"
-            >
-              <div>
-                <el-cascader
-                    v-model="item.deviceId"
-                    :show-all-levels="false"
-                    :options="childOptions"
-                    @change="(v)=>handleChange(v,'protectionPlan',index)"
-                ></el-cascader>
-              </div>
-              <div>
-                <el-autocomplete
-                  v-model="item.point"
-                  placeholder="请输入点位"
-                  clearable
-                  :fetch-suggestions="
-                    (q, c) => querySearchAsync(q, c, index, 'protectionPlan')
-                  "
-                  @select="(v) => handleSelect(v, index, 'protectionPlan')"
-                ></el-autocomplete>
-              </div>
-
-              <div>=</div>
-              <div>
-                <el-input placeholder="请输入故障值" v-model="item.value">
-                </el-input>
-              </div>
-              <div>
-                <el-button
-                  @click.native.prevent="deleteRow(index,'protectionPlan')"
-                  type="warning"
-                  size="mini"
-                >
-                  删除
-                </el-button>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </el-form>
-    <div slot="footer">
-      <el-button @click="closeDialog">取消</el-button>
-      <el-button type="primary" @click="saveDialog">确定</el-button>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import { mapState } from "vuex";
-import { getAllSites } from "@/api/ems/zddt";
-import { validText } from "@/utils/validate";
-import {
-  updateProtectPlan,
-  addProtectPlan,
-  getProtectPlan,
-  getDeviceListBySiteAndCategory
-} from "@/api/ems/site";
-import { getAllDeviceCategory, pointFuzzyQuery } from "@/api/ems/search";
-export default {
-  data() {
-    const validateText = (rule, value, callback) => {
-      if (value !== "" && !validText(value)) {
-        callback(new Error("只能输入中文、英文、数字和特殊字符!"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      mode:'',
-      loading: 0,
-      childOptions:[],
-      protectionSettings: [],
-      protectionPlan: [],
-      dialogTableVisible: false,
-      siteList: [], //站点列表  从接口获取数据
-      formData: {
-        id: "", //设备唯一标识
-        siteId: "", //站点ID
-        faultName: "", //设备保护名称
-        isAlert: 0, //是否告警
-        faultLevel: 1, //告警等级
-        faultDelaySeconds: "", //故障延时
-        releaseDelaySeconds: "", //释放延时
-        description:'',//方案描述
-      },
-      rules: {
-        siteId: [
-          {
-            required: true,
-            message: "请选择站点",
-            trigger: ["blur", "change"],
-          },
-        ],
-        faultName: [
-          { required: true, message: "请输入设备保护名称", trigger: "blur" },
-        ],
-        isAlert: [
-          { required: true, message: "请选择是否告警", trigger: "blur" },
-        ],
-        description: [
-          { required: true, message: "请输入设备描述", trigger: "blur" },
-          { validator: validateText, trigger: "blur" },
-        ],
-        faultDelaySeconds: [
-          { required: true, message: "请输入保护前提延时", trigger: "blur" },
-          { validator: validateText, trigger: "blur" },
-        ],
-        releaseDelaySeconds: [
-          { required: true, message: "请输入保护方案延时", trigger: "blur" },
-          { validator: validateText, trigger: "blur" },
-        ],
-      },
-    };
-  },
-  computed: {
-    ...mapState({
-      communicationStatusOptions: (state) =>
-        state?.ems?.communicationStatusOptions || {},
-      deviceTypeOptions: (state) => state?.ems?.deviceTypeOptions || {},
-      comparisonOperatorOptions: (state) =>
-        state?.ems?.comparisonOperatorOptions || {},
-      relationWithPoint: (state) => state?.ems?.relationWithPoint || {},
-    }),
-  },
-  methods: {
-    open(id,siteId){
-      this.dialogTableVisible=true
-      this.getZdList();
-      this.getDeviceCategoryList().then(()=>{
-        if(id && siteId) {
-          this.getDeviceList('PCS',siteId)
-          this.getDeviceList('STACK',siteId)
-        }
-      });
-      if(id){
-        this.formData.id = id
-        this.mode = 'edit'
-        getProtectPlan(id).then(response => {
-          const data = response?.data || {}
-          this.formData = {
-            id,
-            siteId: data?.siteId || '', //站点ID
-            faultName: data?.faultName || '', //设备保护名称
-            isAlert: data?.isAlert || 0, //是否告警
-            faultLevel: data?.faultLevel || 1, //告警等级
-            faultDelaySeconds: data?.faultDelaySeconds || "", //故障延时
-            releaseDelaySeconds: data?.releaseDelaySeconds ||"", //释放延时
-            description: data?.description ||'',//方案描述
-          }
-          const plan =(JSON.parse(data?.protectionPlan || [])).map(item=>{
-            return Object.assign({},item,{
-              deviceId:[item.deviceCategory || '',item.deviceId || ''],
-            })
-          })
-          const settings =(JSON.parse(data?.protectionSettings || [])).map(item=>{
-            return Object.assign({},item,{
-              deviceId:[item.deviceCategory || '',item.deviceId || ''],
-            })
-          })
-          this.$nextTick(()=>{
-            this.protectionPlan.splice(0,0,...plan)
-            this.protectionSettings.splice(0,0,...settings)
-          })
-          console.log('获取设备保护详情并初始化',this.formData,this.protectionPlan,this.protectionSettings)
-        })
-      }else{
-        this.mode = 'add'
-      }
-    },
-    // 新增设备保护前提、设备保护方案
-    addRow(type) {
-      const item = type === 'protectionSettings' ? {
-        deviceId:[],//设备ID
-        deviceCategory: "",//设备类型 英文
-        categoryName:'',//设备类型名称 中文
-        point: "",//点位 英文
-        pointName:"",//点位 中文
-        faultValue: "",//故障值
-        releaseValue: "",//释放值
-        faultOperator: "",//故障值比较关系
-        releaseOperator: "",//释放值比较关系
-        relationNext: "",//与下一个点位的关系
-      } : {
-        deviceId:[],
-        deviceCategory: "",//设备类型 英文
-        categoryName:'',//设备类型名称 中文
-        point: "",
-        pointName:"",
-        value: "",//设置值
-      }
-      // this.$set(this[type], this[type].length, item);
-      this[type].splice(this[type].length,0,item)
-      console.log('新增设备保护前提、方案',type,this[type])
-    },
-    // 删除设备保护前提、设备保护方案
-    deleteRow(index, type) {
-      this[type].splice(index, 1);
-    },
-
-    // 设备保护前提、设备保护方案点位选择
-    querySearchAsync(query, cb, index, type) {
-      console.log("查询数据", query, index);
-      if (!this.formData.siteId || !this[type][index].deviceCategory) {
-        this.$message({
-          type: "warning",
-          message: "请先选择站点和设备",
-        });
-        return cb([]);
-      }
-      pointFuzzyQuery({
-        siteIds: [this.formData.siteId],
-        deviceCategory: this[type][index].deviceCategory,
-        pointName: query,
-      }).then((response) => {
-        const data = response?.data || [];
-        cb(
-          data.map((item) => {
-            return { name: item, value: item };
-          })
-        );
-      });
-    },
-    // 点位选择
-    handleSelect(data, index, type) {
-      console.log('选择点位',data,index,type)
-      // this.$set(this[type], index, Object.assign({},this[type][index],{
-      //   point:data.value,
-      //   pointName:data.value,
-      // }));
-      let line = Object.assign({},this[type][index],{
-        point:data.value,
-        pointName:data.value,
-      })
-      this[type].splice(index,1,line);
-      console.log('选择点位配置完成',this[type][index])
-    },
-
-    // 获取设备类别-不区分站点
-    getDeviceCategoryList() {
-      this.loading += 1;
-      return getAllDeviceCategory()
-          .then((response) => {
-            const data = (response?.data || []).filter(item => ['PCS','STACK'].includes(item.code));
-            // this.childOptions=[]
-            this.$set(this,'childOptions',[])
-            let arr =[]
-            data.forEach((item) => {
-              arr.push({
-                value: item.code,
-                label: item.name,
-                children:[]
-              })
-            })
-            this.childOptions.splice(0,0,...arr)
-            console.log('获取设备类型',data,this.childOptions)
-          })
-          .finally(() => {
-            this.loading -= 1;
-          });
-    },
-    //获取设备列表-区分站点
-    getDeviceList(deviceCategory,siteId){
-      this.$nextTick(()=>{
-        getDeviceListBySiteAndCategory({siteId:siteId || this.formData.siteId,deviceCategory}).then((response) => {
-          const data = (response?.data || []).map(item => {
-            return {
-              label: item.deviceName,
-              value: item.id,
-            }
-          })
-          const index = this.childOptions.findIndex(item=>item.value === deviceCategory)
-          if(index>-1){
-            const length = this.childOptions[index].children.length
-            this.childOptions[index].children.splice(0,length,...data)
-          }
-        })
-      })
-    },
-    //更新站点下面的设备列表
-    updateSiteDeviceList(){
-      this.childOptions.forEach(item => {
-        const length = item.children.length
-        item.children.splice(0,length)
-      })
-      this.getDeviceList('PCS')
-      this.getDeviceList('STACK')
-    },
-    //选中设备类型、设备
-    handleChange(data,type,index){
-      const deviceCategory = data[0],deviceId=data[1]
-      console.log('设置选中设备类型、设备',deviceCategory,deviceId,type,index)
-      const item = Object.assign({},this[type][index],{
-        deviceId:data,
-        deviceCategory,
-        categoryName : this.childOptions.find(i=>i.value === deviceCategory).label,
-        pointName:'',
-        point:''
-      })
-      this.$nextTick(()=>{
-        // this.$set(this[type], index, item);
-        this[type].splice(index,1,item);
-      })
-      console.log('设置选中设备类型、设备配置完成',this[type][index])
-    },
-
-    //获取站点列表
-    getZdList() {
-      this.loading += 1;
-      getAllSites()
-        .then((response) => {
-          this.siteList = response?.data || [];
-        })
-        .finally(() => {
-          this.loading -= 1;
-        });
-    },
-    // 切换站点
-    // 重新获取设备列表
-    // 清空选中的设备、点位信息
-    changeType() {
-      //获取当前站点下的pcs和bms
-      this.updateSiteDeviceList()
-      if(this.protectionSettings.length>0){
-        const list =this.protectionSettings
-        list.forEach((item) => {
-          item.point = ""
-          item.pointName = ""
-          item.deviceId=[]
-          item.categoryName=''
-          item.deviceCategory=''
-        });
-        // this.$set(this,'protectionSettings',list)
-        this.$nextTick(()=>{
-          this.protectionSettings.splice(0,this.protectionSettings.length,...list)
-        })
-      }
-      if(this.protectionPlan.length>0){
-        const list =this.protectionPlan
-        list.forEach((item) => {
-          item.point = ""
-          item.pointName = ""
-          item.deviceId=[]
-          item.categoryName=''
-          item.deviceCategory=''
-        });
-        // this.$set(this,'protectionPlan',list)
-        this.$nextTick(()=>{
-          this.protectionPlan.splice(0,this.protectionPlan.length,...list)
-        })
-      }
-    },
-
-
-    saveDialog() {
-      function getToastMsg(name,type,index){
-        return {
-          protectionSettings:{
-            deviceId:`请选择保护前提第${index}行的设备`,//设备ID
-            deviceCategory: `请选择保护前提第${index}行的设备类型`,//设备类型 英文
-            categoryName:`请选择保护前提第${index}行的设备类型`,//设备类型名称 中文
-            point: `请选择保护前提第${index}行的点位`,//点位 英文
-            pointName:`请选择保护前提第${index}行的点位`,//点位 中文
-            faultValue: `请输入保护前提第${index}行的故障值`,//故障值
-            releaseValue: `请输入保护前提第${index}行的释放值`,//释放值
-            faultOperator: `请选择保护前提第${index}行的故障值比较关系`,//故障值比较关系
-            releaseOperator: `请选择保护前提第${index}行的释放值比较关系`,//释放值比较关系
-            relationNext: `请选择保护前提第${index}行与下一个点位的关系`,//与下一个点位的关系
-          },
-          protectionPlan :{
-            deviceId:`请选择保护方案第${index}行的设备`,
-            deviceCategory: `请选择保护方案第${index}行的设备类型`,//设备类型 英文
-            categoryName:`请选择保护方案第${index}行的设备类型`,//设备类型名称 中文
-            point: `请选择保护方案第${index}行的点位`,
-            pointName:`请选择保护方案第${index}行的点位`,
-            value: `请输入保护方案第${index}行的故障值`,//设置值
-          }
-        }[type][name]
-      }
-      this.$refs.addTempForm.validate((valid) => {
-        if (!valid) return;
-        const {
-          id = "", //设备唯一标识
-          siteId = "", //站点ID
-          faultName = "", //设备保护名称
-          isAlert = 0, //是否告警
-          faultLevel = 1, //告警等级
-          faultDelaySeconds = "", //故障延时
-          releaseDelaySeconds = "", //释放延时
-          description="",//方案描述
-        } = this.formData;
-        const {protectionSettings,protectionPlan} = this
-        let protectionSettingsValidateStatus= true , protectionPlanValidateStatus= true
-        for(let i = 0;i<protectionSettings.length;i++){
-          let valueMap = Object.entries(protectionSettings[i]);
-          for(let inner = 0;inner < valueMap.length;inner++){
-            const key =valueMap[inner][0],value =valueMap[inner][1]
-            if(key === 'relationNext'){
-              if(protectionSettings[i+1] && !value){//有下一个点位
-                this.$message.error(getToastMsg(key,'protectionSettings',i+1))
-                protectionSettingsValidateStatus=false
-                break
-              }
-            }else{
-              if(![0,'0'].includes(value) && !value){
-                this.$message.error(getToastMsg(key,'protectionSettings',i+1))
-                protectionSettingsValidateStatus=false
-                break
-              }
-            }
-          }
-          if(!protectionSettingsValidateStatus) break
-        }
-
-        for(let i = 0;i<protectionPlan.length;i++){
-          let valueMap = Object.entries(protectionPlan[i]);
-          for(let inner = 0;inner < valueMap.length;inner++){
-            const key =valueMap[inner][0],value =valueMap[inner][1]
-            if(key === 'relationNext'){
-              if(protectionPlan[i+1] && !value){//有下一个点位
-                this.$message.error(getToastMsg(key,'protectionPlan',i+1))
-                protectionPlanValidateStatus=false
-                break
-              }else{
-                // protectionPlan[i][key] = ''//清空选择的关系
-              }
-            }else{
-              if(![0,'0'].includes(value) && !value){
-                this.$message.error(getToastMsg(key,'protectionPlan',i+1))
-                protectionPlanValidateStatus=false
-                break
-              }
-            }
-          }
-          if(!protectionPlanValidateStatus) break
-        }
-
-        if(!protectionSettingsValidateStatus || !protectionPlanValidateStatus) return
-        const settings = protectionSettings.map(item=>{
-          return Object.assign({},item,{
-            deviceId:item.deviceId[1],
-          })
-        })
-        const plan = protectionPlan.map(item=>{
-          return Object.assign({},item,{
-            deviceId:item.deviceId[1],
-          })
-        })
-        this.loading += 1;
-        const params= {
-          siteId,
-          faultName,
-          isAlert,
-          faultLevel,
-          faultDelaySeconds,
-          releaseDelaySeconds,
-          description,
-          protectionSettings:JSON.stringify(settings),
-          protectionPlan:JSON.stringify(plan),
-        }
-        if (this.mode === "add") {
-          addProtectPlan(params)
-            .then((response) => {
-              if (response.code === 200) {
-                //新增成功
-                // 关闭弹窗 更新表格
-                this.$emit("update");
-                this.closeDialog();
-              }
-            })
-            .finally(() => {
-              this.loading -= 1;
-            });
-        } else {
-          params.id = id
-          updateProtectPlan(params)
-            .then((response) => {
-              if (response.code === 200) {
-                //新增成功
-                // 关闭弹窗 更新表格
-                this.$emit("update");
-                this.closeDialog();
-              }
-            })
-            .finally(() => {
-              this.loading -= 1;
-            });
-        }
-      });
-    },
-    closeDialog() {
-      this.$emit("clear");
-      // 清空所有数据
-      for(let key in this.formData) {
-        this.formData[key] = key === 'isAlert' ? 0 : key === 'faultLevel' ? 1 : ''
-      }
-      this.$refs.addTempForm.resetFields();
-      this.$set(this,'protectionSettings',[])
-      this.$set(this,'protectionPlan',[])
-      this.$set(this,'childOptions',[])
-      this.dialogTableVisible = false;
-    },
-  },
-};
-</script>
-<style scoped lang="scss">
-.items-container {
-  margin-top: 40px;
-  margin-bottom: 20px;
-  .item-title {
-    line-height: 16px;
-    padding: 10px 0;
-    color: #000;
-  }
-}
-.time-lists-container {
-  width: 100%;
-  border: 1px solid #eee;
-  .time-lists {
-    &:not(:last-child) {
-      border-bottom: 1px solid #eee;
-    }
-    display: flex;
-    & > div {
-      width: 16%;
-      box-sizing: border-box;
-      text-align: center;
-      padding: 10px 15px;
-      &:not(:last-child) {
-        width: 28%;
-        border-right: 1px solid #eee;
-      }
-      .el-date-editor.el-input,
-      .el-date-editor.el-input__inner {
-        width: 100%;
-      }
-    }
-  }
-  .time-lists-title {
-    color: #000;
-    font-size: 12px;
-    font-weight: bold;
-    line-height: 20px;
-  }
-}
-</style>

src/views/ems/site/sbbh/index.vue

@@ -1,160 +1,185 @@
 <template>
-  <div
+  <div class="protect-plan-page" v-loading="loading">
-    class="ems-dashboard-editor-container"
+    <el-card class="query-card" shadow="never">
-    style="background-color: #ffffff"
+      <div class="query-head">
-    v-loading="loading"
+        <div class="query-title">设备保护方案</div>
-  >
+        <el-button type="primary" @click="addPlan" native-type="button">新增方案</el-button>
-    <el-form :inline="true" class="select-container">
+      </div>
-      <el-form-item label="站点选择">
+      <el-form :inline="true" class="query-form" @submit.native.prevent>
-        <el-select
+        <el-form-item label="故障名称">
-          v-model="form.siteId"
+          <el-input
-          placeholder="请选择换电站名称"
-          :loading="searchLoading"
-          loading-text="正在加载数据"
-          clearable
-        >
-          <el-option
-            :label="item.siteName"
-            :value="item.siteId"
-            v-for="(item, index) in siteList"
-            :key="index + 'zdxeSelect'"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="故障名称">
-        <el-input
             v-model="form.faultName"
             clearable
             placeholder="请输入故障名称"
-            style="width: 150px"
+            style="width: 220px"
-        ></el-input>
+          />
-      </el-form-item>
+        </el-form-item>
-      <el-form-item>
+        <el-form-item>
           <el-button type="primary" @click="onSearch" native-type="button">搜索</el-button>
           <el-button @click="onReset" native-type="button">重置</el-button>
-      </el-form-item>
+        </el-form-item>
-    </el-form>
+      </el-form>
-    <el-button type="primary" @click="addDevice" native-type="button"
+    </el-card>
-      >新增设备</el-button
+
-    >
+    <el-card class="table-card" shadow="never">
-    <el-table
+      <el-table class="common-table" :data="tableData" stripe max-height="620px">
-      class="common-table"
+        <el-table-column prop="faultName" label="设备保护名称" min-width="140" />
-      :data="tableData"
+        <el-table-column prop="faultLevel" label="故障等级" width="100">
-      stripe
+          <template slot-scope="scope">等级{{ scope.row.faultLevel }}</template>
-      max-height="600px"
+        </el-table-column>
-      style="width: 100%; margin-top: 25px"
+        <el-table-column prop="isAlert" label="是否告警" width="100">
-    >
+          <template slot-scope="scope">{{ scope.row.isAlert === 1 ? '是' : '否' }}</template>
-      <el-table-column prop="siteId" label="站点"  width="100"> </el-table-column>
+        </el-table-column>
-      <el-table-column prop="faultName" label="设备保护名称" width="100"> </el-table-column>
+        <el-table-column prop="description" label="处理方案描述" min-width="180" show-overflow-tooltip />
-      <el-table-column prop="faultLevel" label="故障等级" width="100">
+        <el-table-column prop="protectionSettings" label="故障/释放保护" min-width="360" show-overflow-tooltip>
-        <template slot-scope="scope">等级{{scope.row.faultLevel}}</template>
+          <template slot-scope="scope">
-      </el-table-column>
+            <div class="rich-lines" v-html="handleProtectionSettings(scope.row.protectionSettings)"></div>
-      <el-table-column prop="isAlert" label="是否告警" width="100">
+          </template>
-        <template slot-scope="scope">{{scope.row.isAlert === 1 ? '是' : '否'}}</template>
+        </el-table-column>
-      </el-table-column>
+        <el-table-column prop="faultDelaySeconds" label="前提延时(s)" width="110" />
-      <el-table-column prop="description" label="处理方案描述" width="200" show-overflow-tooltip>
+        <el-table-column prop="protectionPlan" label="执行保护" min-width="260" show-overflow-tooltip>
-      </el-table-column>
+          <template slot-scope="scope">
-      <el-table-column prop="protectionSettings" label="保护前提" show-overflow-tooltip width="400">
+            <div class="rich-lines" v-html="handleProtectionPlan(scope.row.protectionPlan)"></div>
-        <template slot-scope="scope">
+          </template>
-          <div v-html="handleProtectionSettings(scope.row.protectionSettings)"></div>
+        </el-table-column>
-        </template>
+        <el-table-column prop="releaseDelaySeconds" label="方案延时(s)" width="110" />
-      </el-table-column>
+        <el-table-column fixed="right" label="操作" width="150">
-      <el-table-column prop="faultDelaySeconds" label="保护前提延时(s)" width="120">
+          <template slot-scope="scope">
-      </el-table-column>
+            <el-button @click="editDevice(scope.row)" type="warning" size="mini">编辑</el-button>
-      <el-table-column prop="protectionPlan" label="保护方案" show-overflow-tooltip width="200">
+            <el-button type="danger" @click="deleteDevice(scope.row)" size="mini">删除</el-button>
-        <template slot-scope="scope">
+          </template>
-          <div v-html="handleProtectionPlan(scope.row.protectionPlan)"></div>
+        </el-table-column>
-        </template>
+      </el-table>
-      </el-table-column>
+      <el-pagination
-      <el-table-column prop="releaseDelaySeconds" label="保护方案延时(s)" width="120">
+        v-show="tableData.length > 0"
-      </el-table-column>
+        background
-      <el-table-column fixed="right" label="操作" width="150">
+        @size-change="handleSizeChange"
-        <template slot-scope="scope">
+        @current-change="handleCurrentChange"
-          <el-button @click="editDevice(scope.row)" type="warning" size="mini">
+        :current-page="pageNum"
-            编辑
+        :page-size="pageSize"
-          </el-button>
+        :page-sizes="[10, 20, 30, 40]"
-          <el-button type="danger" @click="deleteDevice(scope.row)" size="mini">
+        layout="total, sizes, prev, pager, next, jumper"
-            删除
+        :total="totalSize"
-          </el-button>
+        class="pager"
-        </template>
+      />
-      </el-table-column>
+    </el-card>
-    </el-table>
+
-    <el-pagination
+    <add-plan ref="addPlan" @update="getData" />
-      v-show="tableData.length > 0"
-      background
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="pageNum"
-      :page-size="pageSize"
-      :page-sizes="[10, 20, 30, 40]"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="totalSize"
-      style="margin-top: 15px; text-align: center"
-    >
-    </el-pagination>
-    <add-device
-      ref="addDevice"
-      @update="getData"
-    />
   </div>
 </template>
 
 <script>
-import {
+import { protectPlanList, deleteProtectPlan } from "@/api/ems/site";
-  protectPlanList,
+import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-  deleteProtectPlan,
+import AddPlan from "./AddPlan.vue";
-} from "@/api/ems/site";
+
-import { getAllSites } from "@/api/ems/zddt";
-import AddDevice from "./AddDevice.vue";
 export default {
   name: "SBBH",
-  components: { AddDevice },
+  components: { AddPlan },
+  mixins: [getQuerySiteId],
   data() {
     return {
-      form:{
+      form: {
-        siteId:'',
+        faultName: "",
-        faultName:''
       },
       loading: false,
-      searchLoading: false,
-      siteList: [],
       tableData: [],
-      pageSize: 10, //分页栏当前每个数据总数
+      pageSize: 10,
-      pageNum: 1, //分页栏当前页数
+      pageNum: 1,
-      totalSize: 0, //table表格数据总数
+      totalSize: 0,
       dialogTableVisible: false,
     };
   },
   methods: {
-    handleProtectionSettings(data){
+    init() {
-      if(!data || !JSON.parse(data)) return
+      this.pageNum = 1;
-      const arr = JSON.parse(data),
+      this.getData();
-      str= arr.map((item,index)=>{
-        const {categoryName='',deviceId='',point='',faultOperator='',faultValue='',releaseOperator='',releaseValue='',relationNext=''} = item
-        return `<div>${index+1}、 <span>${categoryName ? categoryName + '-' : ''}${deviceId ? deviceId + '-' : ''}${ point || ''}</span> <span>故障:${faultOperator || ''}${ faultValue || ''}</span> <span>释放:${releaseOperator || ''}${releaseValue || ''}</span> ${arr[index+1] ? '<span>关系:'+(relationNext || '')+'</span>' : ''}</div>`
-      })
-      return str.join('')
     },
-    handleProtectionPlan(data){
+    handleProtectionSettings(data) {
-      if(!data || !JSON.parse(data)) return
+      if (!data) return;
-      const arr = JSON.parse(data),
+      let parsed = null;
-          str= arr.map((item,index)=>{
+      try {
-            const {categoryName='',deviceId='',point='',value=''} = item
+        parsed = JSON.parse(data);
-            return `<div>${index+1}、 <span>${categoryName ? categoryName + '-' : ''}${deviceId ? deviceId + '-' : ''}${ point || ''}</span> <span>故障:=${ value || ''}</span> </div>`
+      } catch (e) {
-          })
+        return "";
-      return str.join('')
+      }
+      const faultSettings = Array.isArray(parsed) ? parsed : parsed?.faultSettings || [];
+      const releaseSettings = Array.isArray(parsed) ? parsed : parsed?.releaseSettings || [];
+
+      const buildLine = (item, index, total, key, value, relationKey) => {
+        const {
+          categoryName = "",
+          deviceId = "",
+          point = "",
+          [key]: operator = "",
+          [value]: val = "",
+          relationNext = "",
+        } = item;
+        return `<div>${index + 1}、 <span>${categoryName ? categoryName + "-" : ""}${
+          deviceId ? deviceId + "-" : ""
+        }${point || ""}</span> <span>${relationKey}:${operator || ""}${val || ""}</span> ${
+          total[index + 1] ? "<span>关系:" + (relationNext || "") + "</span>" : ""
+        }</div>`;
+      };
+
+      const faultStr = faultSettings.map((item, index) =>
+        buildLine(item, index, faultSettings, "faultOperator", "faultValue", "故障")
+      );
+      const releaseStr = releaseSettings.map((item, index) =>
+        buildLine(item, index, releaseSettings, "releaseOperator", "releaseValue", "释放")
+      );
+      const groups = [];
+      if (faultStr.length) {
+        groups.push(`<div><strong>故障保护</strong></div>${faultStr.join("")}`);
+      }
+      if (releaseStr.length) {
+        groups.push(`<div><strong>释放保护</strong></div>${releaseStr.join("")}`);
+      }
+      return groups.join("");
     },
-    //  新增设备 展示弹窗
+    handleProtectionPlan(data) {
-    addDevice() {
+      if (!data) return;
-      this.$refs.addDevice.open()
+      let arr = [];
+      try {
+        const parsed = JSON.parse(data);
+        arr = Array.isArray(parsed) ? parsed : parsed ? [parsed] : [];
+      } catch (e) {
+        return "";
+      }
+      const actionLabelMap = {
+        derate: "降功率",
+        shutdown: "关机/停机/切断",
+        forbid_charge: "禁止充电",
+        allow_discharge: "允许放电",
+        forbid_discharge: "禁止放电",
+        allow_charge: "允许充电",
+        forbid_charge_discharge: "禁止充放电",
+        standby: "待机",
+      };
+      const str = arr.map((item, index) => {
+        const action = item?.action || "";
+        const point = item?.point || "";
+        const pointName = item?.pointName || "";
+        const actionName = item?.actionName || actionLabelMap[action] || pointName || point || "未配置";
+        const value = item?.value;
+        if ((action === "derate" || actionName.includes("降功率")) && value !== null && value !== undefined && value !== "") {
+          return `<div>${index + 1}、 <span>动作:${actionName}</span> <span>比例:${value}%</span></div>`;
+        }
+        return `<div>${index + 1}、 <span>动作:${actionName}</span></div>`;
+      });
+      return str.join("");
+    },
+    addPlan() {
+      if (!this.siteId) {
+        this.$message.warning("请先在顶部选择站点");
+        return;
+      }
+      this.$refs.addPlan.open("", this.siteId);
     },
-    // 编辑设备
     editDevice(row) {
-      this.$refs.addDevice.open(row.id,row.siteId)
+      this.$refs.addPlan.open(row.id, this.siteId);
     },
-    //删除设备
     deleteDevice(row) {
-      console.log('删除')
       this.$confirm(`确认要设备保护${row.faultName}吗?`, {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -177,19 +202,14 @@ export default {
         },
       })
         .then(() => {
-          //只有在废弃成功的情况下会走到这里
           this.$message({
             type: "success",
             message: "删除成功!",
           });
           this.getData();
-          //调用接口 更新表格数据
         })
-        .catch(() => {
+        .catch(() => {});
-          //取消关机
-        });
     },
-    // 分页
     handleSizeChange(val) {
       this.pageSize = val;
       this.$nextTick(() => {
@@ -202,25 +222,27 @@ export default {
         this.getData();
       });
     },
-    // 搜索
     onSearch() {
-      this.pageNum = 1; //每次搜索从1开始搜索
+      this.pageNum = 1;
       this.getData();
     },
-    // 重置
     onReset() {
-      this.form={
+      this.form = {
-        siteId: "",
         faultName: "",
-      }
+      };
-      this.pageNum = 1; //每次搜索从1开始搜索
+      this.pageNum = 1;
       this.getData();
     },
-    // 获取数据
     getData() {
+      if (!this.siteId) {
+        this.tableData = [];
+        this.totalSize = 0;
+        return;
+      }
       this.loading = true;
-      const { pageNum, pageSize } = this,{siteId,faultName=''}=this.form;
+      const { pageNum, pageSize } = this;
-      protectPlanList({ siteId, faultName,pageNum, pageSize })
+      const { faultName = "" } = this.form;
+      protectPlanList({ siteId: this.siteId, faultName, pageNum, pageSize })
         .then((response) => {
           this.tableData = response?.rows || [];
           this.totalSize = response?.total || 0;
@@ -229,31 +251,50 @@ export default {
           this.loading = false;
         });
     },
-    //获取站点列表
-    getZdList() {
-      this.searchLoading = true;
-      return getAllSites()
-        .then((response) => {
-          this.siteList = response?.data || [];
-          if (this.siteList.length > 0) this.form.siteId = this.siteList[0].siteId;
-        })
-        .finally(() => {
-          this.searchLoading = false;
-        });
-    },
-  },
-  mounted() {
-    this.loading = true;
-    this.form = {
-      siteId: "",
-      faultName: "",
-    };
-    this.pageNum = 1; //每次搜索从1开始搜索
-    this.getZdList().then(() => {
-      this.getData();
-    });
   },
 };
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+.protect-plan-page {
+  padding: 16px;
+  background: linear-gradient(180deg, #f5f8ff 0%, #f7f9fc 100%);
+
+  .query-card,
+  .table-card {
+    border-radius: 12px;
+    border: 1px solid #e7edf7;
+    margin-bottom: 12px;
+  }
+
+  .query-head {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 14px;
+  }
+
+  .query-title {
+    font-size: 16px;
+    font-weight: 600;
+    color: #1d2a3a;
+    letter-spacing: 0.5px;
+  }
+
+  .query-form {
+    display: flex;
+    flex-wrap: wrap;
+    margin-bottom: -18px;
+  }
+
+  .rich-lines {
+    color: #3e4b5a;
+    line-height: 1.45;
+  }
+
+  .pager {
+    margin-top: 16px;
+    text-align: center;
+  }
+}
+</style>

src/views/ems/site/sblb/AddDevice.vue

@@ -1,77 +1,127 @@
 <template>
-  <el-dialog :visible.sync="dialogTableVisible" :close-on-press-escape="false" :close-on-click-modal="false" :show-close="false" destroy-on-close lock-scroll append-to-body width="600px"  class="ems-dialog" :title="mode === 'add'?'新增设备':`编辑设备` " >
+  <el-dialog :visible.sync="dialogTableVisible" :close-on-press-escape="false" :close-on-click-modal="false"
-    <el-form v-loading="loading>0" ref="addTempForm" :model="formData" :rules="rules" size="medium" label-width="140px">
+             :show-close="false" destroy-on-close lock-scroll append-to-body width="800px" class="ems-dialog"
-      <el-form-item label="站点" prop="siteId">
+             :title="mode === 'add'?'新增设备':`编辑设备` ">
-        <el-select v-model="formData.siteId" placeholder="请选择" :style="{width: '100%'}" @change="changeType">
+    <div v-loading="loading>0">
-          <el-option :label="item.siteName" :value="item.siteId" v-for="(item,index) in siteList" :key="index+'siteOptions'"></el-option>
+      <div class="form-layout" :class="{ 'has-pcs': isPcs }">
-        </el-select>
+        <el-form v-loading="loading>0" ref="addTempForm" inline :model="formData" :rules="rules" size="medium"
-      </el-form-item>
+                 label-width="120px" class="device-form base-form">
-      <el-form-item label="设备id" prop="deviceId" >
+          <el-form-item label="站点" prop="siteId">
-        <el-input v-model="formData.deviceId" placeholder="请输入" maxlength="60" clearable :style="{width: '100%'}">
+            <el-input
-        </el-input>
+              v-model="formData.siteId"
-      </el-form-item>
+              placeholder="请先在顶部选择站点"
-      <el-form-item label="设备名称" prop="deviceName">
+              disabled
-        <el-input v-model="formData.deviceName" placeholder="请输入" clearable :style="{width: '100%'}">
+              :style="{width: '100%'}"
-        </el-input>
+            />
-      </el-form-item>
+          </el-form-item>
-      <el-form-item label="设备描述" prop="description">
+          <el-form-item label="设备id" prop="deviceId">
-        <el-input v-model="formData.description" type="textarea" placeholder="请输入" clearable :style="{width: '100%'}">
+            <el-input v-model="formData.deviceId" placeholder="请输入" maxlength="60" clearable :style="{width: '100%'}">
-        </el-input>
+            </el-input>
-      </el-form-item>
+          </el-form-item>
-      <el-form-item label="工作状态" prop="communicationStatus">
+          <el-form-item label="设备名称" prop="deviceName">
-        <el-select v-model="formData.communicationStatus" placeholder="请选择" :style="{width: '100%'}">
+            <el-input v-model="formData.deviceName" placeholder="请输入" clearable :style="{width: '100%'}">
-          <el-option :label="value" :value="key" v-for="(value,key) in communicationStatusOptions" :key="key+'communicationStatusOptions'"></el-option>
+            </el-input>
-        </el-select>
+          </el-form-item>
-      </el-form-item>
+          <el-form-item label="设备描述" prop="description">
-      <el-form-item label="设备类型" prop="deviceType">
+            <el-input v-model="formData.description" type="textarea" placeholder="请输入" clearable
-        <el-select v-model="formData.deviceType" placeholder="请选择" :style="{width: '100%'}">
+                      :style="{width: '100%'}">
-          <el-option :label="value" :value="key" v-for="(value,key) in deviceTypeOptions" :key="key+'deviceTypeOptions'"></el-option>
+            </el-input>
-        </el-select>
+          </el-form-item>
-      </el-form-item>
+          <el-form-item label="设备类型" prop="deviceType">
-      <el-form-item label="设备类别" prop="deviceCategory">
+            <el-select v-model="formData.deviceType" placeholder="请选择" :style="{width: '100%'}">
-        <el-select v-model="formData.deviceCategory" placeholder="请选择" :style="{width: '100%'}" @change="changeType">
+              <el-option :label="value" :value="key" v-for="(value,key) in deviceTypeOptions"
-          <el-option :label="item.name" :value="item.code" v-for="(item,index) in deviceCategoryList" :key="index+'deviceCategoryList'"></el-option>
+                         :key="key+'deviceTypeOptions'"></el-option>
-        </el-select>
+            </el-select>
-      </el-form-item>
+          </el-form-item>
-      <el-form-item label="上级设备" prop="parentId" v-if="dccDeviceCategoryList.includes(formData.deviceCategory)">
+          <el-form-item label="设备类别" prop="deviceCategory">
-        <el-select v-model="formData.parentId" :placeholder="parentDeviceList.length === 0 && !formData.siteId ? '请先选择站点' : '请选择'" :style="{width: '100%'}">
+            <el-select v-model="formData.deviceCategory" placeholder="请选择" :style="{width: '100%'}"
-          <el-option :label="item.deviceName" :value="item.id" v-for="(item,index) in parentDeviceList" :key="index+'parentDeviceList'" ></el-option>
+                       @change="changeType">
-        </el-select>
+              <el-option :label="item.name" :value="item.code" v-for="(item,index) in deviceCategoryList"
-      </el-form-item>
+                         :key="index+'deviceCategoryList'"></el-option>
-      <el-form-item label="TCP设备的ip地址" prop="ipAddress" v-if="formData.deviceType === 'TCP'">
+            </el-select>
-        <el-input v-model="formData.ipAddress" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-form-item>
-        </el-input>
+          <el-form-item label="上级设备" prop="parentId" v-if="dccDeviceCategoryList.includes(formData.deviceCategory)">
-      </el-form-item>
+            <el-select v-model="formData.parentId"
-      <el-form-item label="TCP设备的端口号" prop="ipPort" v-if="formData.deviceType === 'TCP'">
+                       :placeholder="parentDeviceList.length === 0 && !formData.siteId ? '请先在顶部选择站点' : '请选择'"
-        <el-input v-model="formData.ipPort" placeholder="请输入" clearable :style="{width: '100%'}">
+                       :style="{width: '100%'}">
-        </el-input>
+              <el-option :label="item.deviceName" :value="item.id" v-for="(item,index) in parentDeviceList"
-      </el-form-item>
+                         :key="index+'parentDeviceList'"></el-option>
-
+            </el-select>
-      <el-form-item label="串口路径" prop="serialPort">
+          </el-form-item>
-        <el-input v-model="formData.serialPort" placeholder="请输入" clearable :style="{width: '100%'}">
+          <el-form-item label="TCP设备的ip地址" prop="ipAddress" v-if="formData.deviceType === 'TCP'">
-        </el-input>
+            <el-input v-model="formData.ipAddress" placeholder="请输入" clearable :style="{width: '100%'}">
-      </el-form-item>
+            </el-input>
-      <el-form-item label="波特率" prop="baudRate">
+          </el-form-item>
-        <el-input v-model="formData.baudRate" placeholder="请输入" clearable :style="{width: '100%'}">
+          <el-form-item label="TCP设备的端口号" prop="ipPort" v-if="formData.deviceType === 'TCP'">
-        </el-input>
+            <el-input v-model="formData.ipPort" placeholder="请输入" clearable :style="{width: '100%'}">
-      </el-form-item>
+            </el-input>
-      <el-form-item label="数据位" prop="dataBits">
+          </el-form-item>
-        <el-input v-model="formData.dataBits" placeholder="请输入" clearable :style="{width: '100%'}">
+          <el-form-item label="从站地址" prop="slaveId" v-if="formData.deviceType === 'TCP'">
-        </el-input>
+            <el-input v-model="formData.slaveId" placeholder="请输入" clearable :style="{width: '100%'}">
-      </el-form-item>
+            </el-input>
-      <el-form-item label="停止位" prop="stopBits">
+          </el-form-item>
-      <el-input v-model="formData.stopBits" placeholder="请输入" clearable :style="{width: '100%'}">
+          <el-form-item label="串口路径" prop="serialPort">
-      </el-input>
+            <el-input v-model="formData.serialPort" placeholder="请输入" clearable :style="{width: '100%'}">
-    </el-form-item>
+            </el-input>
-      <el-form-item label="校验位" prop="parity">
+          </el-form-item>
-        <el-input v-model="formData.parity" placeholder="请输入" clearable :style="{width: '100%'}">
+          <el-form-item label="波特率" prop="baudRate">
-        </el-input>
+            <el-input v-model="formData.baudRate" placeholder="请输入" clearable :style="{width: '100%'}">
-      </el-form-item>
+            </el-input>
-      <el-form-item label="图片" prop="pictureUrl">
+          </el-form-item>
-        <image-upload :limit="1" :drag="false" @input="uploadImage" :value="formData.pictureUrl"/>
+          <el-form-item label="数据位" prop="dataBits">
-      </el-form-item>
+            <el-input v-model="formData.dataBits" placeholder="请输入" clearable :style="{width: '100%'}">
-
+            </el-input>
-    </el-form>
+          </el-form-item>
+          <el-form-item label="停止位" prop="stopBits">
+            <el-input v-model="formData.stopBits" placeholder="请输入" clearable :style="{width: '100%'}">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="校验位" prop="parity">
+            <el-input v-model="formData.parity" placeholder="请输入" clearable :style="{width: '100%'}">
+            </el-input>
+          </el-form-item>
+        </el-form>
+        <!--      pcs配置-->
+        <el-form v-if="isPcs" ref="pcsSettingForm" :model="pcsSetting" size="medium"
+                 label-position="top" class="pcs-form" :rules="pcsSettingRules">
+          <div class="pcs-form__title">PCS配置</div>
+          <div class="pcs-form__grid">
+            <el-form-item label="开关机地址" prop="pointAddress" class="pcs-form__item">
+              <el-input v-model="pcsSetting.pointAddress" placeholder="请输入" clearable :style="{width: '100%'}" />
+            </el-form-item>
+            <el-form-item label="功率地址" prop="powerAddress" class="pcs-form__item">
+              <el-input v-model="pcsSetting.powerAddress" placeholder="请输入" clearable :style="{width: '100%'}" />
+            </el-form-item>
+            <el-form-item label="开机指令" prop="startCommand" class="pcs-form__item">
+              <el-input v-model="pcsSetting.startCommand" placeholder="请输入" clearable :style="{width: '100%'}" />
+            </el-form-item>
+            <el-form-item label="关机指令" prop="stopCommand" class="pcs-form__item">
+              <el-input v-model="pcsSetting.stopCommand" placeholder="请输入" clearable :style="{width: '100%'}" />
+            </el-form-item>
+            <el-form-item label="开机目标功率" prop="startPower" class="pcs-form__item">
+              <el-input v-model="pcsSetting.startPower" placeholder="请输入" clearable :style="{width: '100%'}" />
+            </el-form-item>
+            <el-form-item label="关机目标功率" prop="stopPower" class="pcs-form__item">
+              <el-input v-model="pcsSetting.stopPower" placeholder="请输入" clearable :style="{width: '100%'}" />
+            </el-form-item>
+            <el-form-item label="倍率" prop="powerMultiplier" class="pcs-form__item">
+              <el-input v-model="pcsSetting.powerMultiplier" placeholder="请输入" clearable :style="{width: '100%'}" />
+            </el-form-item>
+            <el-form-item label="电池簇数" prop="clusterNum" class="pcs-form__item">
+              <el-input v-model="pcsSetting.clusterNum" placeholder="请输入" clearable :style="{width: '100%'}" />
+            </el-form-item>
+          </div>
+          <div v-if="(parseInt(pcsSetting.clusterNum) || 0) > 0" class="pcs-form__cluster">
+            <div class="pcs-form__cluster-title">电池簇地址</div>
+            <template v-for="index in parseInt(pcsSetting.clusterNum) || 0">
+              <el-form-item :key="'clusterAddress' + index" :label="'电池簇' + index + '地址'" prop="clusterPointAddress">
+                <el-input v-model="pcsSetting.clusterPointAddress[index - 1]" placeholder="请输入" clearable :style="{width: '100%'}" />
+              </el-form-item>
+            </template>
+          </div>
+        </el-form>
+      </div>
+    </div>
     <div slot="footer">
       <el-button @click="closeDialog">取消</el-button>
       <el-button type="primary" @click="saveDialog">确定</el-button>
@@ -80,259 +130,517 @@
 </template>
 <script>
 import {mapState} from "vuex";
-import {getAllSites} from '@/api/ems/zddt'
 import {validText} from '@/utils/validate'
-import {getDeviceDetailInfo,updateDevice,addDevice,getParentDeviceId} from "@/api/ems/site";
+import {addDevice, getDeviceDetailInfo, getParentDeviceId, updateDevice} from "@/api/ems/site";
 import {getAllDeviceCategory} from '@/api/ems/search'
+
 export default {
-  props:{
+  props: {
-    mode:{
+    mode: {
-      type:String,
+      type: String,
-      default:"add"
+      default: "add"
     },
-    id:{
+    id: {
-      type:String|Number,
+      type: String | Number,
-      required:false
+      required: false
     }
   },
   data() {
-    const validateText=(rule, value, callback) =>{
+    const validateText = (rule, value, callback) => {
       if (value !== '' && !validText(value)) {
         callback(new Error('只能输入中文、英文、数字和特殊字符!'));
       } else {
         callback();
       }
     }
-    const validateDeviceId=(rule, value, callback) =>{
+    const validateDeviceId = (rule, value, callback) => {
       if (value !== '' && !/^[a-zA-Z0-9]+$/.test(value)) {
         callback(new Error('只能输入英文和数字!'));
       } else {
         callback();
       }
     }
+    const validateNumber = (rule, value, callback) => {
+      if (value !== '' && !/^[0-9]+$/.test(value)) {
+        callback(new Error('只能输入数字!'));
+      } else {
+        callback();
+      }
+    }
+    const validateDecimal = (rule, value, callback) => {
+      if (value !== '' && !/^(0|[1-9]\d*)(\.\d+)?$/.test(value)) {
+        callback(new Error('只能输入非负数字!'));
+      } else {
+        callback();
+      }
+    }
     return {
-      loading:0,
+      loading: 0,
-      dccDeviceCategoryList:['CLUSTER','BATTERY'],//需要展示上级设备的设备类型
+      dccDeviceCategoryList: ['CLUSTER', 'BATTERY'],//需要展示上级设备的设备类型
-      dialogTableVisible:false,
+      dialogTableVisible: false,
-      parentDeviceList:[],//上级设备列表  从接口获取数据
+      parentDeviceList: [],//上级设备列表  从接口获取数据
-      siteList:[],//站点列表  从接口获取数据
+      deviceCategoryList: [],//设备类别列表 从接口获取数据
-      deviceCategoryList:[],//设备类别列表 从接口获取数据
       formData: {
-        id:'',//设备唯一标识
+        id: '',//设备唯一标识
-        siteId:'',//站点ID
+        siteId: '',//站点ID
-        deviceId:'',//设备id
+        deviceId: '',//设备id
-        deviceName:'',//设备名称
+        deviceName: '',//设备名称
-        description:'',//设备描述
+        description: '',//设备描述
-        communicationStatus:'',//工作状态
+        deviceType: '',//设备类型
-        deviceType:'',//设备类型
+        deviceCategory: '',//设备类别
-        deviceCategory:'',//设备类别
+        parentId: '',//上级设备id
-        parentId:'',//上级设备id
+        ipAddress: '',//TCP设备的ip地址
-        ipAddress:'',//TCP设备的ip地址
+        ipPort: "",//TCP端口号
-        ipPort:"",//TCP端口号
+        serialPort: '',//串口路径
-        serialPort:'',//串口路径
+        baudRate: '',//波特率
-        baudRate:'',//波特率
+        dataBits: '',//数据位
-        dataBits:'',//数据位
+        stopBits: '',//停止位
-        stopBits:'',//停止位
+        parity: '',//校验位
-        parity:'',//校验位
+        slaveId: '',//从站地址
-        pictureUrl:'',//设备图片
+      },
+      pcsSetting: {
+        deviceSettingId: '',
+        powerAddress: '',//功率地址
+        pointAddress: "",//开关机地址
+        startCommand: "",//开机指令
+        stopCommand: "",//关机指令
+        startPower: '',//开机目标功率
+        stopPower: '',//关机目标功率
+        powerMultiplier: '',//目标功率倍率
+        clusterNum: '',//电池簇数
+        clusterPointAddress: []//电池簇地址
       },
       rules: {
-        siteId:[
+        siteId: [
-          { required: true, message: '请选择站点', trigger: ['blur','change']}
+          {required: true, message: '请先在顶部选择站点', trigger: ['blur', 'change']}
         ],
-        deviceId:[
+        deviceId: [
-          { required: true, message: '请输入设备id', trigger: 'blur'},
+          {required: true, message: '请输入设备id', trigger: 'blur'},
-          { validator: validateDeviceId, trigger: 'blur' }
+          {validator: validateDeviceId, trigger: 'blur'}
         ],
-        deviceName:[
+        deviceName: [
-          { required: true, message: '请输入设备名称', trigger: 'blur'},
+          {required: true, message: '请输入设备名称', trigger: 'blur'},
-          { validator: validateText, trigger: 'blur' }
+          {validator: validateText, trigger: 'blur'}
         ],
-        description:[
+        description: [
-          { required: true, message: '请输入设备描述', trigger: 'blur'},
+          {required: true, message: '请输入设备描述', trigger: 'blur'},
-          { validator: validateText, trigger: 'blur' }
+          {validator: validateText, trigger: 'blur'}
         ],
-        communicationStatus:[
+        deviceType: [
-          { required: true, message: '请选择工作状态', trigger: ['blur','change']}
+          {required: true, message: '请选择设备类型', trigger: ['blur', 'change']}
         ],
-        deviceType:[
+        deviceCategory: [
-          { required: true, message: '请选择设备类型', trigger:['blur','change']}
+          {required: true, message: '请选择设备类别', trigger: ['blur', 'change']}
         ],
-        deviceCategory:[
+        ipAddress: [
-          { required: true, message: '请选择设备类别', trigger: ['blur','change']}
+          {validator: validateText, trigger: 'blur'}
         ],
-        ipAddress:[
+        ipPort: [
-          { validator: validateText, trigger: 'blur' }
+          {validator: validateText, trigger: 'blur'}
         ],
-        ipPort:[
+        slaveId: [
-          { validator: validateText, trigger: 'blur' }
+          {validator: validateNumber, trigger: 'blur'}
         ],
-        serialPort:[
+        serialPort: [
-          { validator: validateText, trigger: 'blur' }
+          {validator: validateText, trigger: 'blur'}
         ],
-        baudRate:[
+        baudRate: [
-          { validator: validateText, trigger: 'blur' }
+          {validator: validateText, trigger: 'blur'}
         ],
-        dataBits:[
+        dataBits: [
-          { validator: validateText, trigger: 'blur' }
+          {validator: validateText, trigger: 'blur'}
         ],
-        stopBits:[
+        stopBits: [
-          { validator: validateText, trigger: 'blur' }
+          {validator: validateText, trigger: 'blur'}
         ],
-        parity:[
+        parity: [
-          { validator: validateText, trigger: 'blur' }
+          {validator: validateText, trigger: 'blur'}
         ],
-        // pictureUrl:[
-        //   { required: true, message: '请上传图片', trigger: ['blur', 'change']}
-        // ],
       },
+      pcsSettingRules: {
+        pointAddress: [
+          {required: true, message: '请输入开关机地址', trigger: 'blur'},
+          {validator: validateText, trigger: 'blur'}
+        ],
+        powerAddress: [
+          {validator: validateText, trigger: 'blur'}
+        ],
+        startCommand: [
+          {required: true, message: '请输入开机指令', trigger: 'blur'},
+          {validator: validateText, trigger: 'blur'}
+        ],
+        startPower: [
+          {validator: validateText, trigger: 'blur'}
+        ],
+        stopCommand: [
+          {required: true, message: '请输入关机指令', trigger: 'blur'},
+          {validator: validateText, trigger: 'blur'}
+        ],
+        stopPower: [
+          {validator: validateText, trigger: 'blur'}
+        ],
+        powerMultiplier: [
+          {validator: validateDecimal, trigger: 'blur'}
+        ],
+        clusterNum: [
+          {required: true, message: '请输入电池簇数', trigger: 'blur'},
+          {validator: validateNumber, trigger: 'blur'}
+        ],
+        clusterPointAddress: [
+          {required: true, message: '请输入电池簇地址', trigger: 'blur'},
+          {validator: validateText, trigger: 'blur'}
+        ]
+      }
     }
   },
   computed: {
     ...mapState({
-      communicationStatusOptions: state => state?.ems?.communicationStatusOptions || {},
+      deviceTypeOptions: state => state?.ems?.deviceTypeOptions || {}
-      deviceTypeOptions:state=>state?.ems?.deviceTypeOptions || {}
+    }),
-    })
+    isPcs() {
+      return this.formData.deviceCategory === 'PCS'
+    }
   },
-  watch:{
+  watch: {
-    dialogTableVisible:{
+    dialogTableVisible: {
-      handler(newVal){
+      handler(newVal) {
         //打开弹窗
-        if(newVal){
+        if (newVal) {
-          this.getZdList()
+          if (this.mode === 'add') {
+            this.syncSiteFromRoute(true)
+          }
           this.getDeviceCategoryList()
         }
       },
       immediate: true,
     },
-    id:{
+    '$route.query.siteId': {
-      handler(newVal){
+      handler() {
-        if((newVal || newVal===0) && this.mode !== 'add'){
+        if (!this.dialogTableVisible || this.mode !== 'add') {
-          this.loading+=1
+          return
+        }
+        this.syncSiteFromRoute(true)
+      }
+    },
+    id: {
+      handler(newVal) {
+        if ((newVal || newVal === 0) && this.mode !== 'add') {
+          this.loading += 1
           getDeviceDetailInfo(newVal).then(response => {
-            this.formData = JSON.parse(JSON.stringify(response?.data || {}));
+            const {pcsSetting, ...data} = JSON.parse(JSON.stringify(response?.data || {}))
-            if(this.dccDeviceCategoryList.includes(this.formData.deviceCategory)){
+            this.formData = data;
+            if (pcsSetting && JSON.stringify(pcsSetting) !== '{}') {
+              this.pcsSetting = JSON.parse(JSON.stringify({
+                ...pcsSetting,
+                clusterPointAddress: JSON.parse(pcsSetting.clusterPointAddress || [])
+              }));
+            }
+            if (this.dccDeviceCategoryList.includes(this.formData.deviceCategory)) {
               this.getParentDeviceList(true)
             }
-          }).finally(() => {this.loading-=1})
+          }).finally(() => {
+            this.loading -= 1
+          })
         }
       },
       immediate: true,
     }
   },
   methods: {
-    changeType(){
+    syncSiteFromRoute(force = false) {
-      if(this.dccDeviceCategoryList.includes(this.formData.deviceCategory)){
+      const routeSiteId = this.$route?.query?.siteId
+      const normalizedSiteId = routeSiteId === undefined || routeSiteId === null ? '' : String(routeSiteId).trim()
+      if (!normalizedSiteId) {
+        if (force) {
+          this.formData.siteId = ''
+        }
+        return
+      }
+      if (force || !this.formData.siteId) {
+        this.formData.siteId = normalizedSiteId
+      }
+    },
+    changeType() {
+      if (this.dccDeviceCategoryList.includes(this.formData.deviceCategory)) {
         this.getParentDeviceList()
       }
     },
-    uploadImage(data){
-      this.formData.pictureUrl = data
-    },
-    //获取站点列表
-    getZdList(){
-      this.loading+=1
-      getAllSites().then(response => {
-        this.siteList = response?.data || []
-      }).finally(() => {this.loading-=1})
-    },
     // 获取设备类别
-    getDeviceCategoryList(){
+    getDeviceCategoryList() {
-      this.loading+=1
+      this.loading += 1
       getAllDeviceCategory().then(response => {
         this.deviceCategoryList = response?.data || []
-      }).finally(() => {this.loading-=1})
+      }).finally(() => {
+        this.loading -= 1
+      })
     },
     //获取上级id列表
-    getParentDeviceList(init=false){
+    getParentDeviceList(init = false) {
-      if(!this.formData.siteId){
+      if (!this.formData.siteId) {
-       return  console.log('请先选择站点')
+        this.$message.warning('请先在顶部选择站点')
+        return
       }
-      !init && (this.formData.parentId='')
+      !init && (this.formData.parentId = '')
-      this.loading= this.loading+1
+      this.loading = this.loading + 1
-      getParentDeviceId({siteId:this.formData.siteId,deviceCategory:this.formData.deviceCategory}).then(response => {
+      getParentDeviceId({siteId: this.formData.siteId, deviceCategory: this.formData.deviceCategory}).then(response => {
         this.parentDeviceList = JSON.parse(JSON.stringify(response?.data || []));
       }).finally(() => {
-        this.loading=this.loading -1
+        this.loading = this.loading - 1
       })
     },
+    saveData() {
+      this.loading += 1
+      const {
+        id = '',
+        siteId = '',//站点ID
+        deviceId = '',//设备id
+        deviceName = '',//设备名称
+        description = '',//设备描述
+        deviceType = '',//设备类型
+        deviceCategory = '',//设备类别
+        parentId = '',//上级设备id
+        ipAddress = '',//TCP设备的ip地址
+        ipPort = "",//TCP端口号
+        serialPort = '',//串口路径
+        baudRate = '',//波特率
+        dataBits = '',//数据位
+        stopBits = '',//停止位
+        parity = '',//校验位
+        slaveId = '',//从站地址
+      } = this.formData;
+      const {
+        deviceSettingId,
+        powerAddress,
+        pointAddress,
+        startCommand,
+        stopCommand,
+        startPower,
+        stopPower,
+        powerMultiplier,
+        clusterNum,
+        clusterPointAddress
+      } = this.pcsSetting
+      let params = {
+        siteId,
+        deviceId,
+        deviceName,
+        description,
+        deviceType,
+        deviceCategory,
+        parentId,
+        ipAddress,
+        ipPort,
+        serialPort,
+        baudRate,
+        dataBits,
+        stopBits,
+        parity,
+        slaveId,
+      }
+      if (this.isPcs) {
+        params.pcsSetting = {
+          powerAddress,
+          pointAddress,
+          startCommand,
+          stopCommand,
+          startPower,
+          stopPower,
+          powerMultiplier,
+          clusterNum,
+          clusterPointAddress: JSON.stringify(!clusterNum ? [] : (clusterPointAddress || []).slice(0, clusterNum))
+        }
+      }
+      if (this.mode === 'add') {
+        addDevice(params).then(response => {
+          if (response.code === 200) {
+            //新增成功
+            // 关闭弹窗 更新表格
+            this.$emit('update')
+            this.closeDialog()
+          }
+        }).finally(() => {
+          this.loading -= 1
+        })
+      } else {
+        params.id = id
+        params.pcsSetting && (params.pcsSetting.deviceSettingId = deviceSettingId)
+        updateDevice(params).then(response => {
+          if (response.code === 200) {
+            //新增成功
+            // 关闭弹窗 更新表格
+            this.$emit('update')
+            this.closeDialog()
+          }
+        }).finally(() => {
+          this.loading -= 1
+        })
+      }
+    },
     saveDialog() {
       this.$refs.addTempForm.validate(valid => {
         if (!valid) return
-        this.loading+=1
+        if (this.isPcs) {
-        const {
+          this.$refs.pcsSettingForm.validate(pcsValidate => {
-          id='',
+            if (!pcsValidate) return
-          siteId='',//站点ID
+            this.saveData()
-          deviceId='',//设备id
-          deviceName='',//设备名称
-          description='',//设备描述
-          communicationStatus='',//工作状态
-          deviceType='',//设备类型
-          deviceCategory='',//设备类别
-          parentId='',//上级设备id
-          ipAddress='',//TCP设备的ip地址
-          ipPort="",//TCP端口号
-          serialPort='',//串口路径
-          baudRate='',//波特率
-          dataBits='',//数据位
-          stopBits='',//停止位
-          parity='',//校验位
-          pictureUrl='',//设备图片
-        }= this.formData;
-        if(this.mode === 'add'){
-          addDevice({siteId,deviceId,deviceName,description,communicationStatus,deviceType,deviceCategory,parentId,ipAddress,ipPort,serialPort,baudRate,dataBits,stopBits,parity,pictureUrl}).then(response => {
-            if(response.code === 200){
-              //新增成功
-              // 关闭弹窗 更新表格
-              this.$emit('update')
-              this.closeDialog()
-            }
-          }).finally(() => {
-            this.loading-=1
-          })
-        }else{
-          updateDevice({id,siteId,deviceId,deviceName,description,communicationStatus,deviceType,deviceCategory,parentId,ipAddress,ipPort,serialPort,baudRate,dataBits,stopBits,parity,pictureUrl}).then(response => {
-            if(response.code === 200){
-              //新增成功
-              // 关闭弹窗 更新表格
-              this.$emit('update')
-              this.closeDialog()
-            }
-          }).finally(() => {
-            this.loading-=1
           })
+        } else {
+          this.saveData()
         }
-
       })
     },
-    closeDialog(){
+    closeDialog() {
       this.$emit('clear')
       // 清空所有数据
-      this.formData= {
+      this.formData = {
-        id:'',//设备唯一标识
+        id: '',//设备唯一标识
-        siteId:'',//站点ID
+        siteId: '',//站点ID
-        deviceId:'',//设备id
+        deviceId: '',//设备id
-        deviceName:'',//设备名称
+        deviceName: '',//设备名称
-        description:'',//设备描述
+        description: '',//设备描述
-        communicationStatus:'',//工作状态
+        deviceType: '',//设备类型
-        deviceType:'',//设备类型
+        deviceCategory: '',//设备类别
-        deviceCategory:'',//设备类别
+        parentId: '',//上级设备id
-        parentId:'',//上级设备id
+        ipAddress: '',//TCP设备的ip地址
-        ipAddress:'',//TCP设备的ip地址
+        ipPort: "",//TCP端口号
-        ipPort:"",//TCP端口号
+        serialPort: '',//串口路径
-        serialPort:'',//串口路径
+        baudRate: '',//波特率
-        baudRate:'',//波特率
+        dataBits: '',//数据位
-        dataBits:'',//数据位
+        stopBits: '',//停止位
-        stopBits:'',//停止位
+        parity: '',//校验位
-        parity:'',//校验位
+        slaveId: '',//从站地址
-        pictureUrl:'',//设备图片
+      }
+      this.parentDeviceList = []
+      this.pcsSetting = {
+        deviceSettingId: '',
+        powerAddress: '',//功率地址
+        pointAddress: "",//开关机地址
+        startCommand: "",//开机指令
+        stopCommand: "",//关机指令
+        startPower: '',//开机目标功率
+        stopPower: '',//关机目标功率
+        powerMultiplier: '',//目标功率倍率
+        clusterNum: '',//电池簇数
+        clusterPointAddress: []//电池簇地址
       }
       this.$refs.addTempForm.resetFields()
-      this.dialogTableVisible=false
+      this.$refs?.pcsSettingForm?.resetFields()
+      this.dialogTableVisible = false
     }
   }
 }
 
 </script>
-<style scoped>
+<style scoped lang="scss">
+.form-layout {
+  position: relative;
+}
+
+.form-layout.has-pcs {
+  overflow: visible;
+}
+
+.base-form {
+  width: 100%;
+}
+
+.device-form {
+  ::v-deep .el-form-item--medium .el-form-item__content {
+    width: 260px;
+  }
+
+  .el-form-item {
+    width: 50%;
+    margin-right: 0;
+  }
+}
+
+.pcs-form {
+  position: absolute;
+  top: 0;
+  right: -360px;
+  width: 340px;
+  max-height: 520px;
+  overflow-y: auto;
+  padding: 14px;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  background: #fff;
+  box-shadow: none;
+  z-index: 2;
+}
+
+.pcs-form__title {
+  margin-bottom: 12px;
+  padding-bottom: 10px;
+  font-size: 14px;
+  font-weight: 600;
+  color: #303133;
+  border-bottom: 1px solid #ebeef5;
+}
+
+.pcs-form__grid {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 0 10px;
+}
+
+.pcs-form__item {
+  margin-bottom: 0;
+}
+
+.pcs-form__cluster {
+  margin-top: 10px;
+  padding-top: 10px;
+  border-top: 1px solid #ebeef5;
+}
+
+.pcs-form__cluster-title {
+  margin-bottom: 8px;
+  font-size: 13px;
+  font-weight: 600;
+  color: #606266;
+}
+
+.pcs-form {
+  ::v-deep .el-form-item {
+    width: 100%;
+    margin-right: 0;
+    margin-bottom: 18px;
+  }
+
+  ::v-deep .el-form-item__label {
+    line-height: 20px;
+    padding-bottom: 4px;
+    font-size: 14px;
+    color: #606266;
+  }
+
+  ::v-deep .el-form-item__content {
+    width: 100%;
+    line-height: normal;
+  }
+
+  ::v-deep .el-input__inner {
+    height: 34px;
+    line-height: 34px;
+  }
+
+  ::v-deep .el-form-item__error {
+    position: static;
+    line-height: 1.2;
+    padding-top: 4px;
+  }
+
+  ::v-deep .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label:before {
+    margin-right: 3px;
+  }
+}
+
+.ems-dialog {
+  ::v-deep .el-dialog,
+  ::v-deep .el-dialog__body {
+    overflow: visible;
+  }
+}
 </style>

src/views/ems/site/sblb/PcsSwitch.vue

@@ -32,7 +32,7 @@ export default {
       type: Object,
       default: () => {
         return {
-          deviceStatus: null,
+          workStatus: null,
           deviceId: null,
           deviceName: null,
         }
@@ -42,13 +42,13 @@ export default {
   },
   computed: {
     label() {
-      return this.data.deviceStatus === '4' ? '开机' : '关机'
+      return this.data.workStatus === '0' ? '关机' : '开机'
     }
   },
   methods: {
     switchStatus() {
       console.log(this.data, 11111111)
-      const {deviceStatus, deviceId, deviceName, siteId} = this.data
+      const {workStatus, deviceId, deviceName, siteId} = this.data
       this.$confirm(`确认要${this.label}设备${deviceName || ''}吗?`, {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -61,7 +61,7 @@ export default {
             //做开关机操作,更新成功后刷新表格
             updateDeviceStatus({
               siteId,
-              deviceStatus,
+              workStatus: workStatus === '0' ? "1" : '0',
               deviceId
             })
                 .then((response) => {

src/views/ems/site/sblb/PointTable.vue

@@ -80,7 +80,7 @@
         <el-table-column label="数据点位" prop="dataPoint"></el-table-column>
         <el-table-column
             label="数据点位名称"
-            prop="pointName"
+            prop="dataPointName"
         ></el-table-column>
         <!--        <el-table-column label="modbus地址">-->
         <!--          <template slot-scope="scope">-->
@@ -88,8 +88,8 @@
         <!--              `${scope.row.ipAddress || ""} ${scope.row.ipPort || ""}`-->
         <!--            }}</span>-->
         <!--          </template>-->
-        <!--        </el-table-column>-->
+        <!--        </el-table-column>
-        <el-table-column label="寄存器地址" prop="寄存器地址"></el-table-column>
+        <el-table-column label="寄存器地址" prop="寄存器地址"></el-table-column>-->
         <el-table-column
             label="最新值"
             prop="pointValue"
@@ -110,6 +110,11 @@
             sortable="custom"
         >
         </el-table-column>
+        <el-table-column v-if="selectable" label="操作" width="90" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="selectPoint(scope.row)">选择</el-button>
+          </template>
+        </el-table-column>
       </el-table>
       <el-pagination
           v-show="tableData.length > 0"
@@ -147,6 +152,7 @@ export default {
         this.pageNum = 1;
         this.totalSize = 0;
         this.dataType = '';
+        this.selectable = false;
         this.form = {
           sortMethod: "desc", //升序不传或者asc、降序desc）
           sortData: this.defaultSort.prop,
@@ -191,9 +197,14 @@ export default {
       pageSize: 10, //分页栏当前每个数据总数
       pageNum: 1, //分页栏当前页数
       totalSize: 0, //table表格数据总数
+      selectable: false
     };
   },
   methods: {
+    selectPoint(row) {
+      this.$emit('select-point', row || {})
+      this.show = false
+    },
     showChart({pointName}) {
       if (pointName) {
         const {deviceCategory, deviceId} = this;
@@ -235,12 +246,13 @@ export default {
         this.getData()
       });
     },
-    showTable({deviceCategory, siteId, deviceId, parentId = ""}, dataType) {
+    showTable({deviceCategory, siteId, deviceId, parentId = ""}, dataType, options = {}) {
       this.dataType = dataType;
       this.deviceCategory = deviceCategory;
       this.siteId = siteId;
       this.deviceId = deviceId;
       this.parentId = deviceCategory === "BATTERY" ? parentId : ""; //只有单体电池需要这个值
+      this.selectable = !!options.selectable
       this.show = true;
       this.getData()
     },

src/views/ems/site/sblb/index.vue

@@ -1,13 +1,6 @@
 <template>
   <div class="ems-dashboard-editor-container" style="background-color: #ffffff" v-loading="loading">
     <el-form :inline="true" class="select-container">
-      <el-form-item label="站点选择">
-        <el-select v-model="siteId" placeholder="请选择换电站名称" :loading="searchLoading" loading-text="正在加载数据"
-                   @change="onSearch" clearable>
-          <el-option :label="item.siteName" :value="item.siteId" v-for="(item,index) in siteList"
-                     :key="index+'zdxeSelect'"></el-option>
-        </el-select>
-      </el-form-item>
       <el-form-item label="设备类型">
         <el-select v-model="deviceCategory" placeholder="请选择设备类型" @change="onSearch" clearable>
           <el-option
@@ -24,34 +17,6 @@
       </el-form-item>
     </el-form>
     <el-button type="primary" @click="addDevice" native-type="button">新增设备</el-button>
-    <!--    <el-dropdown @command="(val)=>downloadPointDetail(val,false)">-->
-    <!--      <el-button-->
-    <!--          style="margin-left:10px;"-->
-    <!--          type="primary"-->
-    <!--          plain>-->
-    <!--        下载点位清单-->
-    <!--      </el-button>-->
-    <!--      <el-dropdown-menu slot="dropdown">-->
-    <!--        <el-dropdown-item v-for="(item,index) in deviceCategoryList" :key="index+'deviceCategoryList'"-->
-    <!--                          :command="item">-->
-    <!--          {{ item.name }}-->
-    <!--        </el-dropdown-item>-->
-    <!--      </el-dropdown-menu>-->
-    <!--    </el-dropdown>-->
-    <!--    <el-dropdown @command="(val)=>uploadPointDetail(val,false)">-->
-    <!--      <el-button-->
-    <!--          style="margin-left:10px;"-->
-    <!--          type="success"-->
-    <!--          plain>-->
-    <!--        上传点位清单-->
-    <!--      </el-button>-->
-    <!--      <el-dropdown-menu slot="dropdown">-->
-    <!--        <el-dropdown-item v-for="(item,index) in deviceCategoryList" :key="index+'deviceCategoryList'"-->
-    <!--                          :command="item">-->
-    <!--          {{ item.name }}-->
-    <!--        </el-dropdown-item>-->
-    <!--      </el-dropdown-menu>-->
-    <!--    </el-dropdown>-->
     <el-table
         class="common-table"
         :data="tableData"
@@ -62,10 +27,6 @@
           prop="siteId"
           label="站点ID">
       </el-table-column>
-      <el-table-column
-          prop="siteName"
-          label="站点名称">
-      </el-table-column>
       <el-table-column
           prop="deviceId"
           label="设备ID"
@@ -79,52 +40,11 @@
           prop="categoryName"
           label="设备类别">
       </el-table-column>
-      <el-table-column
-          prop="deviceStatus"
-          label="在线状态">
-        <template slot-scope="scope">
-          <span>{{ $store.state.ems.deviceStatusOptions[scope.row.deviceStatus] }}</span>
-          <pcs-switch v-if="scope.row.deviceCategory === 'PCS' && ![null,'',undefined].includes(scope.row.deviceStatus)"
-                      style="margin-left:5px;"
-                      :data="{siteId:scope.row.siteId,deviceStatus:scope.row.deviceStatus,deviceId:scope.row.deviceId,deviceName:scope.row.deviceName}"
-                      @updateSuccess="getData"/>
-        </template>
-      </el-table-column>
       <el-table-column
           fixed="right"
           label="操作"
-          width="250">
+          width="180">
         <template slot-scope="scope">
-          <el-button
-              @click="pointDetail(scope.row,'point')"
-              type="primary"
-              size="mini">
-            点位清单
-          </el-button>
-          <el-button
-              @click="pointDetail(scope.row,'alarmPoint')"
-              type="primary"
-              size="mini">
-            报警点位清单
-          </el-button>
-          <br>
-          <el-button
-              @click="downloadPointDetail(scope.row,true)"
-              style="margin-top:10px;"
-              type="primary"
-              plain
-              size="mini">
-            下载点位清单
-          </el-button>
-          <el-button
-              @click="uploadPointDetail(scope.row,true)"
-              style="margin-top:10px;"
-              type="success"
-              plain
-              size="mini">
-            上传点位清单
-          </el-button>
-          <br>
           <el-button
               @click="editDevice(scope.row)"
               style="margin-top:10px;"
@@ -167,32 +87,46 @@
       </div>
     </el-dialog>
     <add-device ref="addDevice" :mode="mode" :id="editDeviceId" @update="getData" @clear="clearEditDeviceData"/>
-    <point-table ref="pointTable"/>
-    <point-upload ref="pointUpload" @update="getData"/>
   </div>
 </template>
 
 <script>
 import {deleteService, getDeviceDetailInfo, getDeviceInfoList} from '@/api/ems/site'
-import {getAllSites} from '@/api/ems/zddt'
 import {formatNumber} from "@/filters/ems";
 import {getAllDeviceCategory} from '@/api/ems/search'
-import PointTable from './PointTable.vue'
 import AddDevice from "./AddDevice.vue";
-import PointUpload from "./PointUpload.vue";
-import PcsSwitch from "./PcsSwitch.vue";
 
 export default {
   name: "Sblb",
-  components: {AddDevice, PointTable, PointUpload, PcsSwitch},
+  components: {AddDevice},
+  watch: {
+    '$route.query.siteId'(newSiteId) {
+      const normalizedSiteId = this.hasValidSiteId(newSiteId) ? String(newSiteId).trim() : ''
+      if (normalizedSiteId === this.siteId) {
+        return
+      }
+      this.siteId = normalizedSiteId
+      this.onSearch()
+    },
+    '$route.query.siteName'(newSiteName) {
+      const normalizedSiteName = this.getSelectedSiteName(newSiteName)
+      if (normalizedSiteName === this.selectedSiteName) {
+        return
+      }
+      this.selectedSiteName = normalizedSiteName
+      this.tableData = (this.tableData || []).map(item => ({
+        ...item,
+        siteName: normalizedSiteName
+      }))
+    }
+  },
   data() {
     return {
       loading: false,
-      searchLoading: false,
       mode: '',//新增、编辑设备
       editDeviceId: '',//编辑设备id
       siteId: '',
-      siteList: [],
+      selectedSiteName: '',
       deviceCategory: '',//搜索栏设备类型
       deviceCategoryList: [],//设备类别
       tableData: [],
@@ -224,38 +158,26 @@ export default {
     }
   },
   methods: {
+    hasValidSiteId(siteId) {
+      return !!(siteId !== undefined && siteId !== null && String(siteId).trim())
+    },
+    getSelectedSiteName(routeSiteName) {
+      const name = routeSiteName === undefined || routeSiteName === null ? '' : String(routeSiteName).trim()
+      if (name) {
+        return name
+      }
+      const matchedSite = (this.$store.getters.zdList || []).find(item => item.siteId === this.siteId)
+      if (matchedSite && matchedSite.siteName) {
+        return matchedSite.siteName
+      }
+      return this.siteId || ''
+    },
     // 获取设备类别
     getDeviceCategoryList() {
       getAllDeviceCategory().then(response => {
         this.deviceCategoryList = response?.data || []
       })
     },
-    // 查看设备电位表格
-    pointDetail(row, dataType) {
-      this.$refs.pointTable.showTable(row, dataType)
-    },
-    // 下载点位清单
-    downloadPointDetail(command, isDetail = false) {
-      const siteId = isDetail ? command.siteId : this.siteId
-      const deviceCategory = isDetail ? command.deviceCategory : command.code
-      const categoryName = isDetail ? command.categoryName : command.name
-      const deviceId = isDetail ? command.deviceId : null
-      console.log('下载', command, isDetail)
-      this.download('ems/pointMatch/export', {
-        siteId,
-        deviceCategory,
-        deviceId,
-      }, `点位清单_${categoryName}_${new Date().getTime()}.xlsx`)
-    },
-    // 上传点位清单
-    uploadPointDetail(command, isDetail = false) {
-      const siteId = isDetail ? command.siteId : this.siteId
-      const deviceCategory = isDetail ? command.deviceCategory : command.code
-      const categoryName = isDetail ? command.categoryName : command.name
-      const deviceId = isDetail ? command.deviceId : ''
-      console.log('上传', command, isDetail)
-      this.$refs.pointUpload.showDialog({siteId, deviceCategory, categoryName, deviceId})
-    },
     clearEditDeviceData() {
       this.mode = '';
       this.editDeviceId = ''
@@ -356,31 +278,24 @@ export default {
       this.loading = true
       const {siteId, deviceCategory, pageNum, pageSize} = this
       getDeviceInfoList({siteId, deviceCategory, pageNum, pageSize}).then(response => {
-        this.tableData = response?.rows || [];
+        const selectedSiteName = this.getSelectedSiteName(this.$route.query.siteName)
+        this.selectedSiteName = selectedSiteName
+        this.tableData = (response?.rows || []).map(item => ({
+          ...item,
+          siteName: selectedSiteName
+        }));
         this.totalSize = response?.total || 0
       }).finally(() => {
         this.loading = false
       })
-    },
-    //获取站点列表
-    getZdList() {
-      this.searchLoading = true
-      return getAllSites().then(response => {
-        this.siteList = response?.data || []
-        if (this.siteList.length > 0) this.siteId = this.siteList[0].siteId
-      }).finally(() => {
-        this.searchLoading = false
-      })
     }
   },
   mounted() {
-    this.loading = true
+    this.siteId = this.hasValidSiteId(this.$route.query.siteId) ? String(this.$route.query.siteId).trim() : ''
-    this.siteId = ''
+    this.selectedSiteName = this.getSelectedSiteName(this.$route.query.siteName)
     this.pageNum = 1//每次搜索从1开始搜索
     this.getDeviceCategoryList()
-    this.getZdList().then(() => {
+    this.getData()
-      this.getData()
-    })
   }
 }
 </script>

src/views/ems/site/zdlb/index.vue

@@ -1,4 +1,3 @@
-
 <template>
   <div class="ems-dashboard-editor-container" style="background-color: #ffffff" v-loading="loading">
     <el-form :inline="true" class="select-container">
@@ -24,6 +23,7 @@
       <el-form-item>
         <el-button type="primary" @click="onSearch" native-type="button">搜索</el-button>
         <el-button @click="onReset" native-type="button">重置</el-button>
+        <el-button type="success" @click="openAddDialog" native-type="button">新增站点</el-button>
       </el-form-item>
     </el-form>
     <el-table
@@ -40,6 +40,10 @@
         prop="siteName"
         label="站点名称">
       </el-table-column>
+      <el-table-column
+        prop="siteShortName"
+        label="站点简称">
+      </el-table-column>
       <el-table-column
         prop="siteAddress"
         label="站点地址"
@@ -57,6 +61,21 @@
         prop="installCapacity"
         label="装机容量">
       </el-table-column>
+      <el-table-column
+        label="操作"
+        width="220"
+        fixed="right">
+        <template slot-scope="scope">
+          <el-button type="text" size="small" @click="openEditDialog(scope.row)">编辑</el-button>
+          <el-button
+            type="text"
+            size="small"
+            :loading="syncingSiteId === scope.row.siteId"
+            :disabled="syncingSiteId === scope.row.siteId"
+            @click="syncWeather(scope.row)"
+          >同步天气</el-button>
+        </template>
+      </el-table-column>
     </el-table>
     <el-pagination
       v-show="tableData.length>0"
@@ -71,67 +90,250 @@
       style="margin-top:15px;text-align: center"
     >
     </el-pagination>
+
+    <el-dialog
+      :title="isEdit ? '编辑站点' : '新增站点'"
+      :visible.sync="dialogVisible"
+      width="640px"
+      :close-on-click-modal="false">
+      <el-form ref="siteForm" :model="siteForm" :rules="siteRules" label-width="100px">
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="站点ID" prop="siteId">
+              <el-input v-model.trim="siteForm.siteId" :disabled="isEdit" placeholder="仅支持字母/数字/下划线" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="站点名称" prop="siteName">
+              <el-input v-model.trim="siteForm.siteName" placeholder="请输入站点名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="站点简称" prop="siteShortName">
+              <el-input v-model.trim="siteForm.siteShortName" placeholder="请输入站点简称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="运营时间" prop="runningTime">
+              <el-date-picker
+                v-model="siteForm.runningTime"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="请选择运营时间"
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="站点地址" prop="siteAddress">
+              <el-input v-model.trim="siteForm.siteAddress" placeholder="请输入站点地址" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="装机功率" prop="installPower">
+              <el-input v-model="siteForm.installPower" placeholder="请输入装机功率" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="装机容量" prop="installCapacity">
+              <el-input v-model="siteForm.installCapacity" placeholder="请输入装机容量" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="纬度" prop="latitude">
+              <el-input v-model="siteForm.latitude" placeholder="请输入纬度" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="经度" prop="longitude">
+              <el-input v-model="siteForm.longitude" placeholder="请输入经度" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model.trim="siteForm.remark" type="textarea" :rows="3" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" :loading="submitLoading" @click="submitSite">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import {getSiteInfoList} from '@/api/ems/site'
+import {addSite, getSiteInfoList, syncSiteWeatherByDateRange, updateSite} from '@/api/ems/site'
 import { formatDate } from '@/filters/ems'
+
+const emptySiteForm = () => ({
+  id: undefined,
+  siteId: '',
+  siteName: '',
+  siteShortName: '',
+  siteAddress: '',
+  runningTime: '',
+  installPower: '',
+  installCapacity: '',
+  latitude: '',
+  longitude: '',
+  remark: ''
+})
+
 export default {
-  name: "Zdlb",
+  name: 'Zdlb',
   data() {
     return {
-      loading:false,
+      loading: false,
-      siteName:"",
+      submitLoading: false,
-      pickerOptions:{
+      siteName: '',
+      pickerOptions: {
         disabledDate(time) {
           return time.getTime() > Date.now();
         },
       },
-      defaultDateRange:[],//默认展示的时间
+      defaultDateRange: [],
-      dateRange:[],//startTime,endTime
+      dateRange: [],
-      tableData:[],
+      tableData: [],
-      pageSize:10,//分页栏当前每个数据总数
+      pageSize: 10,
-      pageNum:1,//分页栏当前页数
+      pageNum: 1,
-      totalSize:0,//table表格数据总数
+      totalSize: 0,
+      syncingSiteId: '',
+      dialogVisible: false,
+      isEdit: false,
+      siteForm: emptySiteForm(),
+      siteRules: {
+        siteId: [
+          { required: true, message: '请输入站点ID', trigger: 'blur' },
+          { pattern: /^[A-Za-z0-9_]+$/, message: '站点ID仅支持字母、数字、下划线', trigger: 'blur' }
+        ],
+        siteName: [
+          { required: true, message: '请输入站点名称', trigger: 'blur' }
+        ],
+        runningTime: [
+          { required: true, message: '请选择运营时间', trigger: 'change' }
+        ]
+      }
     }
   },
-  methods:{
+  methods: {
-    // 分页
     handleSizeChange(val) {
       this.pageSize = val;
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         this.getData()
       })
     },
     handleCurrentChange(val) {
       this.pageNum = val
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         this.getData()
       })
     },
-    // 搜索
+    onSearch() {
-    onSearch(){
+      this.pageNum = 1
-      this.pageNum =1//每次搜索从1开始搜索
       this.getData()
     },
-    // 重置
+    onReset() {
-    onReset(){
+      this.siteName = ''
-      this.siteName=''
+      this.dateRange = []
-      this.dateRange=[]
+      this.pageNum = 1
-      this.pageNum =1//每次搜索从1开始搜索
       this.getData()
     },
-    // 获取数据
+    getSyncDateRange() {
-    getData(){
+      const now = new Date()
-      this.loading=true
+      const monthStart = new Date(now.getFullYear(), now.getMonth(), 1)
-      const {siteName,pageNum,pageSize} =this
+      return [formatDate(monthStart), formatDate(now)]
-      const [startTime='',endTime='']=(this.dateRange || [])
+    },
-      getSiteInfoList({siteName,pageSize,pageNum,startTime:formatDate(startTime),endTime:formatDate(endTime)}).then(response => {
+    syncWeather(row) {
-        this.tableData=response?.rows || [];
+      const siteId = row?.siteId
+      if (!siteId) {
+        this.$message.warning('站点ID为空，无法同步天气')
+        return
+      }
+      const [startTime, endTime] = this.getSyncDateRange()
+      this.$confirm(`将同步站点 ${siteId} 在 ${startTime} 至 ${endTime} 的天气数据，是否继续？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.syncingSiteId = siteId
+        return syncSiteWeatherByDateRange({siteId, startTime, endTime})
+      }).then((response) => {
+        const result = response?.data || {}
+        const successDays = result.successDays ?? 0
+        const totalDays = result.totalDays ?? 0
+        this.$message.success(`天气同步完成（${successDays}/${totalDays}天）`)
+      }).catch((err) => {
+        if (err !== 'cancel') {
+          this.$message.error('天气同步失败')
+        }
+      }).finally(() => {
+        this.syncingSiteId = ''
+      })
+    },
+    getData() {
+      this.loading = true
+      const {siteName, pageNum, pageSize} = this
+      const [startTime = '', endTime = ''] = (this.dateRange || [])
+      getSiteInfoList({siteName, pageSize, pageNum, startTime: formatDate(startTime), endTime: formatDate(endTime)}).then(response => {
+        this.tableData = response?.rows || [];
         this.totalSize = response?.total || 0
-      }).finally(() => {this.loading=false})
+      }).finally(() => {
+        this.loading = false
+      })
     },
+    openAddDialog() {
+      this.isEdit = false
+      this.siteForm = emptySiteForm()
+      this.dialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.siteForm && this.$refs.siteForm.clearValidate()
+      })
+    },
+    openEditDialog(row) {
+      this.isEdit = true
+      this.siteForm = {
+        id: row.id,
+        siteId: row.siteId || '',
+        siteName: row.siteName || '',
+        siteShortName: row.siteShortName || '',
+        siteAddress: row.siteAddress || '',
+        runningTime: row.runningTime || '',
+        installPower: row.installPower || '',
+        installCapacity: row.installCapacity || '',
+        latitude: row.latitude || '',
+        longitude: row.longitude || '',
+        remark: row.remark || ''
+      }
+      this.dialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.siteForm && this.$refs.siteForm.clearValidate()
+      })
+    },
+    submitSite() {
+      this.$refs.siteForm.validate(valid => {
+        if (!valid) {
+          return
+        }
+        this.submitLoading = true
+        const request = this.isEdit ? updateSite : addSite
+        request(this.siteForm).then(() => {
+          this.$message.success(this.isEdit ? '编辑成功' : '新增成功')
+          this.dialogVisible = false
+          this.getData()
+        }).finally(() => {
+          this.submitLoading = false
+        })
+      })
+    }
   },
   mounted() {
     this.onReset()

src/views/ems/zddt/MapChart.vue

@@ -1,95 +1,188 @@
-
 <template>
-  <div id="zddtChart" style="height: 100%;width:100%"></div>
+  <div class="map-wrapper">
+    <div ref="mapRef" class="map-canvas"></div>
+    <div v-if="selectedAddress" class="map-center-address">{{ selectedAddress }}</div>
+    <div v-if="!hasPoint" class="map-empty">暂无站点坐标</div>
+  </div>
 </template>
 
 <script>
-import * as echarts from 'echarts'
+const TDT_SCRIPT_ID = 'tianditu-js-sdk'
-import resize from '@/mixins/ems/resize'
+let tdtScriptLoading = null
-import china from '@/data/ems/china.json'//中国地图数据
+
-import 'echarts/lib/chart/map';
+function loadTdtScript(tk) {
-echarts.registerMap('china', { geoJSON: china }); //注册可用地图
+  if (window.T) return Promise.resolve(window.T)
+  if (tdtScriptLoading) return tdtScriptLoading
+  tdtScriptLoading = new Promise((resolve, reject) => {
+    const oldScript = document.getElementById(TDT_SCRIPT_ID)
+    if (oldScript) {
+      oldScript.addEventListener('load', () => resolve(window.T))
+      oldScript.addEventListener('error', () => reject(new Error('天地图脚本加载失败')))
+      return
+    }
+    const script = document.createElement('script')
+    script.id = TDT_SCRIPT_ID
+    script.src = `https://api.tianditu.gov.cn/api?v=4.0&tk=${tk}`
+    script.async = true
+    script.onload = () => {
+      if (window.T) resolve(window.T)
+      else reject(new Error('天地图对象未初始化'))
+    }
+    script.onerror = () => reject(new Error('天地图脚本加载失败'))
+    document.body.appendChild(script)
+  })
+  return tdtScriptLoading
+}
 
 export default {
-  mixins: [resize],
   data() {
     return {
-      chart: null,
+      hasPoint: false,
+      selectedAddress: '',
+      map: null,
+      overlays: [],
+      pendingPayload: null,
+      mapConfig: {
+        zoom: 12,
+        selectedZoom: 15,
+        tk: '01e99ab4472430e1c7dbfe4b5db99787'
+      }
     }
   },
   mounted() {
-    this.$nextTick(() => {
+    this.initMap()
-      this.initChart()
-    })
   },
   beforeDestroy() {
-    if (!this.chart) {
+    this.clearOverlays()
-      return
+    this.map = null
-    }
-    this.chart.dispose()
-    this.chart = null
   },
   methods: {
-    initChart() {
+    async initMap() {
-      // ECharts 默认有提供了一个简单的加载动画。只需要调用 showLoading 方法显示。数据加载完成后再调用 hideLoading 方法隐藏加载动画。
+      try {
-      this.chart = echarts.init(document.querySelector('#zddtChart'))
+        await loadTdtScript(this.mapConfig.tk)
+        if (!this.$refs.mapRef || !window.T) return
+        this.map = new window.T.Map(this.$refs.mapRef)
+        const defaultCenter = new window.T.LngLat(104.1, 35.9)
+        this.map.centerAndZoom(defaultCenter, 5)
+        if (this.pendingPayload) {
+          this.renderPayload(this.pendingPayload)
+        }
+      } catch (e) {
+        // 页面可继续使用，地图只显示空态
+        this.hasPoint = false
+      }
     },
-    setOption(data) {
+    normalizePoint(site = {}) {
-      this.chart.setOption({
+      const name = site.siteName || site.name || ''
-        color:['#FFBD00'],
+      const address = site.siteAddress || site.address || ''
-        backgroundColor: 'transparent', //背景色
+      const value = site.value || site.siteLocation || []
-        geo: { //地理坐标系组件   地理坐标系组件用于地图的绘制，支持在地理坐标系上绘制
+      const lonSource = site.longitude !== undefined && site.longitude !== null ? site.longitude : value[0]
-          map: 'china', //地图类型  这儿展示的是中国地图
+      const latSource = site.latitude !== undefined && site.latitude !== null ? site.latitude : value[1]
-          aspectScale: 0.85,
+      const lon = Number(lonSource)
-          selectedMode: "single",// 开启单选
+      const lat = Number(latSource)
-          label: {
+      if (!lon || !lat) return null
-            show: true, //是否显示标签  此处指是否显示地图上的地区名字
+      return { name, address, lon, lat }
-            color: '#ffffff',
+    },
-            fontSize: 12
+    clearOverlays() {
-          },
+      if (!this.map || !this.overlays.length) return
-          roam: true, //是否开启鼠标缩放和平移漫游
+      this.overlays.forEach(item => this.map.removeOverLay(item))
-          itemStyle: {
+      this.overlays = []
-            areaColor: "#03365b",
+    },
-            borderColor: "#4bf3f9",
+    renderPayload(payload = {}) {
-            shadowColor: '#03365b', //阴影颜色
+      const isArrayPayload = Array.isArray(payload)
-            shadowOffsetX: 0, //阴影偏移量
+      const selectedRaw = isArrayPayload ? ((payload || [])[0] || {}) : (payload.selected || {})
-            shadowOffsetY: 0, //阴影偏移量
+      const sitesRaw = isArrayPayload ? [] : (payload.sites || [])
-          },
+      const selected = this.normalizePoint(selectedRaw)
-          emphasis: {
+      const points = (Array.isArray(sitesRaw) ? sitesRaw : [])
-            label: {
+        .map(item => this.normalizePoint(item))
-              show: true,
+        .filter(Boolean)
-              color: '#ffffff',
+      this.selectedAddress = selected?.address || ''
-            },
+      if (selected && !points.find(item => item.lon === selected.lon && item.lat === selected.lat)) {
-            itemStyle: {
+        points.push(selected)
-              areaColor: "#0f5d9d",
+      }
-            }
+      this.clearOverlays()
-          }
+      this.hasPoint = points.length > 0
-        },
+      if (!this.map || !points.length || !window.T) return
-        series: [
+
-          {
+      const viewPoints = []
-            type: "effectScatter",
+      points.forEach(item => {
-            coordinateSystem: "geo",
+        const lngLat = new window.T.LngLat(item.lon, item.lat)
-            showEffectOn: "render",
+        const marker = new window.T.Marker(lngLat)
-            data,
+        this.map.addOverLay(marker)
-            rippleEffect: {
+        this.overlays.push(marker)
-              brushType: "stroke",
+        viewPoints.push(lngLat)
-              scale: 5,
-              period: 2, // 秒数
-            },
-            symbolSize: 12,
-            clickable: false,
-            zlevel: 1,
-            label: {
-              formatter: "{b}",
-              position: "right",
-              show: true,
-            },
-          }
-        ]
       })
+
+      if (selected && selected.name) {
+        const label = new window.T.Label({
+          text: selected.name,
+          position: new window.T.LngLat(selected.lon, selected.lat),
+          offset: new window.T.Point(8, -34)
+        })
+        this.map.addOverLay(label)
+        this.overlays.push(label)
+      }
+
+      if (selected) {
+        this.map.centerAndZoom(new window.T.LngLat(selected.lon, selected.lat), this.mapConfig.selectedZoom)
+      } else if (viewPoints.length === 1) {
+        this.map.centerAndZoom(viewPoints[0], this.mapConfig.zoom)
+      } else {
+        this.map.setViewport(viewPoints)
+      }
+    },
+    setOption(payload = {}) {
+      this.pendingPayload = payload
+      if (!this.map) return
+      this.renderPayload(payload)
     }
   }
 }
-
-
 </script>
+
+<style scoped lang="scss">
+.map-wrapper {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  min-height: 0;
+  border-radius: 8px;
+  overflow: hidden;
+  background: #f5f7fa;
+}
+
+.map-canvas {
+  width: 100%;
+  height: 100%;
+}
+
+.map-empty {
+  position: absolute;
+  inset: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #909399;
+  font-size: 14px;
+  background: rgba(245, 247, 250, 0.9);
+  pointer-events: none;
+}
+
+.map-center-address {
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, calc(-50% - 26px));
+  max-width: min(70%, 520px);
+  padding: 8px 12px;
+  border-radius: 6px;
+  font-size: 12px;
+  line-height: 18px;
+  color: #ffffff;
+  background: rgba(0, 0, 0, 0.65);
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.25);
+  text-align: center;
+  pointer-events: none;
+  z-index: 10;
+}
+</style>

src/views/ems/zddt/index.vue

@@ -1,33 +1,55 @@
 <template>
   <div class="ems-dashboard-editor-container" v-loading="loading">
     <zd-info></zd-info>
-    <div class="ems-content-container ">
+    <div class="ems-content-container">
       <div class="map-container">
-        <map-chart ref="mapChart"/>
+        <div class="site-cards-wrapper" v-if="allSites.length > 0">
-      </div>
+          <button
-      <div class="zd-msg-container">
+            class="site-cards-arrow site-cards-arrow--left"
-        <div class="zd-msg-top">
+            type="button"
-          <zd-select ref="zdSelect" @submitSite="submitSite"></zd-select>
+            :disabled="!canScrollLeft"
-          <el-card class="common-card-container">
+            @click="scrollSiteCards('left')"
-            <div slot="header">
+          >
-              <span class="card-title">基本信息</span>
+            <i class="el-icon-arrow-left"></i>
-              <el-button style="float: right; padding: 3px 0" type="text" size="small" @click="toDzjk">查看详情</el-button>
+          </button>
+          <div ref="siteCards" class="site-cards" @scroll="updateScrollButtons">
+            <div
+              v-for="item in allSites"
+              :key="item.siteId"
+              class="site-card"
+              :class="{ active: isSameSite(item.siteId, singleSiteId) }"
+              @click="submitSite(item.siteId)"
+            >
+              <div class="site-card-name">{{ item.siteName || '-' }}</div>
+              <div class="site-card-info-row">
+                <span class="site-card-label">电站位置</span>
+                <span class="site-card-value site-card-value--address">{{ formatSiteCardField(item.siteAddress) }}</span>
+              </div>
+              <div class="site-card-info-row">
+                <span class="site-card-label">投运时间</span>
+                <span class="site-card-value">{{ formatSiteCardDate(item.runningTime) }}</span>
+              </div>
+              <div class="site-card-info-row">
+                <span class="site-card-label">装机功率(MWh)</span>
+                <span class="site-card-value">{{ formatSiteCardField(item.installPower) }}</span>
+              </div>
+              <div class="site-card-info-row">
+                <span class="site-card-label">装机容量(MWh)</span>
+                <span class="site-card-value">{{ formatSiteCardField(item.installCapacity) }}</span>
+              </div>
             </div>
-            <div class="single-zd-name">{{singleSiteName}}</div>
+          </div>
-<!--      四个方块-->
+          <button
-            <el-row :gutter="14">
+            class="site-cards-arrow site-cards-arrow--right"
-              <el-col :span="12"  class="single-square-box-container" v-for="(item,index) in singleZdSqaure" :key="index+'singleSquareBox'">
+            type="button"
-                <single-square-box :data="item"></single-square-box>
+            :disabled="!canScrollRight"
-              </el-col>
+            @click="scrollSiteCards('right')"
-            </el-row>
+          >
- <!--     基本信息     -->
+            <i class="el-icon-arrow-right"></i>
-            <el-descriptions class="single-zd-info-container" :column="1" >
+          </button>
-              <el-descriptions-item  v-for="(item,index) in singleZdInfo" :key="index+'singleZdInfo'" :label="item.title">{{item.value | formatNumber }}</el-descriptions-item>
+        </div>
-            </el-descriptions>
+        <div class="map-view">
-<!--      echarts柱状图-->
+          <map-chart ref="mapChart"/>
-          <bar-chart ref="barChart"></bar-chart>
-          </el-card>
-
         </div>
       </div>
     </div>
@@ -36,94 +58,103 @@
 
 <script>
 import ZdInfo from '@/components/Ems/ZdBaseInfo/index.vue'
-import ZdSelect from '@/components/Ems/ZdSelect/index.vue'
-import SingleSquareBox from '@/components/Ems/SingleSquareBox/index.vue'
-import BarChart from './BarChart.vue'
 import MapChart from './MapChart.vue'
-import {getSingleSiteBaseInfo} from '@/api/ems/zddt'
+import { getAllSites } from '@/api/ems/zddt'
 export default {
-  components:{ZdSelect,ZdInfo,SingleSquareBox,BarChart,MapChart},
+  components: { ZdInfo, MapChart },
   data() {
     return {
-      loading:false,
+      loading: false,
-      singleSiteId:'',
+      singleSiteId: '',
-      singleSiteName:'',
+      singleSiteName: '',
-      singleSiteLocation:[],
+      singleSiteAddress: '',
-      // 单个电站 四个方块数据
+      singleSiteLocation: [],
-      singleZdSqaure:[
+      allSites: [],
-        {
+      canScrollLeft: false,
-          title:'今日充电（kWh）',
+      canScrollRight: false
-          value:'',
-          bgColor:'#FFE5E5',
-          attr:'dayChargedCap'
-        },{
-          title:'累计充电（kWh）',
-          value:'',
-          bgColor:'#FFE5E5',
-          attr:'totalChargedCap'
-        },{
-          title:'今日放电（kWh）',
-          value:'',
-          bgColor:'#EEEBFF',
-          attr:'dayDisChargedCap'
-        },{
-          title:'累计放电（kWh）',
-          value:'',
-          bgColor:'#EEEBFF',
-          attr:'totalDisChargedCap'
-        }
-      ],
-
-    //   单个电站 基本信息
-      singleZdInfo:[{
-        title:'电站位置',
-        value:'',
-        attr:'siteAddress'
-      },{
-        title:'投运时间',
-        value:'',
-        attr:'runningTime'
-      },{
-        title:'装机功率(MW)',
-        value:'',
-        attr:'installPower'
-      },{
-        title:'装机容量(MW)',
-        value:'',
-        attr:'installCapacity',
-      }]
     }
   },
+  mounted() {
+    this.loadSites()
+    window.addEventListener('resize', this.updateScrollButtons)
+  },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.updateScrollButtons)
+  },
   methods:{
+    isSameSite(siteId, selectedId) {
+      return String(siteId) === String(selectedId)
+    },
+    formatSiteCardField(value) {
+      if (value === null || value === undefined || value === '') {
+        return '-'
+      }
+      return value
+    },
+    formatSiteCardDate(value) {
+      if (!value) {
+        return '-'
+      }
+      const text = String(value)
+      if (text.includes('T')) {
+        return text.slice(0, 10)
+      }
+      return text.length > 10 ? text.slice(0, 10) : text
+    },
+    loadSites() {
+      this.loading = true
+      getAllSites().then(response => {
+        this.allSites = response?.data || []
+        if (this.allSites.length > 0) {
+          this.submitSite(this.allSites[0].siteId)
+        } else {
+          this.updateMapMarkers()
+        }
+        this.$nextTick(() => {
+          this.updateScrollButtons()
+        })
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    updateScrollButtons() {
+      const container = this.$refs.siteCards
+      if (!container) {
+        this.canScrollLeft = false
+        this.canScrollRight = false
+        return
+      }
+      const maxScrollLeft = container.scrollWidth - container.clientWidth
+      this.canScrollLeft = container.scrollLeft > 0
+      this.canScrollRight = maxScrollLeft > 0 && container.scrollLeft < maxScrollLeft - 1
+    },
+    scrollSiteCards(direction) {
+      const container = this.$refs.siteCards
+      if (!container) {
+        return
+      }
+      const amount = Math.max(container.clientWidth * 0.8, 240)
+      const delta = direction === 'left' ? -amount : amount
+      container.scrollBy({ left: delta, behavior: 'smooth' })
+    },
+    updateMapMarkers(){
+      this.$refs.mapChart && this.$refs.mapChart.setOption({
+        selected: {name:this.singleSiteName,address:this.singleSiteAddress,value:this.singleSiteLocation},
+        sites:this.allSites
+      })
+    },
     // 站点选中
     submitSite(id){
-      if(this.singleSiteId === id){return console.log(`点击搜索按钮 搜索相同的站点id= ${id}不再调用获取基本信息接口`)}
-      this.loading=true
-      console.log('点击搜索按钮 选中的站点id',id)
       this.singleSiteId = id
-      this.$refs.zdSelect.searchLoading = true
+      const currentSite = this.allSites.find(item => this.isSameSite(item.siteId, id)) || {}
-      getSingleSiteBaseInfo(id).then(response => {
+      this.singleSiteName = currentSite.siteName || ''
-        console.log('单个站点详情数据',response)
+      this.singleSiteAddress = currentSite.siteAddress || ''
-        const res = response?.data || {}
+      this.singleSiteLocation = currentSite.siteLocation || []
-        this.singleSiteName = res?.siteName || ''//站点名称
+      if (!this.singleSiteLocation.length) {
-        this.singleSiteLocation = res?.siteLocation || []//站点坐标
+        this.singleSiteLocation = [currentSite.longitude, currentSite.latitude].filter(item => item !== undefined && item !== null)
-        this.singleZdSqaure.forEach(item=>{
+      }
-          item.value =res[item.attr]
+      this.$nextTick(() => {
-        })
+        this.updateMapMarkers()
-        this.singleZdInfo.forEach(item=>{
-          item.value = res[item.attr]
-        })
-        this.$refs.barChart.setOption(res?.sevenDayDisChargeStats || [])
-        this.$refs.mapChart.setOption([{name:this.singleSiteName,value:this.singleSiteLocation}])
-      }).finally(() => {this.$refs.zdSelect.searchLoading = false;this.loading=false})
-    },
-    //跳转单站监控页面
-    toDzjk(){
-      this.$router.push({
-        path:'/dzjk',
-        query:{
-          siteId:this.singleSiteId,
-        }
       })
     }
   },
@@ -134,29 +165,119 @@ export default {
 .ems-content-container{
   display: flex;
   padding:24px;
-  padding-right: 0;
   .map-container{
     flex:auto;
-  }
+    min-width: 0;
-  .zd-msg-container{
+    display: flex;
-    width: 500px;
+    flex-direction: column;
-    padding: 24px;
+    gap: 12px;
-    .single-zd-name{
+    .site-cards-wrapper{
-      font-weight: 500;
+      display: flex;
-      line-height: 23px;
+      align-items: center;
-      color: #FFBD00;
+      gap: 8px;
-      font-size: 16px;
+      .site-cards-arrow{
-      margin-bottom: 24px;
+        width: 28px;
+        height: 28px;
+        border: none;
+        border-radius: 50%;
+        background: #ffffff;
+        box-shadow: 0 0 0 1px #dcdfe6 inset;
+        color: #606266;
+        cursor: pointer;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        flex-shrink: 0;
+        transition: all .2s ease;
+        &:hover:not(:disabled){
+          color: #2b74ff;
+          box-shadow: 0 0 0 1px #2b74ff inset;
+        }
+        &:disabled{
+          cursor: not-allowed;
+          color: #c0c4cc;
+          box-shadow: 0 0 0 1px #ebeef5 inset;
+        }
+      }
     }
-    .single-square-box-container{
+    .site-cards{
-      height: 78px;
+      display: flex;
-      box-sizing: border-box;
+      gap: 10px;
-      margin-bottom: 10px;
+      overflow-x: auto;
+      padding-bottom: 2px;
+      scrollbar-width: none;
+      -ms-overflow-style: none;
+      &::-webkit-scrollbar{
+        display: none;
+      }
+      .site-card{
+        flex: 0 0 360px;
+        height: 166px;
+        border-radius: 8px;
+        background: #ffffff;
+        border: 1px solid #e4e7ed;
+        padding: 10px;
+        box-sizing: border-box;
+        cursor: pointer;
+        transition: all .2s ease;
+        .site-card-name{
+          font-size: 14px;
+          font-weight: 600;
+          color: #303133;
+          line-height: 22px;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+        .site-card-info-row{
+          display: flex;
+          align-items: flex-start;
+          gap: 8px;
+          margin-top: 6px;
+          font-size: 12px;
+          line-height: 18px;
+        }
+        .site-card-label{
+          flex: 0 0 84px;
+          font-size: 12px;
+          color: #909399;
+          white-space: nowrap;
+        }
+        .site-card-value{
+          flex: 1;
+          color: #606266;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+        .site-card-value--address{
+          white-space: normal;
+          word-break: break-all;
+          display: -webkit-box;
+          -webkit-line-clamp: 2;
+          -webkit-box-orient: vertical;
+          text-overflow: unset;
+          min-height: 36px;
+        }
+        &:hover{
+          border-color: #c0d3ff;
+        }
+        &.active{
+          border-color: #2b74ff;
+          box-shadow: 0 0 0 1px rgba(43,116,255,.15) inset;
+          background: #f5f9ff;
+          .site-card-name{
+            color: #2b74ff;
+          }
+          .site-card-value{
+            color: #5f8ee3;
+          }
+        }
+      }
     }
-    .single-zd-info-container{
+    .map-view{
-      font-size: 12px;
+      height: 70vh;
-      margin-top: 10px;
+      min-height: 520px;
-      color:#666666;
     }
   }
 }

src/views/login.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="login">
-    <img :src="loginBg" alt="" srcset="" class="login-bg" />
+    <transition :name="bgTransitionName">
+      <img :key="bgNum" :src="loginBg" alt="" srcset="" class="login-bg" />
+    </transition>
     <el-form
       ref="loginForm"
       :model="loginForm"
@@ -107,6 +109,8 @@ export default {
   data() {
     return {
       bgNum: 1,
+      bgTransitionName: "bg-slide",
+      bgTransitionNames: ["bg-slide", "bg-zoom", "bg-blur"],
       codeUrl: "",
       loginForm: {
         username: "admin",
@@ -148,7 +152,12 @@ export default {
     this.updateInterval(this.updateBgNum, 5000);
   },
   methods: {
+    randomBgTransitionName() {
+      const index = Math.floor(Math.random() * this.bgTransitionNames.length);
+      return this.bgTransitionNames[index];
+    },
     updateBgNum() {
+      this.bgTransitionName = this.randomBgTransitionName();
       if (this.bgNum >= 4) this.bgNum = 0;
       this.bgNum += 1;
     },
@@ -210,6 +219,10 @@ export default {
 
 <style rel="stylesheet/scss" lang="scss">
 .login {
+  position: relative;
+  overflow: hidden;
+  width: 100%;
+  min-height: 100vh;
   padding-left: 180px;
   display: flex;
   justify-content: left;
@@ -224,6 +237,60 @@ export default {
   display: block;
   height: 100%;
   width: 100%;
+  object-fit: cover;
+  object-position: center;
+  backface-visibility: hidden;
+  will-change: opacity, transform, filter;
+}
+.bg-fade-enter-active,
+.bg-fade-leave-active {
+  transition: opacity 0.9s ease, transform 0.9s ease;
+}
+.bg-fade-enter {
+  opacity: 0;
+  transform: scale(1.04);
+}
+.bg-fade-leave-to {
+  opacity: 0;
+  transform: scale(0.98);
+}
+.bg-slide-enter-active,
+.bg-slide-leave-active {
+  transition: opacity 0.85s ease, transform 0.85s ease;
+}
+.bg-slide-enter {
+  opacity: 0;
+  transform: translate3d(3.5%, 0, 0) scale(1.01);
+}
+.bg-slide-leave-to {
+  opacity: 0;
+  transform: translate3d(-3.5%, 0, 0) scale(0.99);
+}
+.bg-zoom-enter-active,
+.bg-zoom-leave-active {
+  transition: opacity 1s ease, transform 1s ease;
+}
+.bg-zoom-enter {
+  opacity: 0;
+  transform: scale(1.08);
+}
+.bg-zoom-leave-to {
+  opacity: 0;
+  transform: scale(0.94);
+}
+.bg-blur-enter-active,
+.bg-blur-leave-active {
+  transition: opacity 0.9s ease, filter 0.9s ease, transform 0.9s ease;
+}
+.bg-blur-enter {
+  opacity: 0;
+  filter: blur(8px);
+  transform: scale(1.02);
+}
+.bg-blur-leave-to {
+  opacity: 0;
+  filter: blur(6px);
+  transform: scale(0.98);
 }
 .login-logo {
   display: block;

src/views/system/user/index.vue

@@ -6,30 +6,39 @@
         <pane size="16">
           <el-col>
             <div class="head-container">
-              <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search" style="margin-bottom: 20px" />
+              <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small"
+                        prefix-icon="el-icon-search" style="margin-bottom: 20px"/>
             </div>
             <div class="head-container">
-              <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current @node-click="handleNodeClick" />
+              <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
+                       :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
+                       @node-click="handleNodeClick"/>
             </div>
           </el-col>
         </pane>
         <!--用户数据-->
         <pane size="84">
           <el-col>
-            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                     label-width="68px">
               <el-form-item label="用户名称" prop="userName">
-                <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
+                <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px"
+                          @keyup.enter.native="handleQuery"/>
               </el-form-item>
               <el-form-item label="手机号码" prop="phonenumber">
-                <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
+                <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px"
+                          @keyup.enter.native="handleQuery"/>
               </el-form-item>
               <el-form-item label="状态" prop="status">
                 <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
-                  <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+                  <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
+                             :value="dict.value"/>
                 </el-select>
               </el-form-item>
               <el-form-item label="创建时间">
-                <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+                <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
+                                range-separator="-" start-placeholder="开始日期"
+                                end-placeholder="结束日期"></el-date-picker>
               </el-form-item>
               <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -39,33 +48,48 @@
 
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
-                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:user:add']">新增</el-button>
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                           v-hasPermi="['system:user:add']">新增
+                </el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['system:user:edit']">修改</el-button>
+                <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+                           v-hasPermi="['system:user:edit']">修改
+                </el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:user:remove']">删除</el-button>
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+                           @click="handleDelete" v-hasPermi="['system:user:remove']">删除
+                </el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['system:user:import']">导入</el-button>
+                <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport"
+                           v-hasPermi="['system:user:import']">导入
+                </el-button>
               </el-col>
               <el-col :span="1.5">
-                <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:user:export']">导出</el-button>
+                <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+                           v-hasPermi="['system:user:export']">导出
+                </el-button>
               </el-col>
               <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
             </el-row>
 
             <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
-              <el-table-column type="selection" width="50" align="center" />
+              <el-table-column type="selection" width="50" align="center"/>
-              <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
+              <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible"/>
-              <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+              <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible"
-              <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+                               :show-overflow-tooltip="true"/>
-              <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+              <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
-              <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+                               :show-overflow-tooltip="true"/>
+              <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible"
+                               :show-overflow-tooltip="true"/>
+              <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber"
+                               v-if="columns[4].visible" width="120"/>
               <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
                 <template slot-scope="scope">
-                  <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+                  <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
+                             @change="handleStatusChange(scope.row)"></el-switch>
                 </template>
               </el-table-column>
               <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
@@ -75,20 +99,30 @@
               </el-table-column>
               <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
                 <template slot-scope="scope" v-if="scope.row.userId !== 1">
-                  <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']">修改</el-button>
+                  <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                  <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">删除</el-button>
+                             v-hasPermi="['system:user:edit']">修改
-                  <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
+                  </el-button>
+                  <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                             v-hasPermi="['system:user:remove']">删除
+                  </el-button>
+                  <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
+                               v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
                     <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
                     <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item command="handleResetPwd" icon="el-icon-key" v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
+                      <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
-                      <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check" v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
+                                        v-hasPermi="['system:user:resetPwd']">重置密码
+                      </el-dropdown-item>
+                      <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
+                                        v-hasPermi="['system:user:edit']">分配角色
+                      </el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
                 </template>
               </el-table-column>
             </el-table>
 
-            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+                        :limit.sync="queryParams.pageSize" @pagination="getList"/>
           </el-col>
         </pane>
       </splitpanes>
@@ -100,36 +134,38 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="用户昵称" prop="nickName">
-              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
+              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="enabledDeptOptions" :show-count="true" placeholder="请选择归属部门" />
+              <treeselect v-model="form.deptId" :options="enabledDeptOptions" :show-count="true"
+                          placeholder="请选择归属部门"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="手机号码" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
+              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
+              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20"
+                        show-password/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -137,14 +173,17 @@
           <el-col :span="12">
             <el-form-item label="用户性别">
               <el-select v-model="form.sex" placeholder="请选择性别">
-                <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+                <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
+                           :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="状态">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">
+                  {{ dict.label }}
+                </el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -153,14 +192,33 @@
           <el-col :span="12">
             <el-form-item label="岗位">
               <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
-                <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId" :disabled="item.status == 1" ></el-option>
+                <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId"
+                           :disabled="item.status == 1"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="角色">
               <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
-                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId" :disabled="item.status == 1"></el-option>
+                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId"
+                           :disabled="item.status == 1"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="归属站点" name="belongSite">
+              <el-select
+                  v-model="form.belongSite"
+                  multiple
+                  collapse-tags
+                  placeholder="请选择"
+                  style="width:100%"
+                  @change="selectBelongSite">
+                <el-option :label="item.siteName" :value="item.siteId" v-for="(item,index) in siteList"
+                           :disabled="item.siteId!== 'all' && (form.belongSite || []).includes('all')"
+                           :key="index+'zdxeSelect'"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -181,15 +239,20 @@
 
     <!-- 用户导入对话框 -->
     <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+                 :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+                 :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
           <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+            <el-checkbox v-model="upload.updateSupport"/>
+            是否更新已经存在的用户数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
+          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+                   @click="importTemplate">下载模板
+          </el-link>
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -201,17 +264,27 @@
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user"
+import {
-import { getToken } from "@/utils/auth"
+  addUser,
+  changeUserStatus,
+  delUser,
+  deptTreeSelect,
+  getUser,
+  listUser,
+  resetUserPwd,
+  updateUser
+} from "@/api/system/user"
+import {getAllSites} from '@/api/ems/zddt'
+import {getToken} from "@/utils/auth"
 import Treeselect from "@riophae/vue-treeselect"
 import "@riophae/vue-treeselect/dist/vue-treeselect.css"
-import { Splitpanes, Pane } from "splitpanes"
+import {Pane, Splitpanes} from "splitpanes"
 import "splitpanes/dist/splitpanes.css"
 
 export default {
   name: "User",
   dicts: ['sys_normal_disable', 'sys_user_sex'],
-  components: { Treeselect, Splitpanes, Pane },
+  components: {Treeselect, Splitpanes, Pane},
   data() {
     return {
       // 遮罩层
@@ -228,6 +301,8 @@ export default {
       total: 0,
       // 用户表格数据
       userList: null,
+      // 站点列表数据
+      siteList: [],
       // 弹出层标题
       title: "",
       // 所有部门树选项
@@ -263,7 +338,7 @@ export default {
         // 是否更新已经存在的用户数据
         updateSupport: 0,
         // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
+        headers: {Authorization: "Bearer " + getToken()},
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + "/system/user/importData"
       },
@@ -278,27 +353,27 @@ export default {
       },
       // 列信息
       columns: [
-        { key: 0, label: `用户编号`, visible: true },
+        {key: 0, label: `用户编号`, visible: true},
-        { key: 1, label: `用户名称`, visible: true },
+        {key: 1, label: `用户名称`, visible: true},
-        { key: 2, label: `用户昵称`, visible: true },
+        {key: 2, label: `用户昵称`, visible: true},
-        { key: 3, label: `部门`, visible: true },
+        {key: 3, label: `部门`, visible: true},
-        { key: 4, label: `手机号码`, visible: true },
+        {key: 4, label: `手机号码`, visible: true},
-        { key: 5, label: `状态`, visible: true },
+        {key: 5, label: `状态`, visible: true},
-        { key: 6, label: `创建时间`, visible: true }
+        {key: 6, label: `创建时间`, visible: true}
       ],
       // 表单校验
       rules: {
         userName: [
-          { required: true, message: "用户名称不能为空", trigger: "blur" },
+          {required: true, message: "用户名称不能为空", trigger: "blur"},
-          { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
+          {min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur'}
         ],
         nickName: [
-          { required: true, message: "用户昵称不能为空", trigger: "blur" }
+          {required: true, message: "用户昵称不能为空", trigger: "blur"}
         ],
         password: [
-          { required: true, message: "用户密码不能为空", trigger: "blur" },
+          {required: true, message: "用户密码不能为空", trigger: "blur"},
-          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' },
+          {min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur'},
-          { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
+          {pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur"}
         ],
         email: [
           {
@@ -313,7 +388,8 @@ export default {
             message: "请输入正确的手机号码",
             trigger: "blur"
           }
-        ]
+        ],
+
       }
     }
   },
@@ -324,6 +400,7 @@ export default {
     }
   },
   created() {
+    this.getZdList()
     this.getList()
     this.getDeptTree()
     this.getConfigKey("sys.user.initPassword").then(response => {
@@ -331,14 +408,37 @@ export default {
     })
   },
   methods: {
+    selectBelongSite(data) {
+      console.log('选中的站点', data)
+      if (data.includes("all")) {
+        this.form.belongSite = ['all']
+        return
+      }
+      if (this.siteList.length && data.length === (this.siteList.length - 1)) {
+        this.form.belongSite = ['all']
+      }
+    },
+    //获取站点列表
+    getZdList() {
+      return getAllSites().then(response => {
+        this.siteList = response?.data || []
+        if (this.siteList.length > 0) {
+          this.siteList.unshift({
+            id: 'all',
+            siteId: "all",
+            siteName: "全部"
+          })
+        }
+      })
+    },
     /** 查询用户列表 */
     getList() {
       this.loading = true
       listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.userList = response.rows
+            this.userList = response.rows
-          this.total = response.total
+            this.total = response.total
-          this.loading = false
+            this.loading = false
-        }
+          }
       )
     },
     /** 查询部门下拉树结构 */
@@ -373,11 +473,11 @@ export default {
     // 用户状态修改
     handleStatusChange(row) {
       let text = row.status === "0" ? "启用" : "停用"
-      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
+      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function () {
         return changeUserStatus(row.userId, row.status)
       }).then(() => {
         this.$modal.msgSuccess(text + "成功")
-      }).catch(function() {
+      }).catch(function () {
         row.status = row.status === "0" ? "1" : "0"
       })
     },
@@ -400,7 +500,8 @@ export default {
         status: "0",
         remark: undefined,
         postIds: [],
-        roleIds: []
+        roleIds: [],
+        belongSite: []
       }
       this.resetForm("form")
     },
@@ -455,6 +556,7 @@ export default {
         this.form = response.data
         this.postOptions = response.posts
         this.roleOptions = response.roles
+        this.$set(this.form, "belongSite", response?.data?.belongSite ? JSON.parse(response.data.belongSite) : [])
         this.$set(this.form, "postIds", response.postIds)
         this.$set(this.form, "roleIds", response.roleIds)
         this.open = true
@@ -475,29 +577,30 @@ export default {
             return "不能包含非法字符：< > \" ' \\\ |"
           }
         },
-      }).then(({ value }) => {
+      }).then(({value}) => {
-          resetUserPwd(row.userId, value).then(response => {
+        resetUserPwd(row.userId, value).then(response => {
-            this.$modal.msgSuccess("修改成功，新密码是：" + value)
+          this.$modal.msgSuccess("修改成功，新密码是：" + value)
-          })
+        })
-        }).catch(() => {})
+      }).catch(() => {
+      })
     },
     /** 分配角色操作 */
-    handleAuthRole: function(row) {
+    handleAuthRole: function (row) {
       const userId = row.userId
       this.$router.push("/system/user-auth/role/" + userId)
     },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm: function () {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.userId != undefined) {
-            updateUser(this.form).then(response => {
+            updateUser({...this.form, belongSite: JSON.stringify(this.form.belongSite)}).then(response => {
               this.$modal.msgSuccess("修改成功")
               this.open = false
               this.getList()
             })
           } else {
-            addUser(this.form).then(response => {
+            addUser({...this.form, belongSite: JSON.stringify(this.form.belongSite)}).then(response => {
               this.$modal.msgSuccess("新增成功")
               this.open = false
               this.getList()
@@ -509,12 +612,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const userIds = row.userId || this.ids
-      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function () {
         return delUser(userIds)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess("删除成功")
-      }).catch(() => {})
+      }).catch(() => {
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -529,8 +633,7 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-      this.download('system/user/importTemplate', {
+      this.download('system/user/importTemplate', {}, `user_template_${new Date().getTime()}.xlsx`)
-      }, `user_template_${new Date().getTime()}.xlsx`)
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
@@ -541,7 +644,7 @@ export default {
       this.upload.open = false
       this.upload.isUploading = false
       this.$refs.upload.clearFiles()
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", {dangerouslyUseHTMLString: true})
       this.getList()
     },
     // 提交上传文件

vue.config.js

@@ -47,7 +47,7 @@ module.exports = {
       // }
       // 当请求前缀是/dev-api时,使用下面的代理
       '/dev-api': {
-        target: 'http://110.40.171.179:8089',
+        target: 'http://localhost:8089',
         changeOrigin: true,
         pathRewrite: {
           '^/dev-api': ''