screen

策略配置:新增放电状态、可输入负数、开始、结束时间组件更换

.env.development

@@ -1,14 +1,15 @@
 # 页面标题
 VUE_APP_TITLE = 上动新能源-EMS管理系统
 
-# 开发环境配置
-ENV = 'development'
-
-# EMS管理系统/开发环境
-VUE_APP_BASE_API = '/dev-api'
-
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 
+# 开发环境配置
+NODE_ENV = 'development'
+
+# EMS管理系统/开发环境
+VUE_APP_BASE_API = '/dev-api'
+
 # EMS管理系统/开发环境 图片拼接地址
 VUE_APP_IMG_URL = '/dev-api'
+

.env.production

@@ -2,10 +2,11 @@
 VUE_APP_TITLE = 上动新能源-EMS管理系统
 
 # 生产环境配置
-ENV = 'production'
+NODE_ENV = 'production'
 
 # EMS管理系统/生产环境
-VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API= 'http://1.15.120.242:8089'
+
+# EMS管理系统/生产环境 图片拼接地址
+VUE_APP_IMG_URL = 'http://1.15.120.242:8089'
 
-# EMS管理系统/生产环境 图片拼接地址 todo baseUrl有变更时 请更新
-VUE_APP_IMG_URL = 'http://110.40.171.179:8089'

.env.staging

@@ -1,12 +1,12 @@
 # 页面标题
 VUE_APP_TITLE = 上动新能源-EMS管理系统
 
-BABEL_ENV = production
-
-NODE_ENV = production
-
 # 测试环境配置
-ENV = 'staging'
+NODE_ENV = 'staging'
 
 # EMS管理系统/测试环境
-VUE_APP_BASE_API = '/stage-api'
+VUE_APP_BASE_API= 'http://110.40.171.179:8089'
+
+# EMS管理系统/测试环境 图片拼接地址
+VUE_APP_IMG_URL = 'http://110.40.171.179:8089'
+

public/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link rel="icon" href="<%= BASE_URL %>logo-icon.png">
     <title><%= webpackConfig.name %></title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 	  <style>

src/api/ems/dzjk.js

@@ -7,6 +7,7 @@ export function getDzjkHomeView(siteId) {
         method: 'get'
     })
 }
+
 //站点首页 冲放曲线
 export function getSevenChargeData({siteId, startDate, endDate}) {
     return request({
@@ -15,6 +16,22 @@ export function getSevenChargeData({siteId,startDate,endDate}) {
     })
 }
 
+// 获取站点包含的设备种类 用来判断单站监控设备监控的菜单栏展示
+export function getSiteAllDeviceCategory(siteId) {
+    return request({
+        url: `/ems/siteConfig/getSiteAllDeviceCategory?siteId=${siteId}`,
+        method: 'get'
+    })
+}
+
+//EMS
+export function getEmsDataList(siteId) {
+    return request({
+        url: `/ems/siteMonitor/getEmsDataList?siteId=${siteId}`,
+        method: 'get',
+    })
+}
+
 //获取pcs、实时运行头部的设备信息
 export function getRunningHeadInfo(siteId) {
     return request({
@@ -22,6 +39,7 @@ export function getRunningHeadInfo(siteId) {
         method: 'get'
     })
 }
+
 //获取pcs列表
 export function getPcsDetailInfo(siteId) {
     return request({
@@ -53,6 +71,7 @@ export function getStackNameList(siteId) {
         method: 'get'
     })
 }
+
 //获取单体电池 电池簇列表数据
 export function getClusterNameList({stackDeviceId, siteId}) {
     return request({
@@ -60,6 +79,7 @@ export function getClusterNameList({stackDeviceId,siteId}) {
         method: 'get'
     })
 }
+
 //单体电池表格数据
 export function getClusterDataInfoList({siteId, stackDeviceId, clusterDeviceId, batteryId, pageSize, pageNum}) {
     return request({
@@ -67,6 +87,7 @@ export function getClusterDataInfoList({siteId, stackDeviceId, clusterDeviceId,b
         method: 'get'
     })
 }
+
 // 单体电池图表
 //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}) {
@@ -84,6 +105,23 @@ export function getCoolingDataList(siteId) {
     })
 }
 
+//获取动环数据
+export function getDhDataList(siteId) {
+    return request({
+        url: `/ems/siteMonitor/getDhDataList?siteId=${siteId}`,
+        method: 'get'
+    })
+}
+
+//获取消防数据
+export function getXfDataList(siteId) {
+    return request({
+        url: `/ems/siteMonitor/getXfDataList?siteId=${siteId}`,
+        method: 'get'
+    })
+}
+
+
 //获取电表数据
 export function getAmmeterDataList(siteId) {
     return request({
@@ -93,13 +131,31 @@ export function getAmmeterDataList(siteId) {
 }
 
 // 故障告警
-export function getAlarmDetailList({status,siteId, deviceId, alarmLevel, alarmStartTime, alarmEndTime,pageSize,pageNum}) {
+export function getAlarmDetailList({
+                                       status,
+                                       siteId,
+                                       deviceId,
+                                       alarmLevel,
+                                       alarmStartTime,
+                                       alarmEndTime,
+                                       pageSize,
+                                       pageNum
+                                   }) {
     return request({
         url: `/ems/siteAlarm/getAlarmDetailList?siteId=${siteId}&status=${status}&deviceId=${deviceId}&alarmLevel=${alarmLevel}&alarmStartTime=${alarmStartTime}&alarmEndTime=${alarmEndTime}&pageSize=${pageSize}&pageNum=${pageNum}`,
         method: 'get'
     })
 }
 
+// 告警生成工单
+export function createTicketNo(data) {
+    return request({
+        url: `/ems/siteAlarm/createTicketNo`,
+        method: 'post',
+        data
+    })
+}
+
 // 概率统计
 //获取概率统计 电量指标接口
 export function getElectricData({siteId, startDate, endDate}) {
@@ -108,6 +164,7 @@ export function getElectricData({siteId,startDate,endDate}) {
         method: 'get'
     })
 }
+
 //获取pcs列表
 export function getPcsNameList(siteId) {
     return request({
@@ -115,6 +172,7 @@ export function getPcsNameList(siteId) {
         method: 'get'
     })
 }
+
 //pcs曲线
 export function getPCSData({siteId, startTime, endTime, dataType}) {
     return request({
@@ -122,6 +180,7 @@ export function getPCSData({siteId,startTime,endTime,dataType}) {
         method: 'get'
     })
 }
+
 //电池堆曲线
 export function getStackData({siteId, startTime, endTime, dataType}) {
     return request({
@@ -129,6 +188,7 @@ export function getStackData({siteId,startTime,endTime,dataType}) {
         method: 'get'
     })
 }
+
 //电池温度
 export function getClusterData({siteId, stackId, clusterId, dateTime, pageNum, pageSize}) {
     return request({
@@ -140,33 +200,37 @@ export function getClusterData({siteId,stackId,clusterId,dateTime,pageNum,pageSi
 
 // 实时运行
 //储能
-export function storagePower(siteId) {
+export function storagePower(siteId, startTime, endTime) {
     return request({
-    url: `/ems/siteMonitor/runningGraph/storagePower?siteId=${siteId}`,
+        url: `/ems/siteMonitor/runningGraph/storagePower?siteId=${siteId}&startDate=${startTime}&endDate=${endTime}`,
         method: 'get'
     })
 }
-//poc平均温度
-export function stackAveTemp(siteId) {
+
+//poc温度
+export function pcsMaxTemp(siteId, startTime, endTime) {
     return request({
-    url: `/ems/siteMonitor/runningGraph/stackAveTemp?siteId=${siteId}`,
+        url: `/ems/siteMonitor/runningGraph/pcsMaxTemp?siteId=${siteId}&startDate=${startTime}&endDate=${endTime}`,
         method: 'get'
     })
 }
+
 // 电池平均soc
-export function batteryAveSoc(siteId) {
+export function batteryAveSoc(siteId, startTime, endTime) {
     return request({
-    url: `/ems/siteMonitor/runningGraph/batteryAveSoc?siteId=${siteId}`,
+        url: `/ems/siteMonitor/runningGraph/batteryAveSoc?siteId=${siteId}&startDate=${startTime}&endDate=${endTime}`,
         method: 'get'
     })
 }
+
 // 电池平均温度
-export function batteryAveTemp(siteId) {
+export function batteryAveTemp(siteId, startTime, endTime) {
     return request({
-    url: `/ems/siteMonitor/runningGraph/batteryAveTemp?siteId=${siteId}`,
+        url: `/ems/siteMonitor/runningGraph/batteryAveTemp?siteId=${siteId}&startDate=${startTime}&endDate=${endTime}`,
         method: 'get'
     })
 }
+
 // 功率曲线
 export function getPowerData({siteId, startDate, endDate}) {
     return request({
@@ -182,14 +246,23 @@ export function getLoadNameList(siteId) {
         method: 'get'
     })
 }
+
 // 电表报表
-export function getAmmeterData({siteId,deviceId,dateTime}) {
+export function getAmmeterData({siteId, startTime, endTime, pageSize, pageNum}) {
     return request({
-    url: `/ems/statsReport/getAmmeterData?siteId=${siteId}&deviceId=${deviceId}&dateTime=${dateTime}`,
+        url: `/ems/statsReport/getAmmeterData?siteId=${siteId}&startTime=${startTime}&endTime=${endTime}&pageSize=${pageSize}&pageNum=${pageNum}`,
         method: 'get'
     })
 }
 
+// 电价报表
+export function getAmmeterRevenueData(data) {
+    return request({
+        url: `/ems/statsReport/getAmmeterRevenueData`,
+        method: 'get',
+        params: data
+    })
+}
 
 //策略列表
 export function strategyRunningList(siteId) {
@@ -198,6 +271,7 @@ export function strategyRunningList(siteId) {
         method: 'get'
     })
 }
+
 //停止策略
 export function stopStrategyRunning(id) {
     return request({
@@ -205,6 +279,7 @@ export function stopStrategyRunning(id) {
         method: 'get'
     })
 }
+
 // 获取所有主策略
 export function getMainStrategyList() {
     return request({
@@ -212,6 +287,7 @@ export function getMainStrategyList() {
         method: 'get'
     })
 }
+
 //获取所有辅助策略
 export function getAuxStrategyList() {
     return request({
@@ -219,6 +295,7 @@ export function getAuxStrategyList() {
         method: 'get'
     })
 }
+
 //配置策略
 export function configStrategy(data) {
     return request({
@@ -236,6 +313,7 @@ export function getTempNameList({siteId,strategyId}) {
         method: 'get',
     })
 }
+
 //获取模板详情
 ///strategy/temp/list?templateId=1
 export function getStrategyTempDetail(templateId) {
@@ -244,6 +322,7 @@ export function getStrategyTempDetail(templateId) {
         method: 'get',
     })
 }
+
 //新增模板
 export function addStrategyTemp(data) {
     return request({
@@ -252,6 +331,7 @@ export function addStrategyTemp(data) {
         data
     })
 }
+
 export function editStrategyTemp(data) {
     return request({
         url: `/strategy/temp`,
@@ -259,6 +339,7 @@ export function editStrategyTemp(data) {
         data
     })
 }
+
 //http://localhost:8089/strategy/temp/{id}
 export function deleteStrategyTemp(id) {
     return request({
@@ -274,6 +355,7 @@ export function timeConfigList({siteId,strategyId}) {
         method: 'get',
     })
 }
+
 //保存时间配置
 // http://localhost:8089/strategy/timeConfig
 export function setTimeConfigList(data) {
@@ -283,6 +365,7 @@ export function setTimeConfigList(data) {
         data
     })
 }
+
 // 策略曲线图
 //http://localhost:8089/strategy/curve/curveList?strategyId=1&siteId=021_FXX_01
 export function curveList({siteId, strategyId}) {

src/api/ems/powerTariff.js

@@ -0,0 +1,42 @@
+import request from '@/utils/request'
+// 新增
+export function addPriceConfig(data) {
+    return request({
+        url: '/ems/energyPriceConfig',
+        method: 'post',
+        data
+    })
+}
+
+//修改
+export function editPriceConfig(data) {
+    return request({
+        url: '/ems/energyPriceConfig',
+        method: 'put',
+        data
+    })
+}
+
+//删除
+export function energyPriceConfig(id) {
+    return request({
+        url: `/ems/energyPriceConfig/${id}`,
+        method: 'DELETE',
+    })
+}
+//详情
+export function detailPriceConfig(id) {
+    return request({
+        url: `/ems/energyPriceConfig/${id}`,
+        method: 'get',
+    })
+}
+
+//列表
+export function listPriceConfig({startTime,endTime,pageSize,pageNum,siteId}) {
+    return request({
+        url: `/ems/energyPriceConfig/list?startTime=${startTime}&endTime=${endTime}&pageNum=${pageNum}&pageSize=${pageSize}&siteId=${siteId}`,
+        method: 'get',
+    })
+}
+

src/api/ems/site.js

@@ -1,4 +1,5 @@
 import request from '@/utils/request'
+
 // 站点列表
 export function getSiteInfoList({siteName, startTime, endTime, pageSize, pageNum}) {
     return request({
@@ -8,10 +9,11 @@ export function getSiteInfoList({siteName,startTime, endTime,pageSize,pageNum})
 }
 
 // 设备列表
-export function getDeviceInfoList({siteId,pageSize,pageNum}) {
+export function getDeviceInfoList(data) {
     return request({
-    url: `/ems/siteConfig/getDeviceInfoList?siteId=${siteId}&pageSize=${pageSize}&pageNum=${pageNum}`,
-    method: 'get'
+        url: `/ems/siteConfig/getDeviceInfoList`,
+        method: 'get',
+        params: data
     })
 }
 
@@ -39,6 +41,7 @@ export function addDevice(data) {
         data
     })
 }
+
 // 编辑设备
 export function updateDevice(data) {
     return request({
@@ -47,6 +50,7 @@ export function updateDevice(data) {
         data
     })
 }
+
 // 删除设备
 export function deleteService(id) {
     return request({
@@ -55,6 +59,23 @@ export function deleteService(id) {
     })
 }
 
+//pcs开、关机
+export function updateDeviceStatus(data) {
+    return request({
+        url: `/ems/siteConfig/updateDeviceStatus`,
+        method: 'post',
+        data
+    })
+}
+
+// 获取上级设备id列表
+export function getParentDeviceId({siteId, deviceCategory}) {
+    return request({
+        url: `/ems/siteConfig/getParentDeviceId?siteId=${siteId}&deviceCategory=${deviceCategory}`,
+        method: 'get',
+    })
+}
+
 //获取所有设备
 export function getDeviceList(siteId) {
     return request({
@@ -64,9 +85,119 @@ export function getDeviceList(siteId) {
 }
 
 //获取设备点位table
-export function getDevicePointList({siteId,deviceId,deviceCategory,pageNum,pageSize,dataPointName='',sortMethod,dataPoint,lower,upper}) {
+export function getDevicePointList(data) {
     return request({
-    url: `/ems/siteConfig/getDevicePointList?siteId=${siteId}&deviceId=${deviceId}&pageNum=${pageNum}&pageSize=${pageSize}&deviceCategory=${deviceCategory}&dataPointName=${dataPointName}&dataPoint=${dataPoint}&lower=${lower}&upper=${upper}&pageNum=${pageNum}&sortMethod=${sortMethod}`,
+        url: `/ems/siteConfig/getDevicePointList`,
+        method: 'get',
+        params: data
+    })
+}
+
+
+//获取设备类型下面的所有设备列表
+export function getDeviceListBySiteAndCategory({siteId, deviceCategory}) {
+    return request({
+        url: `/ems/siteConfig/getDeviceListBySiteAndCategory?siteId=${siteId}&deviceCategory=${deviceCategory}`,
         method: 'get',
     })
 }
+
+//新增设备保护
+export function addProtectPlan(data) {
+    return request({
+        url: `/ems/protectPlan`,
+        method: 'post',
+        data
+    })
+}
+
+//修改设备保护
+export function updateProtectPlan(data) {
+    return request({
+        url: `/ems/protectPlan`,
+        method: 'put',
+        data
+    })
+}
+
+//删除设备保护
+export function deleteProtectPlan(id) {
+    return request({
+        url: `/ems/protectPlan/${id}`,
+        method: 'delete',
+    })
+}
+
+//设备保护详情
+export function getProtectPlan(id) {
+    return request({
+        url: `/ems/protectPlan/${id}`,
+        method: 'get',
+    })
+}
+
+//设备保护详情列表
+//http://localhost:8089/ems/protectPlan/list?pageSize=10&pageNum=1&faultName=总压&siteId=021_DDS_01
+export function protectPlanList({siteId, faultName, pageSize, pageNum}) {
+    return request({
+        url: `/ems/protectPlan/list?siteId=${siteId}&faultName=${faultName}&pageSize=${pageSize}&pageNum=${pageNum}`,
+        method: 'get',
+    })
+}
+
+// 点位导出
+export function exportPointList(data) {
+    return request({
+        url: `/ems/pointMatch/export`,
+        method: 'post',
+        data
+    })
+}
+
+// 点位导入
+export function importPointList(data) {
+    return request({
+        url: `/ems/pointMatch/importData`,
+        method: 'post',
+        data
+    })
+}
+
+
+//mqtt
+export function getMqttList({pageSize, pageNum, mqttTopic, topicName, siteId}) {
+    return request({
+        url: `/ems/mqttConfig/list?pageSize=${pageSize}&pageNum=${pageNum}&mqttTopic=${mqttTopic}&topicName=${topicName}&siteId=${siteId}`,
+        method: 'get',
+    })
+}
+
+export function getMqttDetail(id) {
+    return request({
+        url: `/ems/mqttConfig/${id}`,
+        method: 'get',
+    })
+}
+
+export function addMqtt(data) {
+    return request({
+        url: `/ems/mqttConfig`,
+        method: 'post',
+        data
+    })
+}
+
+export function editMqtt(data) {
+    return request({
+        url: `/ems/mqttConfig`,
+        method: 'put',
+        data
+    })
+}
+
+export function deleteMqtt(id) {
+    return request({
+        url: `/ems/mqttConfig/${id}`,
+        method: 'delete',
+    })
+}

src/assets/styles/common.scss

@@ -9,11 +9,13 @@
   padding: 24px;
   font-size: 12px;
 }
+
 //除去顶部信息(如搜索栏、站点基本信息等)外的 白色背景内容区域
 .ems-content-container {
   background-color: #ffffff;
   margin-top: 24px;
 }
+
 //需要设置内padding的白色背景区域
 .ems-content-container-padding {
   padding: 24px;
@@ -27,42 +29,49 @@
     font-size: 12px;
     background: #F1F5FB;
     position: relative;
+
     .card-title {
       font-weight: 500;
       color: #333333;
     }
+
     .el-button--text {
       color: #666666;
     }
 
   }
 }
+
 .common-card-container-body-no-padding {
   .el-card__body {
     padding: 0;
   }
 }
+
 .common-card-container-no-title-bg {
   .el-card__header {
     background-color: transparent;
   }
 }
+
 //单站监控 设备监控card公共样式
 .sbjk-card-container {
   .el-card__header {
     background-color: transparent;
-    padding: 10px 14px;
+    padding: 5px 14px;
     color: #ffffff;
     position: relative;
     border-radius: 5px 5px 0 0;
+
     .large-title {
-      font-size: 20px;
+      font-size: 18px;
       font-weight: 500;
       line-height: 40px;
       padding: 0 50px 0 11px;
       display: inline-block;
       vertical-align: middle;
     }
+
     .info {
       display: inline-block;
       vertical-align: middle;
@@ -70,33 +79,57 @@
       font-size: 12px;
       line-height: 20px;
     }
+
     .el-button--text {
       color: #666666;
     }
+
     .alarm {
       position: absolute;
       right: 25px;
       top: 50%;
       transform: translateY(-50%);
+
+      .alarm-icon {
+        font-size: 22px;
+        color: #fff;
+        display: block;
+        cursor: pointer;
       }
     }
+  }
+
   //红色背景颜色标题
   &.warning-card-container {
     .el-card__header {
-      background-color: #fc6b69;
+      background-color: #b64040; //#fc6b69;
+    }
+
+    .work-status {
+      color: #b64040 !important;;
     }
   }
+
   //绿色背景颜色标题
   &.running-card-container {
     .el-card__header {
-      background-color: #05aea3;
+      background-color: #40b6a5; //#05aea3;
+    }
+
+    .work-status {
+      color: #40b6a5 !important;
     }
   }
+
   //灰色背景颜色标题
   &.timing-card-container {
     .el-card__header {
       background-color: #666666;
     }
+
+    .work-status {
+      color: #666666 !important;;
+    }
   }
 }
 
@@ -105,11 +138,13 @@
   &.common-card-container .el-card__header {
     padding-top: 0;
     padding-bottom: 0;
+
     .time-range-header {
       height: 40px;
       display: flex;
       justify-content: space-between;
       align-items: center;
+
       .card-title {
         line-height: 40px;
       }
@@ -118,22 +153,23 @@
 }
 
 
-
-
-
 //描述样式 PCS、BMS总览、BMS电池簇页面公共样式
 .descriptions-main {
   padding: 24px;
   position: relative;
+
   &.descriptions-main-bg-color {
     background-color: #f1f5fc;
+
     .el-descriptions__body {
       background-color: #f1f5fc;
     }
   }
+
   .el-descriptions-item__cell[colspan='1'] {
     width: 25%
   }
+
   .el-descriptions__body .el-descriptions__table {
     .descriptions-direction {
       line-height: 19px;
@@ -141,35 +177,76 @@
       font-size: 16px;
       font-weight: 500;
     }
+
     .descriptions-label {
       line-height: 14px;
       color: #666666;
       font-size: 12px;
     }
+
     .danger {
       color: #FC6B69;
     }
+
     .save {
       color: #09ADA3;
     }
+
     .keep {
       color: #3C81FF;
     }
   }
 }
 
+//电表、液冷公共样式
+.device-info-row {
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  border-left: 1px solid #eee;
+  border-top: 1px solid #eee;
+
+  .device-info-col {
+    padding: 10px 0;
+    text-align: center;
+    font-size: 12px;
+    color: #666666;
+    line-height: 14px;
+    border-bottom: 1px solid #eee;
+    border-right: 1px solid #eee;
+
+    .left {
+    }
+
+    .right {
+      display: block;
+      font-weight: 500;
+      font-size: 16px;
+      line-height: 18px;
+      margin-top: 10px;
+    }
+  }
+}
+
+
 //公共表格样式
+.el-table {
+  font-size: 13px;
+}
+
 .common-table.el-table {
   color: #333333;
+
   .el-table__header-wrapper th, .el-table__fixed-header-wrapper th {
     background: #f1f5fc;
     border-bottom: none;
+
     .table-head {
       color: #515a6e;
     }
   }
+
   .warning-status {
     color: #FC6B69;
+
     &.circle::before {
       content: "";
       display: inline-block;
@@ -185,22 +262,27 @@
 //二、三级菜单栏样式
 .ems-second-menu {
   width: fit-content;
+
   .el-menu-item {
     line-height: 40px;
     height: 40px;
     padding: 0;
   }
+
   &.el-menu--horizontal > .el-menu-item.is-active, &.el-menu--horizontal > .el-menu-item {
     border-bottom: none !important;
   }
+
   .el-menu-item.is-active {
     background: #0366c1 !important;
   }
 }
+
 .ems-third-menu-container {
   position: relative;
   padding-left: 140px;
   background-color: #ffffff;
+
   .ems-third-menu {
     border-right: none;
     box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
@@ -208,6 +290,7 @@
     position: absolute;
     top: 0;
     left: 0;
+
     .el-menu-item {
       line-height: 45px;
       height: 45px;
@@ -215,10 +298,12 @@
       width: 125px;
       text-align: center;
     }
+
     .el-menu-item:hover {
       background: #67b1ff !important;
       color: #ffffff !important;
     }
+
     .el-menu-item.is-active {
       background: #409eff !important;
     }
@@ -227,7 +312,6 @@
 }
 
 
-
 //按钮栏 选中样式
 .ems-btns-group {
   .activeBtn {
@@ -242,6 +326,7 @@
 .select-container.el-form--inline .el-form-item {
   margin-right: 15px;
 }
+
 //红色背景颜色按钮
 .alarm-btn, .alarm-btn:hover, .alarm-btn:focus {
   background-color: #FC6B69;

src/components/BigDataPopup/index.vue

@@ -0,0 +1,49 @@
+<template>
+  <el-dialog :fullscreen="true" :append-to-body="true" :visible.sync="show" :show-close="false" top="0"
+             custom-class="big-data-dialog">
+    <img src="@/assets/images/ems/bigData.png" alt="">
+    <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(176, 228, 255, 0.7);
+  cursor: pointer;
+}
+
+img {
+  height: 100vh;
+  width: 100vw;
+  display: block;
+  margin: 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
+    }
+  }
+}
+</script>

src/components/Ems/DateRangeSelect/index.vue

@@ -2,6 +2,7 @@
   <div class="time-range">
     <el-date-picker
         v-model="dateRange"
+        :class="miniTimePicker ? 'mini-date-picker' : ''"
         type="daterange"
         range-separator="至"
         start-placeholder="开始时间"
@@ -10,16 +11,47 @@
         :picker-options="pickerOptions"
         end-placeholder="结束时间">
     </el-date-picker>
+    <template v-if="!showIcon">
       <el-button size="mini" style="margin-left: 10px;" :loading="loading" @click="reset">重置</el-button>
       <el-button type="primary" size="mini" :loading="loading" @click="search">搜索</el-button>
       <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>
+      <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 {
+  props: {
+    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])
@@ -63,7 +95,8 @@ export default {
     },
     timeLine(type) {
       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
@@ -82,19 +115,35 @@ export default {
 <style lang="scss" scoped>
 .time-range {
   display: flex;
+
   ::v-deep {
+
     .el-range-editor--medium .el-range__icon, .el-range-editor--medium .el-range__close-icon {
       line-height: 22px;
     }
+
     .el-range-editor--medium.el-input__inner {
       height: 30px;
     }
+
     .el-range-editor--medium .el-range-separator {
-            line-height: 24px;
+      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;
+    }
   }
 
 }

src/components/Ems/ZdBaseInfo/index.vue

@@ -32,13 +32,13 @@ export default {
         attr:'installCapacity'
 
       },{
-        title:'总充电量（MWh）',
+        title:'总充电量（KWh）',
         num:'',
         color:'#A696FF',
         attr:'totalChargedCap'
 
       },{
-        title:'总放电量（MWh）',
+        title:'总放电量（KWh）',
         num:'',
         color:'#A696FF',
         attr:'totalDischargedCap'

src/layout/components/Navbar.vue

@@ -1,12 +1,17 @@
 <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"/>
     <top-nav v-if="topNav" id="topmenu-container" class="topmenu-container"/>
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
+        <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"/>
 
 
@@ -32,7 +37,6 @@
           </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"/>
       </div>
@@ -78,6 +82,12 @@ export default {
     }
   },
   methods: {
+    showBigDataImg() {
+      const routeUrl = this.$router.resolve({
+        path: '/screen'
+      })
+      window.open(routeUrl.href, '_blank')
+    },
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
     },
@@ -93,7 +103,8 @@ export default {
         this.$store.dispatch('LogOut').then(() => {
           location.href = '/index'
         })
-      }).catch(() => {})
+      }).catch(() => {
+      })
     }
   }
 }
@@ -139,6 +150,17 @@ export default {
     height: 100%;
     line-height: 50px;
 
+    .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;
     }
@@ -168,6 +190,7 @@ export default {
       .avatar-wrapper {
         margin-top: 10px;
         position: relative;
+        padding-right: 10px;
 
         .user-avatar {
           cursor: pointer;

src/layout/components/Sidebar/Logo.vue

@@ -1,8 +1,22 @@
 <template>
-  <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
+  <div
+    class="sidebar-logo-container"
+    :class="{ collapse: collapse }"
+    :style="{
+      backgroundColor:
+        sideTheme === 'theme-dark'
+          ? variables.menuBackground
+          : variables.menuLightBackground,
+    }"
+  >
     <transition name="sidebarLogoFade">
-      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img :src="logo" class="sidebar-logo" />
+      <router-link
+        v-if="collapse"
+        key="collapse"
+        class="sidebar-logo-link"
+        to="/"
+      >
+        <img :src="logoSmall" class="sidebar-logo" />
         <!--        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>-->
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
@@ -14,35 +28,33 @@
 </template>
 
 <script>
-import logoImg from '@/assets/logo/logo.png'
-import variables from '@/assets/styles/variables.scss'
-import logo from '@/assets/images/ems/logo.png'
-import logoLarge from '@/assets/images/ems/logo-large.png'
+import variables from "@/assets/styles/variables.scss";
+import logo from "@/assets/images/ems/logo.png";
+import logoSmall from "@/assets/images/ems/logo-small.png";
 export default {
-  name: 'SidebarLogo',
+  name: "SidebarLogo",
   props: {
     collapse: {
       type: Boolean,
-      required: true
-    }
+      required: true,
+    },
   },
   computed: {
     variables() {
-      return variables
+      return variables;
     },
     sideTheme() {
-      return this.$store.state.settings.sideTheme
-    }
+      return this.$store.state.settings.sideTheme;
+    },
   },
   data() {
     return {
       title: process.env.VUE_APP_TITLE,
-      // logo: logoImg
       logo: logo,
-      logoLarge:logoLarge
-    }
-  }
-}
+      logoSmall: logoSmall,
+    };
+  },
+};
 </script>
 
 <style lang="scss" scoped>

src/layout/components/Sidebar/index.vue

@@ -55,3 +55,12 @@ export default {
     }
 }
 </script>
+<style lang="scss" scoped>
+::v-deep{
+  //,.el-submenu.is-active>.el-submenu__title 选中了二级菜单的以及菜单
+  .el-menu-item.is-active{
+    background-color: rgba(0,0,0,0.1) !important;
+  }
+
+}
+</style>

src/router/ems.js

@@ -23,13 +23,23 @@ export const dzjk=[
                         path: '/dzjk/home',
                         component: () => import('@/views/ems/dzjk/home/index.vue'),
                         name: 'DzjkHome',
-            meta: { title: '站点首页',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkHome' }
+                        meta: {
+                            title: '站点首页',
+                            breadcrumb: false,
+                            activeMenu: '/dzjk',
+                            activeSecondMenuName: 'DzjkHome'
+                        }
                     },
                     {
                         path: '/dzjk/zxlt',
                         component: () => import('@/views/ems/dzjk/zxlt/index.vue'),
                         name: 'DzjkZxlt',
-            meta: { title: '主线路图',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkZxlt' }
+                        meta: {
+                            title: '主线路图',
+                            breadcrumb: false,
+                            activeMenu: '/dzjk',
+                            activeSecondMenuName: 'DzjkZxlt'
+                        }
                     },
                     {
                         path: '/dzjk/sbjk',
@@ -42,43 +52,121 @@ export const dzjk=[
                                 path: 'ssyx',
                                 component: () => import('@/views/ems/dzjk/sbjk/ssyx/index.vue'),
                                 name: 'DzjkSbjkSsyx',
-                meta: { title: '实时运行',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk'},
+                                meta: {
+                                    title: '实时运行',
+                                    breadcrumb: false,
+                                    activeMenu: '/dzjk',
+                                    activeSecondMenuName: 'DzjkSbjk',
+                                    deviceCategory: 'SSYX'
+                                },
+                            },
+                            {
+                                path: 'ems',
+                                component: () => import('@/views/ems/dzjk/sbjk/ems/index.vue'),
+                                name: 'DzjkSbjkEms',
+                                meta: {
+                                    title: 'EMS',
+                                    breadcrumb: false,
+                                    activeMenu: '/dzjk',
+                                    activeSecondMenuName: 'DzjkSbjk',
+                                    deviceCategory: 'EMS'
+                                },
                             },
                             {
                                 path: 'pcs',
                                 component: () => import('@/views/ems/dzjk/sbjk/pcs/index.vue'),
                                 name: 'DzjkSbjkPcs',
-                meta: { title: 'PCS',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk'},
+                                meta: {
+                                    title: 'PCS',
+                                    breadcrumb: false,
+                                    activeMenu: '/dzjk',
+                                    activeSecondMenuName: 'DzjkSbjk',
+                                    deviceCategory: 'PCS'
+                                },
                             },
                             {
                                 path: 'bmszl',
                                 component: () => import('@/views/ems/dzjk/sbjk/bmszl/index.vue'),
                                 name: 'DzjkSbjkBmszl',
-                meta: { title: 'BMS总览',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk'},
+                                meta: {
+                                    title: 'BMS总览',
+                                    breadcrumb: false,
+                                    activeMenu: '/dzjk',
+                                    activeSecondMenuName: 'DzjkSbjk',
+                                    deviceCategory: 'STACK'
+                                },
                             },
                             {
                                 path: 'bmsdcc',
                                 component: () => import('@/views/ems/dzjk/sbjk/bmsdcc/index.vue'),
                                 name: 'DzjkSbjkBmsdcc',
-                meta: { title: 'BMS电池簇',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk'},
+                                meta: {
+                                    title: 'BMS电池簇',
+                                    breadcrumb: false,
+                                    activeMenu: '/dzjk',
+                                    activeSecondMenuName: 'DzjkSbjk',
+                                    deviceCategory: 'CLUSTER'
+                                },
                             },
                             {
                                 path: 'dtdc',
                                 component: () => import('@/views/ems/dzjk/sbjk/dtdc/index.vue'),
                                 name: 'DzjkSbjkDtdc',
-                meta: { title: '单体电池',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk'},
+                                meta: {
+                                    title: 'BMS单体电池',
+                                    breadcrumb: false,
+                                    activeMenu: '/dzjk',
+                                    activeSecondMenuName: 'DzjkSbjk',
+                                    deviceCategory: 'BATTERY'
+                                },
                             },
                             {
                                 path: 'db',
                                 component: () => import('@/views/ems/dzjk/sbjk/db/index.vue'),
                                 name: 'DzjkSbjkDb',
-                meta: { title: '电表',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk'},
+                                meta: {
+                                    title: '电表',
+                                    breadcrumb: false,
+                                    activeMenu: '/dzjk',
+                                    activeSecondMenuName: 'DzjkSbjk',
+                                    deviceCategory: 'AMMETER'
+                                },
                             },
                             {
                                 path: 'yl',
                                 component: () => import('@/views/ems/dzjk/sbjk/yl/index.vue'),
                                 name: 'DzjkSbjkYl',
-                meta: { title: '液冷',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkSbjk'},
+                                meta: {
+                                    title: '冷却',
+                                    breadcrumb: false,
+                                    activeMenu: '/dzjk',
+                                    activeSecondMenuName: 'DzjkSbjk',
+                                    deviceCategory: 'COOLING'
+                                },
+                            },
+                            {
+                                path: 'dh',
+                                component: () => import('@/views/ems/dzjk/sbjk/dh/index.vue'),
+                                name: 'DzjkSbjkDh',
+                                meta: {
+                                    title: '动环',
+                                    breadcrumb: false,
+                                    activeMenu: '/dzjk',
+                                    activeSecondMenuName: 'DzjkSbjk',
+                                    deviceCategory: 'DH'
+                                },
+                            },
+                            {
+                                path: 'xf',
+                                component: () => import('@/views/ems/dzjk/sbjk/xf/index.vue'),
+                                name: 'DzjkSbjkXf',
+                                meta: {
+                                    title: '消防',
+                                    breadcrumb: false,
+                                    activeMenu: '/dzjk',
+                                    activeSecondMenuName: 'DzjkSbjk',
+                                    deviceCategory: 'XF'
+                                },
                             }
                         ]
                     },
@@ -86,7 +174,12 @@ export const dzjk=[
                         path: '/dzjk/gzgj',
                         component: () => import('@/views/ems/dzjk/gzgj/index.vue'),
                         name: 'DzjkGzgj',
-            meta: { title: '故障告警',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkGzgj' }
+                        meta: {
+                            title: '故障告警',
+                            breadcrumb: false,
+                            activeMenu: '/dzjk',
+                            activeSecondMenuName: 'DzjkGzgj'
+                        }
                     },
                     {
                         path: '/dzjk/tjbb',
@@ -99,37 +192,78 @@ export const dzjk=[
                                 path: 'gltj',
                                 component: () => import('@/views/ems/dzjk/tjbb/gltj/index.vue'),
                                 name: 'DzjkTjbbGltj',
-                meta: { title: '概率统计',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkTjbb'},
+                                meta: {
+                                    title: '运行统计',
+                                    breadcrumb: false,
+                                    activeMenu: '/dzjk',
+                                    activeSecondMenuName: 'DzjkTjbb'
+                                },
                             },
                             {
                                 path: 'glqx',
                                 component: () => import('@/views/ems/dzjk/tjbb/glqx/index.vue'),
                                 name: 'DzjkTjbbGlqx',
-                meta: { title: '功率曲线',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkTjbb'},
+                                meta: {
+                                    title: '功率曲线',
+                                    breadcrumb: false,
+                                    activeMenu: '/dzjk',
+                                    activeSecondMenuName: 'DzjkTjbb'
+                                },
                             },
                             {
                                 path: 'pcsqx',
                                 component: () => import('@/views/ems/dzjk/tjbb/pcsqx/index.vue'),
                                 name: 'DzjkTjbbPcsqx',
-                meta: { title: 'PCS曲线',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkTjbb'},
+                                meta: {
+                                    title: 'PCS曲线',
+                                    breadcrumb: false,
+                                    activeMenu: '/dzjk',
+                                    activeSecondMenuName: 'DzjkTjbb'
+                                },
                             },
                             {
                                 path: 'dcdqx',
                                 component: () => import('@/views/ems/dzjk/tjbb/dcdqx/index.vue'),
                                 name: 'DzjkTjbbDcdqx',
-                meta: { title: '电池堆曲线',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkTjbb'},
+                                meta: {
+                                    title: '电池堆曲线',
+                                    breadcrumb: false,
+                                    activeMenu: '/dzjk',
+                                    activeSecondMenuName: 'DzjkTjbb'
+                                },
                             },
                             {
                                 path: 'dcwd',
                                 component: () => import('@/views/ems/dzjk/tjbb/dcwd/index.vue'),
                                 name: 'DzjkTjbbDcwd',
-                meta: { title: '电池温度',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkTjbb'},
+                                meta: {
+                                    title: '电池温度',
+                                    breadcrumb: false,
+                                    activeMenu: '/dzjk',
+                                    activeSecondMenuName: 'DzjkTjbb'
+                                },
                             },
                             {
                                 path: 'dbbb',
                                 component: () => import('@/views/ems/dzjk/tjbb/dbbb/index.vue'),
                                 name: 'DzjkTjbbDbbb',
-                meta: { title: '电表报表',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkTjbb'},
+                                meta: {
+                                    title: '电表报表',
+                                    breadcrumb: false,
+                                    activeMenu: '/dzjk',
+                                    activeSecondMenuName: 'DzjkTjbb'
+                                },
+                            },
+                            {
+                                path: 'sybb',
+                                component: () => import('@/views/ems/dzjk/tjbb/sybb/index.vue'),
+                                name: 'DzjkTjbbSybb',
+                                meta: {
+                                    title: '收益报表',
+                                    breadcrumb: false,
+                                    activeMenu: '/dzjk',
+                                    activeSecondMenuName: 'DzjkTjbb'
+                                },
                             }
                         ]
                     },
@@ -144,7 +278,12 @@ export const dzjk=[
                                 path: 'clyx',
                                 component: () => import('@/views/ems/dzjk/clpz/clyx/index.vue'),
                                 name: 'DzjkClpzClyx',
-                meta: { title: '策略运行',breadcrumb: false,activeMenu: '/dzjk',activeSecondMenuName:'DzjkClpz'},
+                                meta: {
+                                    title: '策略运行',
+                                    breadcrumb: false,
+                                    activeMenu: '/dzjk',
+                                    activeSecondMenuName: 'DzjkClpz'
+                                },
                             },
                             // {
                             //   path: 'xftg',

src/router/index.js

@@ -52,6 +52,11 @@ export const constantRoutes = [
     component: () => import('@/views/register'),
     hidden: true
   },
+  {
+    path: '/screen',
+    component: () => import('@/views/screen/index'),
+    hidden: true
+  },
   {
     path: '/404',
     component: () => import('@/views/error/404'),

src/settings.js

@@ -7,12 +7,12 @@ module.exports = {
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light
    */
-  sideTheme: 'theme-dark',
+  sideTheme: 'theme-light',
 
   /**
    * 系统布局配置
    */
-  showSettings: true,
+  showSettings: false,
 
   /**
    * 是否显示顶部导航
@@ -52,5 +52,5 @@ module.exports = {
   /**
    * 底部版权文本内容
    */
-  footerContent: 'Copyright © 2018-2025 xzzn. All Rights Reserved.'
+  footerContent: 'Copyright © 2025 上动新能源 版权所有'
 }

src/store/modules/ems.js

@@ -1,8 +1,22 @@
+import {getAlarmDetailList, getSiteAllDeviceCategory} from '@/api/ems/dzjk'
+
 const ems = {
     state: {
+        dzjkAlarmLighting: false,//单站监控 告警统计红点标志
         zdList: [],
-    workStatusOptions:{'0':'正常','1':'异常','2':'停止'},//工作状态
-    deviceStatusOptions:{'0':'在线','1':'离线','2':'维修中'},//设备状态
+        zdDeviceCategoryOptions: {},//站点各个站点包含的设备种类 {021_DDS_01:["BATTERY","CLUSTER","STACK", "DH", "AMMETER", "PCS", "XF"],021_DDS_02:[]...}
+        CLUSTERWorkStatusOptions: {'0': '静置', '1': '充电', '2': '放电', '3': '待机', '5': '运行', '9': "故障"},//电池簇工作状态
+        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: '异常'},//告警状态
@@ -11,16 +25,48 @@ const ems = {
         alarmLevelOptions: {'A': '提示', 'B': '一般', 'C': '严重', 'D': '紧急'},//告警等级
         alarmStatusOptions: {'0': '待处理', '1': '已处理', '2': '处理中'},//告警状态
         deviceTypeOptions: {'TCP': 'TCP', 'RTU': 'RTU'},//设备类型
-    ticketStatusOptions:{0:'待处理', 1:'已处理', 2:'处理中'},//工单处理状态
+        ticketStatusOptions: {1: '待处理', 2: '处理中', 3: '已处理'},//工单处理状态
         strategyStatusOptions: {'0': '未启用', '1': '已运行', '2': '已暂停', '3': '禁用', '4': '删除'},//策略状态
-    chargeStatusOptions:{'1':'充电','2':'待机'},//冲放状态
-    deviceCategoryOptions:{'PCS':'PCS','STACK':'电池堆','CLUSTER':'电池簇','COOLING':'液冷','BATTERY':'单体电池','AMMETER':'电表'},//设备类别
+        chargeStatusOptions: {'1': '充电', '2': '待机', '3': '放电'},//冲放状态
+        comparisonOperatorOptions: {'>': '>', '<': '<', '=': '=', '>=': '>=', '<=': '<='},
+        relationWithPoint: {'||': '||', '&&': '&&'}
     },
     mutations: {
         SET_ZD_LIST(state, list) {
             state.zdList = list || []
+        },
+        SET_DZJK_ALARM_LIGHTING(state, status) {
+            state.dzjkAlarmLighting = status
+        },
+        SET_ZD_DEVICE_CATEGORY_OPTIONS(state, {siteId, data}) {
+            state.zdDeviceCategoryOptions = Object.assign({}, state.zdDeviceCategoryOptions, {[siteId]: data})
         }
     },
+    actions: {
+        //查询站点的所有待处理0的告警 存在展示红点标志
+        getSiteAlarmNum({state, commit}, siteId) {
+            getAlarmDetailList({
+                status: 0,
+                siteId,
+                pageSize: 10,
+                pageNum: 1,
+                deviceId: '',
+                alarmLevel: '',
+                alarmStartTime: '',
+                alarmEndTime: ''
+            }).then(response => {
+                commit('SET_DZJK_ALARM_LIGHTING', !!response?.total || false)
+            })
+        },
+        getSiteDeviceCategory({state, commit}, siteId) {
+            getSiteAllDeviceCategory(siteId).then(response => {
+                let data = response?.data || [];
+                data.unshift('SSYX');
+                commit('SET_ZD_DEVICE_CATEGORY_OPTIONS', {siteId, data})
+            })
+        }
+
+    }
 }
 
 export default ems

src/store/modules/permission.js

@@ -34,6 +34,12 @@ const permission = {
       return new Promise(resolve => {
         // 向后端请求路由数据
         getRouters().then(res => {    
+          let hasDzjk = false
+          if(res?.data){
+            res.data.forEach(i=>{
+              i.children && i.children.find(j=>j.path.indexOf('dzjk')>-1) && (hasDzjk=true)
+            })
+          }
           const sdata = JSON.parse(JSON.stringify(res.data))
           const rdata = JSON.parse(JSON.stringify(res.data))
           const sidebarRoutes = filterAsyncRouter(sdata)
@@ -41,6 +47,10 @@ const permission = {
           const asyncRoutes = filterDynamicRoutes(dynamicRoutes)
           rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
           router.addRoutes(asyncRoutes)
+          if(!hasDzjk){
+            const index = constantRoutes.findIndex(i=>i.path.indexOf('dzjk')>-1)
+            constantRoutes.splice(index,1)
+          }
           commit('SET_ROUTES', rewriteRoutes)
           commit('SET_SIDEBAR_ROUTERS', constantRoutes.concat(sidebarRoutes))
           commit('SET_DEFAULT_ROUTES', sidebarRoutes)
@@ -111,7 +121,7 @@ export function filterDynamicRoutes(routes) {
 }
 
 export const loadView = (view) => {
-  if (process.env.NODE_ENV === 'development') {
+  if (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'staging') {
     return (resolve) => require([`@/views/${view}`], resolve)
   } else {
     // 使用 import 实现生产环境的路由懒加载

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

@@ -1,5 +1,6 @@
 <template>
-    <el-dialog :visible.sync="dialogTableVisible" class="ems-dialog" :title="mode === 'add'?'新增模板':`编辑模板` ">
+  <el-dialog :visible.sync="dialogTableVisible" class="ems-dialog add-template-dialog"
+             :title="mode === 'add'?'新增模板':`编辑模板` ">
     <el-form ref="addTempForm" :model="formData" :rules="rules" size="medium" label-width="100px">
       <el-form-item label="模板名称" prop="templateName">
         <el-input v-model="formData.templateName" placeholder="请输入" clearable :style="{width: '100%'}">
@@ -21,36 +22,52 @@
     <!--      新增时间段表单-->
     <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: '01:00',
-                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 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="请输入"></el-input>
+            <el-input v-model="formInline.chargeDischargePower" placeholder="请输入"
+                      :style="{width: '100%'}"></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 v-model="formInline.chargeStatus" placeholder="请选择" :style="{width: '100%'}">
+              <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>
@@ -64,7 +81,6 @@
         :data="tableData"
         border
         style="width: 100%;margin-top:25px">
-        <!--            todo 如果要在span-method中使用column.property 在表格中必须定义prop="xxx"属性-->
       <el-table-column
           prop="startTime"
           label="开始时间">
@@ -107,13 +123,18 @@
 <script>
 import {mapState} from 'vuex'
 import {addStrategyTemp, editStrategyTemp, getStrategyTempDetail} from '@/api/ems/dzjk'
+
 export default {
   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: '',
       editTempId: '',
       dialogTableVisible: false,
+      secondRange: range,
       formData: {
         templateName: '',
         sdcLimit: false,
@@ -137,17 +158,14 @@ export default {
       },
       showAddTime: false,
       formInline: {
-        startTime:'',endTime:'',chargeDischargePower:'',chargeStatus:''
+        timeRange: range,
+        chargeDischargePower: '',
+        chargeStatus: ''
       },
       formInlineRule: {
-        startTime: [{
+        timeRange: [{
           required: true,
-          message: '请选择开始时间',
-          trigger: 'change'
-        }],
-        endTime: [{
-          required: true,
-          message: '请选择结束时间',
+          message: '请选择时间范围',
           trigger: 'change'
         }],
         chargeDischargePower: [{
@@ -155,7 +173,7 @@ export default {
           message: '请输入冲放功率',
           trigger: 'blur'
         },
-          { pattern: /^(0|[1-9]\d*)(\.\d+)?$/, message: '请输入合法数字或小数' }
+          {pattern: /^-?\d*\.?\d*$/, message: '请输入合法数字或小数'}
         ],
         chargeStatus: [{
           required: true,
@@ -172,20 +190,6 @@ 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() {
       this.dialogTableVisible = false
@@ -198,8 +202,8 @@ export default {
         sdcUp: '',
       }
       this.formInline = {
-        startTime:'',endTime:'',chargeDischargePower:'',chargeStatus:''
-      }
+        timeRange: this.secondRange, chargeDischargePower: '', chargeStatus: ''
+      }//startTime: '', endTime: '',
       this.showAddTime = false
       this.tableData = []
     },
@@ -238,14 +242,18 @@ export default {
     cancelAddTime() {
       this.$refs.addTimeForm.resetFields()
       this.showAddTime = false
-      this.formInline = {startTime:'',endTime:'',chargeDischargePower:'',chargeStatus:''}
+      this.formInline = {timeRange: this.secondRange, chargeDischargePower: '', chargeStatus: ''}//startTime: '', endTime: '',
     },
     saveTime() {
       //表单校验，校验成功，添加到tableData里
       this.$refs.addTimeForm.validate(valid => {
         if (!valid) return
-        this.tableData.push(JSON.parse(JSON.stringify(this.formInline)));
-        this.$nextTick(() => {this.cancelAddTime()})
+        const {timeRange: [startTime, endTime], chargeDischargePower, chargeStatus} = this.formInline
+
+        this.tableData.push({startTime, endTime, chargeDischargePower, chargeStatus})
+        this.$nextTick(() => {
+          this.cancelAddTime()
+        })
       })
     },
     deleteRow(index) {
@@ -254,33 +262,20 @@ export default {
     saveDialog() {
       this.$refs.addTempForm.validate(valid => {
         if (!valid) return
-        //校验时间选择范围是否冲突
-          let status = true
-          this.tableData.forEach((outer,outerIndex)=>{
-            const {startTime, endTime}=outer
-            const outerStart = parseInt(startTime),outerEnd = parseInt(endTime)
-            if(outerStart>outerEnd){
-              status = false
-            }else{
-              this.tableData.forEach((inner,innerIndex)=>{
-                if(innerIndex !== outerIndex){
-                  const {startTime:innerStartTime, endTime:innerEndTime}=inner
-                  const innerStart = parseInt(innerStartTime),innerEnd = parseInt(innerEndTime)
-                  if((innerStart<outerStart && innerEnd>outerEnd) || !((innerStart<outerStart && innerEnd<=outerStart) || (innerStart>=outerEnd && innerEnd>outerEnd))){
-                    status=false
-                  }
-                }
-              })
-            }
-          })
-          if(!status){
-            return this.$message.error('时间选择范围冲突');
-          }
         const {templateName, sdcLimit, sdcDown, sdcUp} = this.formData
         const {siteId, updateStrategyId} = this.$home
         const {tableData} = this
         if (this.mode === 'edit') {
-            editStrategyTemp({siteId,strategyId:updateStrategyId,templateId:this.editTempId,templateName,sdcLimit,sdcDown,sdcUp,timeConfigList:tableData}).then(response=>{
+          editStrategyTemp({
+            siteId,
+            strategyId: updateStrategyId,
+            templateId: this.editTempId,
+            templateName,
+            sdcLimit,
+            sdcDown,
+            sdcUp,
+            timeConfigList: tableData
+          }).then(response => {
             if (response?.code === 200) {
               this.closeDialog()
               this.$emit('update')
@@ -288,7 +283,15 @@ export default {
             }
           })
         } else {
-            addStrategyTemp({siteId,strategyId:updateStrategyId,templateName,sdcLimit,sdcDown,sdcUp,timeConfigList:tableData}).then(response=>{
+          addStrategyTemp({
+            siteId,
+            strategyId: updateStrategyId,
+            templateName,
+            sdcLimit,
+            sdcDown,
+            sdcUp,
+            timeConfigList: tableData
+          }).then(response => {
             if (response?.code === 200) {
               this.closeDialog()
               this.$emit('update')
@@ -314,3 +317,9 @@ export default {
 }
 
 </script>
+<style lang="scss" scoped>
+.add-template-dialog {
+  max-height: 90vh;
+  overflow-y: auto;
+}
+</style>

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

@@ -90,7 +90,7 @@
           >
             <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="primary" size="mini" v-else @click="toTicket">生成工单</el-button>
+              <el-button type="primary" size="mini" v-else @click="createTicket(scope.row.id)">生成工单</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -113,7 +113,7 @@
 
 
 <script>
-import {getAlarmDetailList} from'@/api/ems/dzjk'
+import {getAlarmDetailList,createTicketNo} from'@/api/ems/dzjk'
 import {getDeviceList} from'@/api/ems/site'
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import { formatDate } from '@/filters/ems'
@@ -149,6 +149,13 @@ export default {
     toTicket(){
       this.$router.push({path:'/ticket'})
     },
+    //生成工单
+    createTicket(id){
+      this.loading = true
+      createTicketNo({id}).then(response=>{
+        response?.data && this.toTicket()
+      }).finally(()=>{this.loading = false})
+    },
     // 判断是否是同一天
     isSameDay(day1, day2) {
       const date1 = new Date(day1),date2 = new Date(day2)
@@ -172,7 +179,6 @@ export default {
     // 搜索
     onSearch(){
       this.pageNum =1//每次搜索从1开始搜索
-      const [alarmStartTime='',alarmEndTime='']=(this.dateRange || [])
       this.getData()
     },
     // 重置
@@ -192,6 +198,7 @@ export default {
     },
     // 获取数据
     getData(){
+      this.$store.dispatch('getSiteAlarmNum',this.siteId)
       this.loading=true
       const {deviceId,alarmLevel} = this.search
       const {siteId,pageNum,pageSize,activeBtn} =this

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

@@ -1,9 +1,8 @@
-
 <template>
   <el-card shadow="always" class="common-card-container common-card-container-body-no-padding time-range-card">
     <div slot="header" class="time-range-header">
       <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 style="height: 310px" id="activeChart"></div>
   </el-card>
@@ -108,7 +107,13 @@ export default {
         dataset: {source},
         series: source[0].slice(1).map((item, index) => {
           return {
-            type: 'line',
+            type: 'line',//index === 5 ? 'bar' : 'line',
+            showSymbol: false,
+            symbolSize: 2,
+            smooth: true,
+            areaStyle: {
+              opacity: 0.5,
+            },
             yAxisIndex: index <= 4 ? 0 : 1
           }
         })

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

@@ -1,9 +1,8 @@
-
 <template>
   <el-card shadow="always" class="common-card-container common-card-container-body-no-padding time-range-card">
     <div slot="header" class="time-range-header">
       <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 style="height: 310px" id="weekChart"></div>
   </el-card>
@@ -14,6 +13,7 @@ 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'
+
 export default {
   mixins: [resize],
   components: {DateRangeSelect},
@@ -45,7 +45,6 @@ export default {
     getWeekKData() {
       this.showLoading()
       const {siteId, timeRange} = this
-      this.hideLoading()
       getSevenChargeData({siteId, startDate: timeRange[0], endDate: timeRange[1]}).then(response => {
         this.setOption(response?.data || [])
       }).finally(() => this.hideLoading())

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

@@ -1,66 +1,101 @@
 <template>
   <div v-loading="loading">
     <el-row style="background: #fff" class="row-container" :gutter="15">
-      <el-col v-if="tableData.length > 0" :xs="24" :sm="24" :lg="24">
-        <alarm-table :tableData="tableData" />
-      </el-col>
-      <el-col :xs="24" :sm="24" :lg="6">
+      <el-col :xs="24" :sm="24" :lg="5">
+        <!--      站点信息-->
         <el-card
             shadow="always"
             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
-                size="mini"
-                v-for="(item, index) in singleZdInfo"
-                :key="index + 'singleZdInfo'"
-                :label="item.title"
-                >{{ info[item.attr] | formatNumber }}</el-descriptions-item
-              >
-            </el-descriptions>
+            <!--            地址、运行时间-->
+            <div class="site-info site-info-address">
+              <div class="title">
+                <i class="el-icon-location"></i>
               </div>
-        </el-card>
-      </el-col>
-      <el-col :xs="24" :sm="24" :lg="8">
-        <el-card
-          shadow="always"
-          class="common-card-container common-card-container-body-no-padding"
-        >
-          <div slot="header">
-            <span class="card-title">总累计运行数据</span>
+              <div class="value">{{ info.siteAddress }}</div>
             </div>
-          <div
-            style="box-sizing: border-box; height: 250px; padding: 20px 15px"
-          >
-            <el-row :gutter="20">
+            <div class="site-info">
+              <div class="title">
+                <i class="el-icon-date"></i>
+              </div>
+              <div class="value">{{ info.runningTime || '-' }}</div>
+            </div>
+            <!--      装机功率、容量      -->
+            <el-row :gutter="10" style="margin-top:20px;">
               <el-col
                   :span="12"
-                v-for="(item, index) in sjglData"
-                :key="index + 'sjglData'"
-                class="sjgl-data"
+                  class="sjgl-col power-col"
               >
-                <div class="sjgl-title">{{ item.title }}</div>
+                <div class="sjgl-wrapper">
+                  <div class="sjgl-title">装机功率(MW)</div>
                   <div class="sjgl-value">
-                  {{ runningInfo[item.attr] | formatNumber }}
+                    {{ info.installPower | formatNumber }}
+                  </div>
+                </div>
+              </el-col>
+              <el-col
+                  :span="12"
+                  class="sjgl-col power-col"
+              >
+                <div class="sjgl-wrapper">
+                  <div class="sjgl-title">装机容量(MW)</div>
+                  <div class="sjgl-value">
+                    {{ info.installCapacity | formatNumber }}
+                  </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">总收入</span>
+              <span class="value">{{ runningInfo.totalRevenue | formatNumber }}</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 sjglData"
+                  :key="index + 'sjglData'"
+                  class="sjgl-col"
+              >
+                <div class="sjgl-wrapper">
+                  <div class="sjgl-title">{{ item.title }}</div>
+                  <div class="sjgl-value" :style="{color:item.color}">
+                    {{ runningInfo[item.attr] | formatNumber }}
+                  </div>
+                </div>
               </el-col>
-      <el-col :xs="24" :sm="24" :lg="24">
+            </el-row>
+          </div>
+        </el-card>
+      </el-col>
+      <el-col :xs="24" :sm="24" :lg="12">
         <week-chart ref="weekChart"/>
       </el-col>
-      <el-col :xs="24" :sm="24" :lg="24">
+      <el-col :xs="24" :sm="24" :lg="12">
         <active-chart ref="activeChart"/>
       </el-col>
     </el-row>
@@ -76,6 +111,7 @@ 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},
@@ -83,50 +119,47 @@ export default {
   data() {
     return {
       loading: false,
-      singleZdInfo: [
-        {
-          title: "电站位置",
-          attr: "siteAddress",
-        },
-        {
-          title: "投运时间",
-          attr: "runningTime",
-        },
-        {
-          title: "装机功率(MW)",
-          attr: "installPower",
-        },
-        {
-          title: "装机容量(MW)",
-          attr: "installCapacity",
-        },
-      ],
       sjglData: [
         {
           title: "今日充电量（kWh）",
           attr: "dayChargedCap",
+          color: '#4472c4'
         },
         {
           title: "今日放电量（kWh）",
           attr: "dayDisChargedCap",
+          color: '#70ad47'
         },
         {
-          title: "总收入",
-          attr: "todo",
-        },
-        {
-          title: "当日实时收入",
-          attr: "todo",
-        },
-        {
-          title: "总充电量（MWh）",
+          title: "总充电量（kWh）",
           attr: "totalChargedCap",
+          color: '#4472c4'
         },
         {
-          title: "总放电量（MWh）",
-          attr: "totalDischargedCap",
+          title: "今日实时收入（元）",
+          attr: "dayRevenue",
+          color: '#f67438'
+        },
+        {
+          title: "昨日充电量（kWh）",
+          attr: "yesterdayChargedCap",
+          color: '#4472c4'
+        },
+        {
+          title: "昨日放电量（kWh）",
+          attr: "yesterdayDisChargedCap",
+          color: '#70ad47'
+        },
+        {
+          title: "总放电量（kWh）",
+          attr: "totalDischargedCap",
+          color: '#70ad47'
+        },
+        {
+          title: "昨日实时收入（元）",
+          attr: "yesterdayRevenue",
+          color: '#f67438'
         },
-
       ],
       info: {}, //基本信息
       runningInfo: {}, //总累计运行数据+报警表格
@@ -134,14 +167,13 @@ export default {
   },
   computed: {
     tableData() {
-      console.log(
-        "this.runningInfo?.siteMonitorHomeAlarmVo ",
-        this.runningInfo?.siteMonitorHomeAlarmVo
-      );
       return this.runningInfo?.siteMonitorHomeAlarmVo || [];
     },
   },
   methods: {
+    toAlarm() {
+      this.$router.push({path: "/dzjk/gzgj", query: this.$route.query});
+    },
     getBaseInfo() {
       return getSingleSiteBaseInfo(this.siteId).then((response) => {
         this.info = response?.data || {};
@@ -164,13 +196,80 @@ export default {
         this.loading = false;
       });
       // 一分钟循环一次总累计运行数据
-      this.updateInterval(this.getRunningInfo)
+      this.updateInterval(this.getRunningInfo);
     },
   },
 };
 </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;
+  }
+}
+
 .row-container {
   & > .el-col {
     margin-bottom: 20px;
@@ -178,23 +277,47 @@ export default {
 }
 
 //数据概览
-.sjgl-data {
-  text-align: center;
-  &:nth-child(1),
-  &:nth-child(2) {
-    margin-bottom: 25px;
+.sjgl-col {
+  .sjgl-wrapper {
+    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: 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>
@@ -202,10 +325,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

@@ -11,7 +11,7 @@
     active-text-color="#ffffff"
     mode="horizontal"
   >
-    <el-menu-item :index="item.name" v-for="(item,index) in childrenRoute" :key="index+'dzjkChildrenRoute'">
+    <el-menu-item :index="item.name" v-for="(item,index) in childrenRoute" :key="index+'dzjkChildrenRoute'" :class="{'lighting':item.path.indexOf('gzgj')>-1 && dzjkAlarmLighting}">
         <router-link  style="height: 100%;width: 100%;display: block;padding:0 20px;" :to="{path:item.path,query:$route.query}">
             {{item.meta.title}}
         </router-link>
@@ -30,6 +30,7 @@ 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(){
@@ -38,14 +39,21 @@ export default {
       activeMenu:''
     }
   },
+  computed:{
+    ...mapState({
+      dzjkAlarmLighting:state=>state.ems.dzjkAlarmLighting
+    })
+  },
   methods:{
     submitSite(id){
-      if(id != this.$route.query.siteId){
-        console.log('单站监控选择了其他的站点id=',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,'页面地址不发生改变')
+        // console.log('单站监控选择了相同的其他的站点id=',id,'页面地址不发生改变')
       }
+      //获取告警列表数据
+      this.$store.dispatch('getSiteAlarmNum',id)
     }
   },
   beforeRouteLeave(to,from, next){
@@ -54,15 +62,27 @@ export default {
     this.$store.commit('SET_ZD_LIST',[])
     next()
   },
-  mounted() {
-    console.log('单站监控一级页面路由',this.$route)
-  }
-
 }
 </script>
 
 <style scoped lang="scss">
   .dzjk-ems-content-container{
     margin-top:0;
+    min-height: 60vh;
+  }
+  .lighting{
+    position: relative;
+    z-index: 1;
+    &::after{
+      content:"";
+      display: block;
+      background-color: red;
+      height: 10px;
+      width: 10px;
+      border-radius: 100%;
+      position: absolute;
+      right: -2px;
+      top: -2px;
+    }
   }
 </style>

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

@@ -10,16 +10,24 @@
       append-to-body
       width="1000px"
       class="ems-dialog"
-      :before-close="handleColsed"
+      :before-close="handleClosed"
+  >
+    <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">
         <el-radio-group class="card-title" v-model="dataUnit">
           <el-radio :label="1">分钟</el-radio>
           <el-radio :label="2">小时</el-radio>
           <el-radio :label="3">天</el-radio>
         </el-radio-group>
-        <date-time-select ref="dateTimeSelect" :data-unit="dataUnit" @initDate="((e)=>dataRange=e||[])" @updateDate="updateDate"/>
+        <date-time-select
+            ref="dateTimeSelect"
+            :data-unit="dataUnit"
+            @initDate="(e) => (dataRange = e || [])"
+            @updateDate="updateDate"
+        />
       </div>
       <div style="height: 350px" id="searchChart"></div>
     </el-card>
@@ -31,6 +39,7 @@ import resize from "@/mixins/ems/resize";
 import DateTimeSelect from "@/views/ems/search/DateTimeSelect.vue";
 import {getPointValueList} from "@/api/ems/search";
 import DateRangeSelect from "@/components/Ems/DateRangeSelect/index.vue";
+
 export default {
   components: {DateRangeSelect, DateTimeSelect},
   mixins: [resize],
@@ -38,38 +47,39 @@ export default {
     siteId: {
       type: String,
       required: true,
-    }
+    },
   },
   computed: {
     isDtdc() {
-      return this.categoryName === '单体电池'
+      return this.deviceCategory === "BATTERY";
     },
   },
   watch: {
     show(val) {
       if (!val) {
-        this.pointName=''
-        this.categoryName=''
-        this.deviceId=''
-        this.dataUnit=1
+        this.pointName = "";
+        this.deviceCategory = "";
+        this.deviceId = "";
+        this.dataUnit = 1;
+        this.child = "";
         if (!this.chart) {
-          return
+          return;
         }
-        this.hideLoading()
-        this.chart.dispose()
-        this.chart = null
+        this.hideLoading();
+        this.chart.dispose();
+        this.chart = null;
       }
     },
     dataUnit: {
       handler(newVal, oldVal) {
-        if(!this.show) return
-        console.log('wacth到了dataUnit的变化',newVal,oldVal)
+        if (!this.show) return;
+        console.log("wacth到了dataUnit的变化", newVal, oldVal);
         this.$nextTick(() => {
-          this.$refs.dateTimeSelect.init()
-          this.getDate()
-        })
+          this.$refs.dateTimeSelect.init();
+          this.getDate();
+        });
+      },
     },
-    }
   },
   data() {
     return {
@@ -77,131 +87,320 @@ export default {
       chart: null,
       dataUnit: 1,
       dataRange: [],
-      child:[],//单体电池需要数据 暂不删除
-      pointName:'',
-      categoryName:'',
-      deviceId:''
-    }
+      child: "", //单体电池需要数据
+      pointName: "",
+      deviceCategory: "",
+      deviceId: "",
+    };
   },
   methods: {
-    showChart({pointName,categoryName,deviceId}){
+    showChart({pointName, deviceCategory, deviceId, child = ""}) {
       //初始化数据
-      this.pointName=pointName
-      this.categoryName=categoryName
-      this.deviceId=deviceId
-      this.show = true
+      this.pointName = pointName;
+      this.deviceCategory = deviceCategory;
+      this.deviceId = deviceId;
+      child && (this.child = child);
+      this.show = true;
       this.$nextTick(() => {
-        this.$refs.dateTimeSelect.init()
-        this.initChart()
-        this.getDate()
-      })
+        this.$refs.dateTimeSelect.init();
+        this.initChart();
+        this.getDate();
+      });
     },
     initChart() {
-      this.chart = echarts.init(document.querySelector('#searchChart'))
+      this.chart = echarts.init(document.querySelector("#searchChart"));
     },
     showLoading() {
-      this.chart && this.chart.showLoading()
+      this.chart && this.chart.showLoading();
     },
     hideLoading() {
-      this.chart && this.chart.hideLoading()
+      this.chart && this.chart.hideLoading();
     },
     getDate() {
-        this.showLoading()
-        const{dataUnit,dataRange:[start='',end=''],child}=this
-        let siteDeviceMap={}
-        child.forEach(([first,second,third])=>{
-          if(siteDeviceMap[first]){
-            siteDeviceMap[first].push(third)
-          }else{
-            siteDeviceMap[first]=[]
-            siteDeviceMap[first].push(third)
-          }
-        })
-        let startDate,endDate
+      this.showLoading();
+      const {
+        siteId,
+        dataUnit,
+        dataRange: [start = "", end = ""],
+        child,
+        deviceId,
+        deviceCategory,
+        pointName,
+      } = this;
+      let siteDeviceMap = {};
+      child && (siteDeviceMap[siteId] = child);
+      let startDate, endDate;
       if (start && dataUnit === 3) {
         // startDate= start + `${dataUnit === 2 ? ':00' : ' 00:00:00'}`
-          startDate = start + ' 00:00:00'
+        startDate = start + " 00:00:00";
       } else {
-          startDate=start
+        startDate = start;
       }
       if (end && dataUnit === 3) {
         // endDate= end + `${dataUnit === 2 ? ':00' : ' 00:00:00'}`
-          endDate = end + ' 00:00:00'
+        endDate = end + " 00:00:00";
       } else {
-          endDate=end
+        endDate = end;
       }
 
-        getPointValueList({siteIds:[this.siteId],deviceId:this.deviceId,dataUnit,categoryName:this.categoryName,pointName:this.pointName,startDate,endDate,siteDeviceMap:{}}).then(response => {
-          this.setOption(response?.data || [])
-        }).finally(()=>{
-          this.hideLoading()
+      getPointValueList({
+        siteIds: [siteId],
+        deviceId,
+        dataUnit,
+        deviceCategory,
+        pointName,
+        startDate,
+        endDate,
+        siteDeviceMap,
       })
+          .then((response) => {
+            this.setOption(response?.data || []);
+          })
+          .finally(() => {
+            this.hideLoading();
+          });
     },
     setOption(data) {
-      if(!this.chart) return
-      this.chart.clear()
-      console.log('返回的数据',data)
-      let dataset=[]
-      if(data.length>0){
-        data.forEach((item,index)=>{
-          item.deviceList.forEach(inner=>{
-            dataset.push({
-              name:`${this.isDtdc ? `${inner.parentDeviceId ? inner.parentDeviceId+'-' : ''}` : ''}${this.pointName}`,
-              type:'line',
-              xdata:[],
-              data:[]
-            })
-            const length = dataset.length
-            inner.pointValueList.forEach(value=>{
-              dataset[length-1].xdata.push(value.valueDate)
-              dataset[length-1].data.push(value.pointValue)
-            })
-          })
-        })
-      }else{
-        this.$message.warning('暂无数据')
+      if (!this.chart) return;
+      this.chart.clear();
+      console.log("返回的数据", data);
+      if (!data || data.length <= 0) {
+        this.$message.warning("暂无数据");
       }
-      console.log('图表数据',dataset)
+      console.log('展示的图表类型chartType', data[0].chartType)
+
+      if (data[0].chartType === 2) {
+        //   箱型图
+        this.setBoxOption(data)
+      } else {
+        //折线图
+        this.setLineOption(data)
+      }
+    },
+    setLineOption(data) {
+      let dataset = [];
+      data.forEach((item, index) => {
+        item.deviceList.forEach((inner) => {
+          dataset.push({
+            name: `${
+                this.isDtdc
+                    ? `${inner.parentDeviceId ? inner.parentDeviceId + "-" : ""}${inner.deviceId}`
+                    : `${inner.deviceId}`
+            }`,
+            type: "line",
+            markPoint: {
+              symbolSize: 30,
+              emphasis: {
+                disabled: false//打开 鼠标高亮
+              },
+              data: [//最大值、最小值
+                {
+                  // type: 'max',
+                  name: `最大值`,
+                  coord: [inner.maxDate, inner.maxValue],
+                  relativeTo: 'coordinate',
+                  label: {
+                    position: "top",
+                    formatter: item.dataType === 2 ? ([
+                      `最大值:${inner.maxValue}`,
+                      // `平均值:${inner.avgValue}`,
+                      `差值:${inner.diffValue}`,
+                    ]).join('\n') : ([
+                      `最大值:${inner.maxValue}`,
+                      // `平均值:${inner.avgValue}`,
+                    ]).join('\n'),
+                  },
+                },
+                {
+                  // type: 'min',
+                  name: `最小值`,
+                  coord: [inner.minDate, inner.minValue],
+                  relativeTo: 'coordinate',
+                  label: {
+                    position: "top",
+                    formatter: item.dataType === 2 ? ([
+                      `最小值:${inner.minValue}`,
+                      // `平均值:${inner.avgValue}`,
+                      `差值:${inner.diffValue}`,
+                    ]).join('\n') : ([
+                      `最小值:${inner.minValue}`,
+                      // `平均值:${inner.avgValue}`,
+                    ]).join('\n'),
+                  }
+                }
+              ]
+            },
+            xdata: [],
+            data: [],
+          });
+          const length = dataset.length;
+          inner.pointValueList.forEach((value) => {
+            dataset[length - 1].xdata.push(value.valueDate);
+            dataset[length - 1].data.push(value.pointValue);
+          });
+        });
+      });
+      console.log("折线图图表数据", dataset);
       this.chart.setOption({
         legend: {
           // left: 'center',
           // top: '10',
         },
         grid: {
-          containLabel: true
+          containLabel: true,
         },
         tooltip: {
-          trigger: 'axis',
-          axisPointer: { // 坐标轴指示器，坐标轴触发有效
-            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
-          }
+          trigger: "axis",
+          axisPointer: {
+            type: 'cross',
+          },
+          // axisPointer: {
+          //   // 坐标轴指示器，坐标轴触发有效
+          //   type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+          // },
         },
         textStyle: {
           color: "#333333",
         },
-        xAxis: {type:'category',data:dataset?.[0]?.xdata || []},
+        xAxis: {type: "category", data: dataset?.[0]?.xdata || []},
         yAxis: {
-          type: 'value',
+          type: "value",
         },
         dataZoom: [
           {
-            type: 'inside',
+            type: "inside",
             start: 0,
-            end: 100
+            end: 100,
           },
           {
             start: 0,
-            end: 100
-          }
+            end: 100,
+          },
         ],
-        series: dataset
-      })
+        series: dataset,
+      });
     },
+    setBoxOption(data) {
+      let dataset = [];
+      data.forEach((item, index) => {
+        item.deviceList.forEach((inner) => {
+          dataset.push({
+            name: `${
+                this.isDtdc
+                    ? `${inner.parentDeviceId ? inner.parentDeviceId + "-" : ""}${inner.deviceId}`
+                    : `${inner.deviceId}`
+            }`,
+            type: "boxplot",
+            // markPoint: {
+            //   symbolSize: 30,
+            //   emphasis: {
+            //     disabled: false//打开 鼠标高亮
+            //   },
+            //   data: [//最大值、最小值
+            //     {
+            //       // type: 'max',
+            //       name: `最大值`,
+            //       coord: [inner.maxDate, inner.maxValue],
+            //       relativeTo: 'coordinate',
+            //       label: {
+            //         position: "top",
+            //         formatter: item.dataType === 2 ? ([
+            //           `最大值:${inner.maxValue}`,
+            //           // `平均值:${inner.avgValue}`,
+            //           `差值:${inner.diffValue}`,
+            //         ]).join('\n') : ([
+            //           `最大值:${inner.maxValue}`,
+            //           // `平均值:${inner.avgValue}`,
+            //         ]).join('\n'),
+            //       },
+            //     },
+            //     {
+            //       // type: 'min',
+            //       name: `最小值`,
+            //       coord: [inner.minDate, inner.minValue],
+            //       relativeTo: 'coordinate',
+            //       label: {
+            //         position: "top",
+            //         formatter: item.dataType === 2 ? ([
+            //           `最小值:${inner.minValue}`,
+            //           // `平均值:${inner.avgValue}`,
+            //           `差值:${inner.diffValue}`,
+            //         ]).join('\n') : ([
+            //           `最小值:${inner.minValue}`,
+            //           // `平均值:${inner.avgValue}`,
+            //         ]).join('\n'),
+            //       }
+            //     }
+            //   ]
+            // },
+            xdata: [],
+            data: [],
+          });
+          const length = dataset.length;
+          inner.pointValueList.forEach((value) => {
+            const {valueDate, min, q1, median, q3, max} = value
+            // const mid = (max - min) / 2, minLine = min + Math.abs(median / 2),
+            //     maxLine = max - Math.abs(median / 2)
+            dataset[length - 1].xdata.push(valueDate);
+            dataset[length - 1].data.push([min, q1, median, q3, max]);
+          });
+        });
+      });
+      console.log("箱型图图表数据", dataset);
+      this.chart.setOption({
+        legend: {
+          // left: 'center',
+          // top: '10',
+        },
+        grid: {
+          containLabel: true,
+        },
+        tooltip: {
+          trigger: 'item',
+          formatter: function (params) {
+            let data = params.data;
+            let result = params.marker + params.name + ' ' + params.seriesName + '<br/>';
+            result += '最小值: ' + data[1] + '<br/>';
+            result += '平均值: ' + data[3] + '<br/>';
+            result += '最大值: ' + data[5];
+            return result;
+          }
+          // trigger: "axis",
+          // axisPointer: {
+          //   type: 'cross',
+          // },
+          // axisPointer: {
+          //   // 坐标轴指示器，坐标轴触发有效
+          //   type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+          // },
+        },
+        textStyle: {
+          color: "#333333",
+        },
+        xAxis: {type: "category", data: dataset?.[0]?.xdata || []},
+        yAxis: {
+          type: "value",
+        },
+        dataZoom: [
+          {
+            type: "inside",
+            start: 0,
+            end: 100,
+          },
+          {
+            start: 0,
+            end: 100,
+          },
+        ],
+        series: dataset,
+      });
+    },
+
     updateDate(val) {
-      this.dataRange =val || []
-      this.getDate()
+      this.dataRange = val || [];
+      this.getDate();
     },
-    handleColsed(done) {
+    handleClosed(done) {
       if (!this.chart) {
         return done();
       }
@@ -209,8 +408,8 @@ export default {
       this.chart = null;
       done();
     },
-  }
-}
+  },
+};
 </script>
 <style scoped lang="scss">
 ::v-deep {
@@ -218,5 +417,4 @@ export default {
     line-height: 40px;
   }
 }
-
 </style>

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

@@ -1,26 +1,52 @@
-
 <template>
   <div v-loading="loading">
     <div v-for="(baseInfo,index) in baseInfoList" :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="{
-        'warning-card-container':baseInfo.workStatus && baseInfo.workStatus !== '0',
-        'running-card-container':baseInfo.workStatus === '0'
-      }">
+      <el-card shadow="always"
+               class="sbjk-card-container common-card-container-body-no-padding common-card-container-no-title-bg"
+               :class="handleCardClass(baseInfo)">
         <div slot="header">
-          <span class="large-title">{{index+1}}#{{baseInfo.parentDeviceName?`${baseInfo.parentDeviceName} —> ` : ''}}{{baseInfo.deviceName}}</span>
+          <span
+              class="large-title">{{
+              baseInfo.parentDeviceName ? `${baseInfo.parentDeviceName} -> ` : ''
+            }}{{ baseInfo.deviceName }}</span>
+          <div class="info">
+            <div>数据更新时间：{{ baseInfo.dataUpdateTime || '-' }}</div>
+          </div>
+          <div class="alarm">
+            <el-button type="primary" round size="small" style="margin-right:20px;"
+                       @click="pointDetail(baseInfo,'point')">详细
+            </el-button>
+            <el-badge :hidden="!baseInfo.alarmNum" :value="baseInfo.alarmNum || 0" class="item">
+              <i
+                  class="el-icon-message-solid alarm-icon"
+                  @click="pointDetail(baseInfo,'alarmPoint')"
+              ></i>
+            </el-badge>
+          </div>
         </div>
         <div class="descriptions-main">
           <el-descriptions direction="vertical" :column="3" :colon="false">
-              <el-descriptions-item labelClassName="descriptions-label" :contentClassName="`descriptions-direction ${baseInfo.workStatus === '0' ? 'save' :'danger'}`" :span="1"  label="工作状态" >{{$store.state.ems.workStatusOptions[baseInfo.workStatus]}}</el-descriptions-item>
-              <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"  :span="1" label="与PCS通信">{{$store.state.ems.communicationStatusOptions[baseInfo.pcsCommunicationStatus]}}</el-descriptions-item>
-              <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"  :span="1" label="与EMS通信">{{$store.state.ems.communicationStatusOptions[baseInfo.emsCommunicationStatus]}}</el-descriptions-item>
+            <el-descriptions-item
+                contentClassName="descriptions-direction work-status"
+                :span="1" label="工作状态">
+              {{ CLUSTERWorkStatusOptions[baseInfo.workStatus] }}
+            </el-descriptions-item>
+            <el-descriptions-item contentClassName="descriptions-direction"
+                                  :span="1" label="与PCS通信">
+              {{ $store.state.ems.communicationStatusOptions[baseInfo.pcsCommunicationStatus] }}
+            </el-descriptions-item>
+            <el-descriptions-item contentClassName="descriptions-direction"
+                                  :span="1" label="与EMS通信">
+              {{ $store.state.ems.communicationStatusOptions[baseInfo.emsCommunicationStatus] }}
+            </el-descriptions-item>
           </el-descriptions>
         </div>
         <div class="descriptions-main descriptions-main-bg-color">
           <el-descriptions direction="vertical" :column="3" :colon="false">
-              <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)">
+            <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)">
                 {{ baseInfo[item.attr] | formatNumber }} <span v-if="item.unit" v-html="item.unit"></span>
               </span>
             </el-descriptions-item>
@@ -30,7 +56,9 @@
             <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 :  {{baseInfo.currentSoc}}%</div>
+            <div class="process pointer" @click="showChart( '当前SOC',baseInfo.deviceId)">当前SOC :
+              {{ baseInfo.currentSoc }}%
+            </div>
           </div>
         </div>
         <el-table
@@ -50,14 +78,20 @@
               label="单体平均值"
           >
             <template slot-scope="scope">
-              <span class="pointer" @click="showChart( tablePointNameMap[scope.row.dataName+scope.column.label],'电池簇',baseInfo.deviceId)">{{scope.row.avgData}}</span>
+              <span class="pointer"
+                    @click="showChart( tablePointNameMap[scope.row.dataName+scope.column.label],baseInfo.deviceId)">{{
+                  scope.row.avgData
+                }}</span>
             </template>
           </el-table-column>
           <el-table-column
               prop="minData"
               label="单体最小值">
             <template slot-scope="scope">
-              <span class="pointer" @click="showChart( tablePointNameMap[scope.row.dataName+scope.column.label],'电池簇',baseInfo.deviceId)">{{scope.row.minData}}</span>
+              <span class="pointer"
+                    @click="showChart( tablePointNameMap[scope.row.dataName+scope.column.label],baseInfo.deviceId)">{{
+                  scope.row.minData
+                }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -68,7 +102,10 @@
               prop="maxData"
               label="单体最大值">
             <template slot-scope="scope">
-              <span class="pointer " @click="showChart( tablePointNameMap[scope.row.dataName+scope.column.label],'电池簇',baseInfo.deviceId)">{{scope.row.maxData}}</span>
+              <span class="pointer "
+                    @click="showChart( tablePointNameMap[scope.row.dataName+scope.column.label],baseInfo.deviceId)">{{
+                  scope.row.maxData
+                }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -80,19 +117,28 @@
     </div>
     <el-empty v-show="baseInfoList.length<=0" :image-size="200"></el-empty>
     <point-chart ref="pointChart" :site-id="siteId"/>
+    <point-table ref="pointTable"/>
   </div>
 
 </template>
 
 <script>
 import pointChart from "./../PointChart.vue";
+import PointTable from "@/views/ems/site/sblb/PointTable.vue";
 import {getBMSBatteryCluster} from '@/api/ems/dzjk'
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import intervalUpdate from "@/mixins/ems/intervalUpdate";
+import {mapState} from "vuex";
+
 export default {
   name: 'DzjkSbjkBmsdcc',
   mixins: [getQuerySiteId, intervalUpdate],
-  components:{pointChart},
+  components: {PointTable, pointChart},
+  computed: {
+    ...mapState({
+      CLUSTERWorkStatusOptions: state => state?.ems?.CLUSTERWorkStatusOptions || {},
+    })
+  },
   data() {
     return {
       loading: false,
@@ -127,15 +173,25 @@ export default {
     }
   },
   methods: {
-    showChart(pointName,categoryName,deviceId){
-      console.log('点击查询图表',pointName,categoryName,deviceId)
-      pointName && this.$refs.pointChart.showChart({pointName,categoryName,deviceId})
+    handleCardClass(item) {
+      const {workStatus = ''} = item
+      return !(Object.keys(this.CLUSTERWorkStatusOptions).includes(item.workStatus)) ? "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) {
+      pointName && this.$refs.pointChart.showChart({pointName, deviceCategory: 'CLUSTER', deviceId})
     },
     updateData() {
       this.loading = true
       getBMSBatteryCluster(this.siteId).then(response => {
         this.baseInfoList = JSON.parse(JSON.stringify(response?.data || []));
-      }).finally(() => {this.loading = false})
+      }).finally(() => {
+        this.loading = false
+      })
     },
     init() {
       this.updateData()
@@ -151,10 +207,12 @@ export default {
   .descriptions-main {
     padding: 24px 300px 24px 24px;
   }
+
   .descriptions-main-bottom {
     padding: 14px 300px 14px 24px;
   }
 }
+
 //  进度条样式
 .process-container {
   width: 100px;
@@ -162,6 +220,7 @@ export default {
   right: 70px;
   top: 50%;
   transform: translateY(-50%);
+
   .process-line-bg {
     position: relative;
     width: 100%;
@@ -169,6 +228,7 @@ export default {
     background-color: #fff2cb;
     border-radius: 6px;
     box-shadow: 0 0 10px #fff2cb, 0 0 0 rgba(255, 242, 203, 0.5);
+
     .process-line {
       position: absolute;
       left: 0;
@@ -180,6 +240,7 @@ export default {
       box-shadow: 0 0 10px #ffbf14, 0 0 0 rgba(255, 191, 20, 0.5);
     }
   }
+
   .process {
     margin-top: 15px;
     color: #666666;

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

@@ -1,26 +1,50 @@
-
 <template>
   <div v-loading="loading">
     <div v-for="(baseInfo,index) in baseInfoList" :key="index+'bmszlContainer'" style="margin-bottom:25px;">
-      <el-card :class="{
-        'warning-card-container':baseInfo.workStatus && baseInfo.workStatus !== '0',
-        'running-card-container':baseInfo.workStatus === '0'
-      }" class="sbjk-card-container common-card-container-body-no-padding common-card-container-no-title-bg"
+      <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">{{index+1}}#{{baseInfo.deviceName}}</span>
+          <span class="large-title">{{ baseInfo.deviceName }}</span>
+          <div class="info">
+            <div>数据更新时间：{{ baseInfo.dataUpdateTime || '-' }}</div>
+          </div>
+          <div class="alarm">
+            <el-button type="primary" round size="small" style="margin-right:20px;"
+                       @click="pointDetail(baseInfo,'point')">详细
+            </el-button>
+            <el-badge :hidden="!baseInfo.alarmNum" :value="baseInfo.alarmNum || 0" class="item">
+              <i
+                  class="el-icon-message-solid alarm-icon"
+                  @click="pointDetail(baseInfo,'alarmPoint')"
+              ></i>
+            </el-badge>
+          </div>
         </div>
         <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" label="工作状态" labelClassName="descriptions-label" >{{$store.state.ems.workStatusOptions[baseInfo.workStatus]}}</el-descriptions-item>
-            <el-descriptions-item :span="1" contentClassName="descriptions-direction"  label="与PCS通信" labelClassName="descriptions-label">{{$store.state.ems.communicationStatusOptions[baseInfo.pcsCommunicationStatus]}}</el-descriptions-item>
-            <el-descriptions-item :span="1" contentClassName="descriptions-direction"  label="与EMS通信" labelClassName="descriptions-label">{{$store.state.ems.communicationStatusOptions[baseInfo.emsCommunicationStatus]}}</el-descriptions-item>
+            <el-descriptions-item
+                contentClassName="descriptions-direction work-status"
+                label="工作状态" labelClassName="descriptions-label">
+              {{ STACKWorkStatusOptions[baseInfo.workStatus] }}
+            </el-descriptions-item>
+            <el-descriptions-item :span="1" contentClassName="descriptions-direction" label="与PCS通信"
+                                  labelClassName="descriptions-label">
+              {{ $store.state.ems.communicationStatusOptions[baseInfo.pcsCommunicationStatus] }}
+            </el-descriptions-item>
+            <el-descriptions-item :span="1" contentClassName="descriptions-direction" label="与EMS通信"
+                                  labelClassName="descriptions-label">
+              {{ $store.state.ems.communicationStatusOptions[baseInfo.emsCommunicationStatus] }}
+            </el-descriptions-item>
           </el-descriptions>
         </div>
         <div class="descriptions-main descriptions-main-bg-color">
           <el-descriptions :colon="false" :column="3" direction="vertical">
-            <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)">
+            <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)">
                 {{ baseInfo[item.attr] | formatNumber }}<span v-if="item.unit" v-html="item.unit"></span>
               </span>
             </el-descriptions-item>
@@ -30,7 +54,9 @@
             <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 : {{baseInfo.stackSoc}}%</div>
+            <div class="process pointer" @click="showChart('当前SOC',baseInfo.deviceId)">当前SOC :
+              {{ baseInfo.stackSoc }}%
+            </div>
           </div>
         </div>
         <el-table
@@ -47,26 +73,32 @@
               label="簇电压"
           >
             <template slot-scope="scope">
-              <span class="pointer" @click="showChart('簇电压','电池簇',scope.row.clusterId)">{{scope.row.clusterVoltage}} V</span>
+              <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)">{{scope.row.clusterCurrent}} A</span>
+              <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)">{{scope.row.currentSoc}} %</span>
+              <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)">{{scope.row.maxCellVoltage}} V</span>
+              <span class="pointer"
+                    @click="showChart('最高单体电压',scope.row.clusterId,'CLUSTER')">{{
+                  scope.row.maxCellVoltage
+                }} V</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -77,7 +109,10 @@
               label="单体最低电压"
               prop="minVoltage">
             <template slot-scope="scope">
-              <span class="pointer" @click="showChart('最低单体电压','电池簇',scope.row.clusterId)">{{scope.row.minCellVoltage}} V</span>
+              <span class="pointer"
+                    @click="showChart('最低单体电压',scope.row.clusterId,'CLUSTER')">{{
+                  scope.row.minCellVoltage
+                }} V</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -87,7 +122,10 @@
           <el-table-column
               label="单体最高温度">
             <template slot-scope="scope">
-              <span class="pointer" @click="showChart('最高单体温度','电池簇',scope.row.clusterId)">{{scope.row.maxCellTemp}} &#8451;</span>
+              <span class="pointer"
+                    @click="showChart('最高单体温度',scope.row.clusterId,'CLUSTER')">{{
+                  scope.row.maxCellTemp
+                }} &#8451;</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -98,7 +136,10 @@
               label="单体最低温度"
               prop="minTemperature">
             <template slot-scope="scope">
-              <span class="pointer" @click="showChart('最低单体温度','电池簇',scope.row.clusterId)">{{scope.row.minCellTemp}} &#8451;</span>
+              <span class="pointer"
+                    @click="showChart('最低单体温度',scope.row.clusterId,'CLUSTER')">{{
+                  scope.row.minCellTemp
+                }} &#8451;</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -111,6 +152,7 @@
     </div>
     <el-empty v-show="baseInfoList.length<=0" :image-size="200"></el-empty>
     <point-chart ref="pointChart" :site-id="siteId"/>
+    <point-table ref="pointTable"/>
   </div>
 </template>
 
@@ -119,10 +161,18 @@ import {getBMSOverView} from '@/api/ems/dzjk'
 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,},
+  components: {pointChart, PointTable},
   mixins: [getQuerySiteId, intervalUpdate],
+  computed: {
+    ...mapState({
+      STACKWorkStatusOptions: state => state?.ems?.STACKWorkStatusOptions || {},
+    })
+  },
   data() {
     return {
       loading: false,
@@ -141,15 +191,26 @@ export default {
     }
   },
   methods: {
-    showChart(pointName,categoryName,deviceId){
-      console.log('点击查询图表',pointName,categoryName,deviceId)
-      pointName && this.$refs.pointChart.showChart({pointName,categoryName,deviceId})
+    handleCardClass(item) {
+      const {workStatus = ''} = item
+      return !Object.keys(this.STACKWorkStatusOptions).find(i => i === workStatus) ? "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') {
+      pointName && this.$refs.pointChart.showChart({pointName, deviceCategory, deviceId})
     },
     updateData() {
       this.loading = true
       getBMSOverView(this.siteId).then(response => {
         this.baseInfoList = JSON.parse(JSON.stringify(response?.data || []));
-      }).finally(() => {this.loading = false})
+      }).finally(() => {
+        this.loading = false
+      })
     },
     init() {
       this.updateData()
@@ -171,6 +232,7 @@ export default {
     }
   }
 }
+
 //  进度条样式
 .process-container {
   width: 100px;
@@ -178,6 +240,7 @@ export default {
   right: 70px;
   top: 50%;
   transform: translateY(-50%);
+
   .process-line-bg {
     position: relative;
     width: 100%;
@@ -185,6 +248,7 @@ export default {
     background-color: #fff2cb;
     border-radius: 6px;
     box-shadow: 0 0 10px #fff2cb, 0 0 0 rgba(255, 242, 203, 0.5);
+
     .process-line {
       position: absolute;
       left: 0;
@@ -196,6 +260,7 @@ export default {
       box-shadow: 0 0 10px rgb(252 108 108), 0 0 0 rgba(252, 108, 108, 0.5);
     }
   }
+
   .process {
     margin-top: 15px;
     color: #666666;

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

@@ -6,7 +6,8 @@
         shadow="always"
         class="sbjk-card-container list"
         :class="{
-        'warning-card-container':item.emsCommunicationStatus && item.emsCommunicationStatus !== '0',
+        'timing-card-container':!['0','2'].includes(item.emsCommunicationStatus),
+        'warning-card-container':item.emsCommunicationStatus === '2',
         'running-card-container':item.emsCommunicationStatus === '0'
       }"
     >
@@ -15,31 +16,37 @@
         <div class="info">
           <div>
             {{
-               $store.state.ems.communicationStatusOptions[
-                   item.emsCommunicationStatus
-                   ]
+              communicationStatusOptions[item.emsCommunicationStatus] || '-'
             }}
           </div>
-           <div>数据更新时间：{{ item.dataUpdateTime }}</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 :hidden="!item.alarmNum" :value="item.alarmNum || 0" class="item">
+            <i
+                class="el-icon-message-solid alarm-icon"
+                @click="pointDetail(item,'alarmPoint')"
+            ></i>
+          </el-badge>
         </div>
       </div>
-       <el-table
-           class="common-table"
-           :data="item.loadDataDetailInfo"
-           @cell-click="(row,col)=>{handlerCell(item,row,col)}"
-           stripe
-           style="width: 100%"
-       >
-         <el-table-column prop="category" label="类别"> </el-table-column>
-         <el-table-column prop="totalKwh" label="总/kWh"> </el-table-column>
-         <el-table-column prop="peakKwh" label="尖/kWh"> </el-table-column>
-         <el-table-column prop="highKwh" label="峰/kWh"> </el-table-column>
-         <el-table-column prop="flatKwh" label="平/kWh"> </el-table-column>
-         <el-table-column prop="valleyKwh" label="谷/kWh"> </el-table-column>
-       </el-table>
+      <el-row class="device-info-row">
+        <el-col v-for="(tempDataItem,tempDataIndex) in (deviceIdTypeMsg[item.deviceId] || otherTypeMsg)"
+                :key="tempDataIndex+'dbTempData'"
+                :span="8" class="device-info-col">
+            <span class="pointer" @click="showChart(tempDataItem.pointName,item.deviceId)">
+              <span class="left">{{ tempDataItem.name }}</span> <span class="right">{{ item[tempDataItem.attr] || '-' }}<span
+                v-html="tempDataItem.unit"></span></span>
+            </span>
+        </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"/>
+    <point-table ref="pointTable"/>
   </div>
 </template>
 
@@ -48,27 +55,157 @@ import pointChart from "./../PointChart.vue";
 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 {mapState} from "vuex";
+
 export default {
   name: "DzjkSbjkDb",
   mixins: [getQuerySiteId, intervalUpdate],
-  components:{pointChart},
+  components: {PointTable, pointChart},
+  computed: {
+
+    ...mapState({
+      communicationStatusOptions: state => state?.ems?.communicationStatusOptions || {},
+    })
+  },
   data() {
     return {
       loading: false,
       list: [],
+      deviceIdTypeMsg: {
+        'LOAD': [
+          {
+            name: '正向有功电能',
+            attr: 'forwardActive',
+            pointName: '正向有功电能',
+            unit: 'kWh'
+          },
+          {
+            name: '反向有功电能',
+            attr: 'reverseActive',
+            pointName: '反向有功电能',
+            unit: 'kWh'
+          },
+          {
+            name: '正向无功电能',
+            attr: 'forwardReactive',
+            pointName: '正向无功电能',
+            unit: 'kvarh'
+          },
+          {
+            name: '反向无功电能',
+            attr: 'reverseReactive',
+            pointName: '反向无功电能',
+            unit: 'kvarh'
+          },
+          {
+            name: '有功功率',
+            attr: 'activePower',
+            pointName: '总有功功率',
+            unit: 'kW'
+          },
+          {
+            name: '无功功率',
+            attr: 'reactivePower',
+            pointName: '总无功功率',
+            unit: 'kvar'
+          }
+        ],
+        'METE': [
+          {
+            name: '正向有功电能',
+            attr: 'forwardActive',
+            pointName: '正向有功电能',
+            unit: 'kWh'
+          },
+          {
+            name: '反向有功电能',
+            attr: 'reverseActive',
+            pointName: '反向有功电能',
+            unit: 'kWh'
+          },
+          {
+            name: '正向无功电能',
+            attr: 'forwardReactive',
+            pointName: '正向无功电能',
+            unit: 'kvarh'
+          },
+          {
+            name: '反向无功电能',
+            attr: 'reverseReactive',
+            pointName: '反向无功电能',
+            unit: 'kvarh'
+          },
+          {
+            name: '有功功率',
+            attr: 'activePower',
+            pointName: '总有功功率',
+            unit: 'kW'
+          },
+          {
+            name: '无功功率',
+            attr: 'reactivePower',
+            pointName: '总无功功率',
+            unit: 'kvar'
+          }
+        ],
+        'METEGF': [
+          {
+            name: '有功电能',
+            attr: 'activeEnergy',
+            pointName: '有功电能',
+            unit: 'kWh'
+          },
+          {
+            name: '无功电能',
+            attr: 'reactiveEnergy',
+            pointName: '无功电能',
+            unit: 'kvarh'
+          },
+          {
+            name: '有功功率',
+            attr: 'activePower',
+            pointName: '总有功功率',
+            unit: 'kW'
+          },
+          {
+            name: '无功功率',
+            attr: 'reactivePower',
+            pointName: '总无功功率',
+            unit: 'kvar'
+          }
+        ]
+      },
+      otherTypeMsg: [
+        {
+          name: '正向有功电能',
+          attr: 'forwardActive',
+          pointName: '正向有功电能',
+          unit: 'kWh'
+        },
+        {
+          name: '反向有功电能',
+          attr: 'reverseActive',
+          pointName: '反向有功电能',
+          unit: 'kWh'
+        },
+        {
+          name: '有功功率',
+          attr: 'activePower',
+          pointName: '总有功功率',
+          unit: 'kW'
+        },
+      ]
     };
   },
   methods: {
-    handlerCell({deviceId,deviceName},row,column){
-      if(column.label !== '类别'){
-        const arr = row.category.split('')
-        arr.splice(6,0,column.label[0])
-        this.showChart(arr.join(''),deviceName,deviceId)
-      }
+    // 查看设备电位表格
+    pointDetail(row, dataType) {
+      const {deviceId} = row
+      this.$refs.pointTable.showTable({siteId: this.siteId, deviceId, deviceCategory: 'AMMETER'}, dataType)
     },
-    showChart(pointName,categoryName,deviceId){
-      console.log('点击查询图表',pointName,categoryName,deviceId)
-      pointName && this.$refs.pointChart.showChart({pointName,categoryName,deviceId})
+    showChart(pointName, deviceId) {
+      pointName && this.$refs.pointChart.showChart({pointName, deviceCategory: 'AMMETER', deviceId})
     },
     updateData() {
       this.loading = true;
@@ -85,7 +222,8 @@ export default {
       this.updateInterval(this.updateData)
     },
   },
-  mounted() {},
+  mounted() {
+  },
 };
 </script>
 
@@ -94,15 +232,6 @@ export default {
   &.list:not(:last-child) {
     margin-bottom: 25px;
   }
-  ::v-deep {
-    .el-table__row td{
-      &:not(:first-child){
-        .cell{
-          cursor: pointer;
-        }
-      }
-    }
-  }
 }
 
 </style>

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

@@ -0,0 +1,120 @@
+<template>
+  <div v-loading="loading">
+    <el-card
+        v-for="(item,index) in list"
+        :key="index+'ylLise'"
+        class="sbjk-card-container running-card-container"
+        shadow="always">
+      <div slot="header">
+        <span class="large-title">{{ item.deviceName }}</span>
+        <div class="info">
+          <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 :hidden="!item.alarmNum" :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+'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
+                v-html="tempDataItem.unit"></span></span>
+            </span>
+        </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"/>
+    <point-table ref="pointTable"/>
+  </div>
+</template>
+
+
+<script>
+import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
+import {getDhDataList} from '@/api/ems/dzjk'
+import intervalUpdate from "@/mixins/ems/intervalUpdate";
+import pointChart from "./../PointChart.vue";
+import PointTable from "@/views/ems/site/sblb/PointTable.vue";
+
+export default {
+  name: 'DzjkSbjkDh',
+  mixins: [getQuerySiteId, intervalUpdate],
+  components: {pointChart, PointTable},
+  data() {
+    return {
+      loading: false,
+      list: [],
+      tempData: [
+        {title: '湿度', attr: 'humidity', unit: ''},
+        {title: '温度', attr: 'temperature', unit: '&#8451;'},
+      ]
+    }
+  },
+  methods: {
+    // 查看设备电位表格
+    pointDetail(row, dataType) {
+      const {deviceId} = row
+      this.$refs.pointTable.showTable({siteId: this.siteId, deviceId, deviceCategory: 'DH'}, dataType)
+    },
+    showChart(pointName, deviceId) {
+      pointName && this.$refs.pointChart.showChart({pointName, deviceCategory: 'DH', deviceId})
+    },
+    updateData() {
+      this.loading = true
+      getDhDataList(this.siteId).then(response => {
+        this.list = JSON.parse(JSON.stringify(response?.data || []));
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    init() {
+      this.updateData()
+      this.updateInterval(this.updateData)
+    }
+  },
+  mounted() {
+
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.sbjk-card-container {
+  &:not(:last-child) {
+    margin-bottom: 25px;
+  }
+
+  .el-row {
+    background-color: #ffffff;
+    border: 1px solid #eeeeee;
+    font-size: 14px;
+    line-height: 16px;
+    color: #333333;
+
+    .el-col {
+      padding: 12px 0;
+      text-align: center;
+      position: relative;
+    }
+
+    .el-col {
+      border-bottom: 1px solid #eeeeee;
+    }
+
+    .el-col:not(:nth-child(3n)) {
+      border-right: 1px solid #eeeeee;
+    }
+  }
+}
+</style>

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

@@ -10,13 +10,17 @@
     class="ems-dialog chart-detail-dialog"
     :before-close="handleColsed"
   >
-    <el-card shadow="always" class="common-card-container time-range-card" style="margin-top:20px">
+    <el-card
+      shadow="always"
+      class="common-card-container time-range-card"
+      style="margin-top: 20px"
+    >
       <div slot="header" class="time-range-header">
         <span class="card-title"></span>
         <date-range-select ref="dateRangeSelect" @updateDate="updateDate" />
       </div>
       <div class="card-main" v-loading="loading">
-        <div id="lineChart" style="height: 310px;"></div>
+        <div id="lineChart" style="height: 310px"></div>
       </div>
     </el-card>
   </el-dialog>
@@ -49,8 +53,8 @@ export default {
   methods: {
     // 更新时间范围 重置图表
     updateDate(data) {
-      this.dateRange=data || []
-      this.getData()
+      this.dateRange = data || [];
+      this.getData();
     },
     handleColsed(done) {
       if (!this.chart) {
@@ -94,7 +98,7 @@ export default {
       this.$nextTick(() => {
         !this.chart &&
           (this.chart = echarts.init(document.querySelector("#lineChart")));
-        this.$refs.dateRangeSelect.init()
+        this.$refs.dateRangeSelect.init();
       });
     },
     setOption(data) {
@@ -148,7 +152,6 @@ export default {
           },
         ];
       }
-
       this.chart &&
         this.chart.setOption({
           color: ["#FFBD00", "#3C81FF", "#05AEA3", "#F86F70"],

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

@@ -10,14 +10,17 @@
           v-for="(item, index) in tableData"
           :key="index + 'dtdcList'"
           :class="handleListClass(item)"
-          @click="chartDetail(item)"
         >
           <div style="font-size: 10px; font-weight: 600">
             {{ item.clusterDeviceId }}
           </div>
           <div>#{{ item.deviceId }}</div>
-          <div class="dy">{{ item.voltage }}V</div>
-          <div class="wd">{{ item.temperature }}℃</div>
+          <div class="dy pointer" @click="chartDetail(item, '电压 (V)')">
+            {{ item.voltage }}V
+          </div>
+          <div class="wd pointer" @click="chartDetail(item, '温度 (℃)')">
+            {{ item.temperature }}℃
+          </div>
         </div>
       </div>
 
@@ -101,7 +104,7 @@ export default {
     //查看表格行图表
     chartDetail(row, dataType = "") {
       const { clusterDeviceId, deviceId } = row;
-      this.$emit("chart", { clusterDeviceId, deviceId, dataType });
+      this.$emit("chart", { ...row, dataType });
     },
   },
 };
@@ -123,7 +126,6 @@ export default {
     box-sizing: content-box;
     min-width: 60px;
     width: auto;
-    cursor: pointer;
     &::before {
       display: block;
       content: "";

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

@@ -8,10 +8,10 @@
     >
       <el-table-column prop="deviceId" label="单体编号"></el-table-column>
       <el-table-column prop="clusterDeviceId" label="簇号"></el-table-column>
-      <el-table-column prop="voltage" label="电压（V）">
+      <el-table-column prop="voltage" label="电压 (V)">
         <template slot-scope="scope">
           <el-button
-            @click="chartDetail(scope.row, 'voltage')"
+              @click="chartDetail(scope.row, '电压 (V)')"
               type="text"
               size="small"
           >
@@ -19,10 +19,10 @@
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column prop="temperature" label="温度（℃）">
+      <el-table-column prop="temperature" label="温度 (℃)">
         <template slot-scope="scope">
           <el-button
-            @click="chartDetail(scope.row, 'temperature')"
+              @click="chartDetail(scope.row, '温度 (℃)')"
               type="text"
               size="small"
           >
@@ -30,10 +30,10 @@
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column prop="soc" label="SOC（%）">
+      <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"
           >
@@ -41,10 +41,10 @@
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column prop="soh" label="SOH（%）">
+      <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,10 +52,13 @@
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="曲线图">
+      <el-table-column label="操作" width="160">
         <template slot-scope="scope">
-          <el-button @click="chartDetail(scope.row)" type="text" size="small">
-            展示
+          <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>
@@ -115,8 +118,7 @@ export default {
   methods: {
     //查看表格行图表
     chartDetail(row, dataType = "") {
-      const { clusterDeviceId, deviceId } = row;
-      this.$emit("chart", { clusterDeviceId, deviceId, dataType });
+      this.$emit("chart", {...row, dataType});
     },
   },
 };

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

@@ -88,6 +88,7 @@
       :totalSize="totalSize"
       :pointIdList="pointIdList"
       @chart="chartDetail"
+      @pointDetail="pointDetail"
     ></component>
     <el-pagination
       v-show="tableData.length > 0"
@@ -103,6 +104,8 @@
     >
     </el-pagination>
     <chart-detail ref="chartDetail" />
+    <point-chart ref="pointChart" :site-id="siteId" />
+    <point-table ref="pointTable"/>
   </el-card>
 </template>
 
@@ -117,10 +120,19 @@ 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: { BarChart, ChartDetail, DtdcTable: Table, DtdcList: List },
+  components: {
+    PointTable,
+    BarChart,
+    ChartDetail,
+    DtdcTable: Table,
+    DtdcList: List,
+    pointChart,
+  },
   computed: {
     pointIdList() {
       let obj = {};
@@ -157,17 +169,24 @@ export default {
     };
   },
   methods: {
+    // 查看设备电位表格
+    pointDetail(row,dataType){
+      const {deviceId,clusterDeviceId} = row
+      this.$refs.pointTable.showTable({siteId:this.siteId,deviceId,deviceCategory:'BATTERY',parentId:clusterDeviceId},dataType)
+    },
     changeMenu(menu) {
       const { activeBtn } = this;
       activeBtn !== menu && (this.activeBtn = menu);
     },
     //查看表格行图表
-    chartDetail({ clusterDeviceId, deviceId, dataType = "" }) {
-      const { siteId } = this;
-      this.$refs.chartDetail.initChart(
-        { siteId, clusterDeviceId, deviceId },
-        dataType
-      );
+    chartDetail({ deviceId, clusterDeviceId, dataType = "" }) {
+      dataType &&
+        this.$refs.pointChart.showChart({
+          pointName: dataType,
+          deviceCategory:'BATTERY',
+          deviceId: clusterDeviceId,
+          child: [deviceId],
+        });
     },
     // 分页
     handleSizeChange(val) {

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

@@ -0,0 +1,133 @@
+<template>
+  <div v-loading="loading" class="ems">
+    <el-card
+        v-for="(item,index) in list"
+        :key="index+'emsList'"
+        class="sbjk-card-container list running-card-container"
+        shadow="always"
+    >
+      <div slot="header">
+        <span class="large-title">{{ item.deviceName }}</span>
+        <div class="info">
+          <div>
+            EMS控制模式: {{
+              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 :hidden="!item.alarmNum" :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'"
+                :span="6" class="device-info-col">
+            <span class="pointer" @click="showChart(tempDataItem.name,item.deviceId)">
+              <span class="left">{{ tempDataItem.name }}</span> <span class="right">{{ item[tempDataItem.attr] }}<span
+                v-html="tempDataItem.unit"></span></span>
+            </span>
+        </el-col>
+        <el-col v-for="(tempDataItem,tempDataIndex) in pcsDataList" :key="tempDataIndex+'pcsTempData'"
+                :span="6" class="device-info-col">
+            <span class="pointer" @click="showChart(tempDataItem.name,item.deviceId)">
+              <span class="left">{{ tempDataItem.name }}</span> <span class="right">{{ item[tempDataItem.attr] }}<span
+                v-html="tempDataItem.unit"></span></span>
+            </span>
+        </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"/>
+    <point-table ref="pointTable"/>
+  </div>
+</template>
+
+<script>
+import pointChart from "./../PointChart.vue";
+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";
+
+export default {
+  name: "DzjkSbjkEms",
+  components: {pointChart, PointTable},
+  mixins: [getQuerySiteId, intervalUpdate],
+  data() {
+    return {
+      loading: false,
+      list: [],
+      bmsDataList: [{
+        name: 'BMS1SOC',
+        attr: 'bms1Soc'
+      },
+        {
+          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'
+        }]
+    };
+  },
+  methods: {
+    // 查看设备电位表格
+    pointDetail(row, dataType) {
+      const {deviceId} = row
+      this.$refs.pointTable.showTable({siteId: this.siteId, deviceId, deviceCategory: 'EMS'}, dataType)
+    },
+    showChart(pointName, deviceId) {
+      pointName &&
+      this.$refs.pointChart.showChart({pointName, deviceCategory: 'EMS', deviceId});
+    },
+    getData() {
+      this.loading = true;
+      getEmsDataList(this.siteId)
+          .then((response) => {
+            const data = response?.data || {};
+            this.list = JSON.parse(JSON.stringify(data));
+          })
+          .finally(() => (this.loading = false));
+    },
+    updateData() {
+      this.getData();
+    },
+    init() {
+      this.updateData();
+      this.updateInterval(this.updateData);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -1,5 +1,5 @@
 <template>
-    <div class="ems-dashboard-editor-container ems-third-menu-container">
+    <div class="ems-dashboard-editor-container ems-third-menu-container" v-loading="loading">
       <el-menu
         class="ems-third-menu"
         :default-active="$route.name"
@@ -7,7 +7,7 @@
         text-color="#666666"
         active-text-color="#ffffff"
       >
-      <el-menu-item :index="item.name" v-for="(item,index) in childrenRoute" :key="index+'dzjkChildrenRoute'">
+        <el-menu-item :index="item.name" v-for="(item,index) in categoryRouter" :key="index+'dzjkChildrenRoute'">
           <router-link  style="height: 100%;width: 100%;display: block" :to="{path:item.path,query:$route.query}">
             {{item.meta.title}}
           </router-link>
@@ -23,21 +23,44 @@
 </template>
 
 <script>
+import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import { dzjk } from '@/router/ems'
+import {mapState} from "vuex";
 const childrenRoute = dzjk[0].children[0].children.find(item=> item.name==='DzjkSbjk').children//获取到单站监控-设备监控下面的字路由
-console.log('设备监控子路由',childrenRoute)
 export default {
   name:'DzjkSbjk',
+  mixins:[getQuerySiteId],
+  computed:{
+    ...mapState({
+      zdDeviceCategoryOptions: state => state.ems.zdDeviceCategoryOptions,
+    }),
+    locationSiteCategory(){
+      return this.zdDeviceCategoryOptions[this.siteId] || []
+    },
+    categoryRouter(){
+      const routeData =this.childrenRoute.filter(item=>this.locationSiteCategory.includes(item.meta.deviceCategory))
+      if(this.siteId && routeData.length > 0 && this.locationSiteCategory && this.locationSiteCategory.length >1){
+        const locationPageDeviceCategory = this.$route.meta?.deviceCategory || ''
+        if(!routeData.some(item=> item.meta.deviceCategory===locationPageDeviceCategory)){
+          this.$router.replace({path:'/dzjk/sbjk/ssyx',query:this.$route.query})
+        }
+      }
+      return routeData
+    }
+  },
   data(){
     return {
       childrenRoute,
-      activeMenu:''
+      activeMenu:'',
+      loading:false,
     }
   },
-  mounted() {
-    console.log('当前设备监控页面路由',this.$route)
+  methods:{
+    init(){
+      this.loading=true
+      this.$store.dispatch('getSiteDeviceCategory',this.siteId).finally(()=>this.loading=false)
+    }
   }
-
 }
 </script>
 

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

@@ -1,17 +1,21 @@
-
 <template>
   <div v-loading="loading" class="pcs-ems-dashboard-editor-container">
     <!--    顶部六个方块-->
     <real-time-base-info :data="runningHeadData"/>
-    <div v-for="(pcsItem,pcsIndex) in pcsList" :key="pcsIndex+'PcsHome'" style="margin-bottom:25px;">
-    <el-card :class="{
-        '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">
+    <div
+        v-for="(pcsItem, pcsIndex) in pcsList"
+        :key="pcsIndex + 'PcsHome'"
+        style="margin-bottom: 25px"
+    >
+      <el-card
+          :class="handleCardClass(pcsItem)"
+          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">{{pcsIndex+1}}#{{pcsItem.deviceName}}</span>
+          <span class="large-title"
+          >{{ pcsItem.deviceName }}</span
+          >
           <div class="info">
             <div>
               {{
@@ -23,116 +27,298 @@
             <div>数据更新时间：{{ pcsItem.dataUpdateTime }}</div>
           </div>
           <div class="alarm">
-            <el-badge :value="pcsItem.alarmNum || 0" class="item">
-              <i class="el-icon-message-solid" style="font-size: 26px;color: #fff;display: block;"></i>
+            <el-button type="primary" round size="small" style="margin-right:20px;"
+                       @click="pointDetail(pcsItem,'point')">
+              详细
+            </el-button>
+            <el-badge :hidden="!pcsItem.alarmNum" :value="pcsItem.alarmNum || 0" class="item">
+              <i
+                  class="el-icon-message-solid alarm-icon"
+                  @click="pointDetail(pcsItem,'alarmPoint')"
+              ></i>
             </el-badge>
           </div>
         </div>
         <div class="descriptions-main">
           <el-descriptions :colon="false" :column="4" direction="vertical">
-          <el-descriptions-item :contentClassName="`descriptions-direction ${pcsItem.workStatus === '0' ? 'save' :'danger'}`" :span="1" label="工作状态" labelClassName="descriptions-label">{{$store.state.ems.workStatusOptions[pcsItem.workStatus]}}</el-descriptions-item>
-          <el-descriptions-item :span="1" contentClassName="descriptions-direction"  label="并网状态" labelClassName="descriptions-label">{{$store.state.ems.gridStatusOptions[pcsItem.gridStatus]}}</el-descriptions-item>
-          <el-descriptions-item :contentClassName="`descriptions-direction ${pcsItem.deviceStatus === '0' ? 'save' : 'danger'}`" :span="1" label="设备状态" labelClassName="descriptions-label">{{$store.state.ems.deviceStatusOptions[pcsItem.deviceStatus]}}</el-descriptions-item>
-          <el-descriptions-item :span="1" contentClassName="descriptions-direction"  label="控制模式" labelClassName="descriptions-label">{{$store.state.ems.controlModeOptions[pcsItem.controlMode]}}</el-descriptions-item>
+            <el-descriptions-item
+                contentClassName="descriptions-direction work-status"
+                :span="1"
+                label="工作状态"
+                labelClassName="descriptions-label"
+            >{{
+                PCSWorkStatusOptions[pcsItem.workStatus]
+              }}
+            </el-descriptions-item
+            >
+            <el-descriptions-item
+                :span="1"
+                contentClassName="descriptions-direction"
+                label="并网状态"
+                labelClassName="descriptions-label"
+            >{{
+                $store.state.ems.gridStatusOptions[pcsItem.gridStatus]
+              }}
+            </el-descriptions-item
+            >
+            <el-descriptions-item
+                :contentClassName="`descriptions-direction ${
+                pcsItem.deviceStatus === '1' ? 'save' : 'danger'
+              }`"
+                :span="1"
+                label="设备状态"
+                labelClassName="descriptions-label"
+            >{{
+                $store.state.ems.deviceStatusOptions[pcsItem.deviceStatus]
+              }}
+            </el-descriptions-item
+            >
+            <el-descriptions-item
+                :span="1"
+                contentClassName="descriptions-direction"
+                label="控制模式"
+                labelClassName="descriptions-label"
+            >{{
+                $store.state.ems.controlModeOptions[pcsItem.controlMode]
+              }}
+            </el-descriptions-item
+            >
           </el-descriptions>
         </div>
         <div class="descriptions-main descriptions-main-bg-color">
-        <el-descriptions :colon="false" :column="4" contentClassName="descriptions-direction" direction="vertical" labelClassName="descriptions-label">
-          <el-descriptions-item v-for="(item,index) in infoData" :key="index+'pcsInfoData'" :label="item.label" :span="1">
-              <span  class="pointer" @click="showChart(item.pointName || '','PCS',pcsItem.deviceId)">
-                {{pcsItem[item.attr] | formatNumber}} <span v-if="item.unit" v-html="item.unit"></span>
+          <el-descriptions
+              :colon="false"
+              :column="4"
+              contentClassName="descriptions-direction"
+              direction="vertical"
+              labelClassName="descriptions-label"
+          >
+            <el-descriptions-item
+                v-for="(item, index) in infoData"
+                :key="index + 'pcsInfoData'"
+                :label="item.label"
+                :span="1"
+            >
+              <span
+                  class="pointer"
+                  @click="
+                  showChart(item.pointName || '', pcsItem.deviceId)
+                "
+              >
+                {{ pcsItem[item.attr] | formatNumber }}
+                <span v-if="item.unit" v-html="item.unit"></span>
               </span>
             </el-descriptions-item>
           </el-descriptions>
         </div>
-      <div v-for="(item,index) in pcsItem.pcsBranchInfoList" :key="index+'pcsBranchInfoList'" class="descriptions-main">
-        <el-descriptions :colon="false" :column="4" contentClassName="descriptions-direction keep" direction="vertical" labelClassName="descriptions-label">
-          <el-descriptions-item :label="'支路'+(index+1)" :span="4"  contentClassName="descriptions-direction keep" labelClassName="descriptions-label">{{item.dischargeStatus}}</el-descriptions-item>
-          <el-descriptions-item :span="1" contentClassName="descriptions-direction"  label="直流功率" labelClassName="descriptions-label">
-            <span class="pointer" @click="showChart('直流功率','PCS分支设备',item.deviceId)">{{item.dcPower}}kW</span>
+        <div
+            v-for="(item, index) in pcsItem.pcsBranchInfoList"
+            :key="index + 'pcsBranchInfoList'"
+            class="descriptions-main"
+        >
+          <el-descriptions
+              :colon="false"
+              :column="4"
+              contentClassName="descriptions-direction keep"
+              direction="vertical"
+              labelClassName="descriptions-label"
+          >
+            <el-descriptions-item
+                :label="'支路' + (index + 1)"
+                :span="4"
+                contentClassName="descriptions-direction keep"
+                labelClassName="descriptions-label"
+            >{{ item.dischargeStatus }}
+            </el-descriptions-item
+            >
+            <el-descriptions-item
+                :span="1"
+                contentClassName="descriptions-direction"
+                label="直流功率"
+                labelClassName="descriptions-label"
+            >
+              <span
+                  class="pointer"
+                  @click="showChart('直流功率', item.deviceId,true)"
+              >{{ item.dcPower }}kW</span
+              >
             </el-descriptions-item>
-          <el-descriptions-item :span="1" contentClassName="descriptions-direction"  label="直流电压" labelClassName="descriptions-label">
-            <span class="pointer" @click="showChart('直流电压','PCS分支设备',item.deviceId)">{{item.dcVoltage}}V</span>
+            <el-descriptions-item
+                :span="1"
+                contentClassName="descriptions-direction"
+                label="直流电压"
+                labelClassName="descriptions-label"
+            >
+              <span
+                  class="pointer"
+                  @click="showChart('直流电压', item.deviceId,true)"
+              >{{ item.dcVoltage }}V</span
+              >
             </el-descriptions-item>
-          <el-descriptions-item :span="1" contentClassName="descriptions-direction"  label="直流电流" labelClassName="descriptions-label">
-            <span class="pointer" @click="showChart('直流电流','PCS分支设备',item.deviceId)">{{item.dcCurrent}}A</span>
+            <el-descriptions-item
+                :span="1"
+                contentClassName="descriptions-direction"
+                label="直流电流"
+                labelClassName="descriptions-label"
+            >
+              <span
+                  class="pointer"
+                  @click="showChart('直流电流',  item.deviceId,true)"
+              >{{ item.dcCurrent }}A</span
+              >
             </el-descriptions-item>
           </el-descriptions>
         </div>
       </el-card>
     </div>
     <el-empty v-show="pcsList.length <= 0" :image-size="200"></el-empty>
-<!--    电位图表 showChart({pointName:点位名称,categoryName:设备名称})-->
     <point-chart ref="pointChart" :site-id="siteId"/>
+    <point-table ref="pointTable"/>
   </div>
 </template>
 
 <script>
 import pointChart from "./../PointChart.vue";
+import PointTable from "@/views/ems/site/sblb/PointTable.vue";
 import RealTimeBaseInfo from "./../RealTimeBaseInfo.vue";
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import {getRunningHeadInfo,getPcsDetailInfo} from '@/api/ems/dzjk'
+import {getPcsDetailInfo, getRunningHeadInfo} from "@/api/ems/dzjk";
 import intervalUpdate from "@/mixins/ems/intervalUpdate";
+import {mapState} from "vuex";
+
 export default {
-  name:'DzjkSbjkPcs',
-  components:{RealTimeBaseInfo,pointChart},
+  name: "DzjkSbjkPcs",
+  components: {RealTimeBaseInfo, pointChart, PointTable},
   mixins: [getQuerySiteId, intervalUpdate],
+  computed: {
+    ...mapState({
+      PCSWorkStatusOptions: state => state?.ems?.PCSWorkStatusOptions || {},
+    })
+  },
   data() {
     return {
       loading: false,
       runningHeadData: {}, //运行信息
       pcsList: [],
       infoData: [
-        {label:'总交流有功电率',attr:'totalActivePower',unit:'kW',pointName:'总交流有功电率'},
-        {label:'当天交流充电量',attr:'dailyAcChargeEnergy',unit:'kWh',pointName:'当天交流充电量 (kWh)'},
-        {label:'A相电压',attr:'aPhaseVoltage',unit:'V',pointName:''},
-        {label:'A相电流',attr:'aPhaseCurrent',unit:'A',pointName:'A相电流'},
-        {label:'总交流无功电率',attr:'totalReactivePower',unit:'kVar',pointName:'总交流无功电率'},
-        {label:'当天交流放电量',attr:'dailyAcDischargeEnergy',unit:'kWh',pointName:'当天交流放电量 (kWh)'},
-        {label:'B相电压',attr:'bPhaseVoltage',unit:'V',pointName:''},
-        {label:'B相电流',attr:'bPhaseCurrent',unit:'A',pointName:'B相电流'},
-        {label:'总交流视在功率',attr:'totalApparentPower',unit:'kVA',pointName:'总交流视在功率'},
-        {label:'PCS模块温度',attr:'pcsModuleTemperature',unit:'&#8451;',pointName:''},
-        {label:'C相电压',attr:'cPhaseVoltage',unit:'V',pointName:''},
-        {label:'C相电流',attr:'cPhaseCurrent',unit:'A',pointName:'C相电流'},
-        {label:'总交流功率因数',attr:'totalPowerFactor',unit:'',pointName:'总交流功率因数'},
-        {label:'PCS环境温度',attr:'pcsEnvironmentTemperature',unit:'&#8451;',pointName:''},
-        {label:'交流频率',attr:'acFrequency',unit:'Hz',pointName:'交流频率'}
+        {
+          label: "总交流有功功率",
+          attr: "totalActivePower",
+          unit: "kW",
+          pointName: "总交流有功功率",
+        },
+        {
+          label: "当天交流充电量",
+          attr: "dailyAcChargeEnergy",
+          unit: "kWh",
+          pointName: "当天交流充电量 (kWh)",
+        },
+        {label: "A相电压", attr: "aPhaseVoltage", unit: "V", pointName: ""},
+        {
+          label: "A相电流",
+          attr: "aPhaseCurrent",
+          unit: "A",
+          pointName: "A相电流",
+        },
+        {
+          label: "总交流无功功率",
+          attr: "totalReactivePower",
+          unit: "kVar",
+          pointName: "总交流无功功率",
+        },
+        {
+          label: "当天交流放电量",
+          attr: "dailyAcDischargeEnergy",
+          unit: "kWh",
+          pointName: "当天交流放电量 (kWh)",
+        },
+        {label: "B相电压", attr: "bPhaseVoltage", unit: "V", pointName: ""},
+        {
+          label: "B相电流",
+          attr: "bPhaseCurrent",
+          unit: "A",
+          pointName: "B相电流",
+        },
+        {
+          label: "总交流视在功率",
+          attr: "totalApparentPower",
+          unit: "kVA",
+          pointName: "总交流视在功率",
+        },
+        {
+          label: "PCS模块温度",
+          attr: "pcsModuleTemperature",
+          unit: "&#8451;",
+          pointName: "",
+        },
+        {label: "C相电压", attr: "cPhaseVoltage", unit: "V", pointName: ""},
+        {
+          label: "C相电流",
+          attr: "cPhaseCurrent",
+          unit: "A",
+          pointName: "C相电流",
+        },
+        {
+          label: "总交流功率因数",
+          attr: "totalPowerFactor",
+          unit: "",
+          pointName: "总交流功率因数",
+        },
+        {
+          label: "PCS环境温度",
+          attr: "pcsEnvironmentTemperature",
+          unit: "&#8451;",
+          pointName: "",
+        },
+        {
+          label: "交流频率",
+          attr: "acFrequency",
+          unit: "Hz",
+          pointName: "交流频率",
+        },
       ],
       pcsBranchList: [], //pcs的支路列表
-    }
+    };
   },
   methods: {
-    //todo 后续需要新增设备id
-    showChart(pointName,categoryName,deviceId){
-      console.log('点击查询图表',pointName,categoryName,deviceId)
-      pointName && this.$refs.pointChart.showChart({pointName,categoryName,deviceId})
+    handleCardClass(item) {
+      const {workStatus = ''} = item
+      return workStatus === '1' || !Object.keys(this.PCSWorkStatusOptions).find(i => i === workStatus) ? "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) {
+      pointName &&
+      this.$refs.pointChart.showChart({pointName, deviceCategory: isBranch ? 'BRANCH' : 'PCS', deviceId});
     },
     //6个方块数据
     getRunningHeadData() {
-      getRunningHeadInfo(this.siteId).then(response => {
-        this.runningHeadData = response?.data || {}
-      })
+      getRunningHeadInfo(this.siteId).then((response) => {
+        this.runningHeadData = response?.data || {};
+      });
     },
     getPcsList() {
-      this.loading = true
-      getPcsDetailInfo(this.siteId).then(response => {
-        const data = response?.data || {}
-        this.pcsList = JSON.parse(JSON.stringify(data))
-      }).finally(()=>this.loading = false)
+      this.loading = true;
+      getPcsDetailInfo(this.siteId)
+          .then((response) => {
+            const data = response?.data || {};
+            this.pcsList = JSON.parse(JSON.stringify(data));
+          })
+          .finally(() => (this.loading = false));
     },
     updateData() {
-      this.getRunningHeadData()
-      this.getPcsList()
+      this.getRunningHeadData();
+      this.getPcsList();
     },
     init() {
-      this.updateData()
-      this.updateInterval(this.updateData)
-    }
+      this.updateData();
+      this.updateInterval(this.updateData);
     },
-
-}
+  },
+};
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

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

@@ -1,8 +1,10 @@
-
 <template>
-  <el-card shadow="always" class="common-card-container common-card-container-body-no-padding">
+  <el-card
+      shadow="always"
+      class="common-card-container common-card-container-body-no-padding"
+  >
     <div slot="header">
-      <span class="card-title">储能功率曲线</span>
+      <span class="card-title">PCS有功功率/PCS无功功率</span>
     </div>
     <div style="height: 360px" id="cnglqxChart"/>
   </el-card>
@@ -10,98 +12,133 @@
 
 <style scoped lang="scss"></style>
 <script>
-import * as echarts from 'echarts'
-import resize from '@/mixins/ems/resize'
-import {formatDate} from "@/filters/ems";
-import {storagePower} from '@/api/ems/dzjk'
+import * as echarts from "echarts";
+import resize from "@/mixins/ems/resize";
+import {storagePower} from "@/api/ems/dzjk";
 
 export default {
   mixins: [resize],
   data() {
     return {
-      chart: null
-    }
+      chart: null,
+    };
   },
   mounted() {
-    this.chart = echarts.init(document.querySelector('#cnglqxChart'))
+    this.chart = echarts.init(document.querySelector("#cnglqxChart"));
   },
   beforeDestroy() {
     if (!this.chart) {
-      return
+      return;
     }
-    this.chart.dispose()
-    this.chart = null
+    this.chart.dispose();
+    this.chart = null;
   },
   methods: {
-    init(siteId){
-      this.chart.showLoading()
-      const x = []
-      const data1 =[],data2 =[]
-      storagePower(siteId).then(response => {
-        const source = response?.data?.energyStoragePowList || []
-        source.forEach(item=>{
-          x.push(formatDate(item.createDate,false,true))
-          data1.push(item.pcsTotalActPower)
-          data2.push(item.pcsTotalReactivePower)
-        })
-        this.setOption(x,data1,data2)
-      }).finally(()=>{
-        this.chart.hideLoading()
+    init(siteId, timeRange) {
+      this.chart.showLoading();
+      const [startTime = '', endTime = ''] = timeRange;
+      storagePower(siteId, startTime, endTime)
+          .then((response) => {
+            this.setOption(response?.data?.pcsPowerList || []);
           })
+          .finally(() => {
+            this.chart.hideLoading();
+          });
     },
-    setOption(x,data1,data2) {
-      this.chart.setOption({
-        color:['#FFBD00','#3C81FF'],
+    setOption(data) {
+      let xdata = [],
+          series = [];
+      data.forEach((element, index) => {
+        if (index === 0) {
+          xdata = (element.energyStoragePowList || []).map((i) => i.createDate);
+        }
+        series.push(
+            {
+              type: "line",
+              name: `${element.deviceId}有功功率`,
+              areaStyle: {
+                // color:'#FFBD00'
+              },
+              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 && this.chart.setOption({
         legend: {
-          left: 'center',
-          top: '10',
+          left: "center",
+          top: "5",
+          itemWidth: 10,
+          itemHeight: 5,
+          textStyle: {
+            fontSize: 9,
+          },
         },
         grid: {
-          containLabel: true
+          containLabel: true,
         },
         tooltip: {
-          trigger: 'axis',
-          axisPointer: { // 坐标轴指示器，坐标轴触发有效
-            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+          show: true,
+          trigger: "axis",
+          axisPointer: {
+            // 坐标轴指示器，坐标轴触发有效
+            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:x},
+        xAxis: {type: "category", data: xdata},
         yAxis: {
-          type: 'value',
+          type: "value",
         },
         dataZoom: [
           {
-            type: 'inside',
+            type: "inside",
             start: 0,
-            end: 100
+            end: 100,
           },
           {
             start: 0,
-            end: 100
-          }
+            end: 100,
+          },
         ],
-        series: [
-          {
-            name:'PCS实时有功功率',
-            type: 'line',
-            areaStyle: {
-              color:'#FFBD00'
+        series,
+      }, true);
     },
-            data: data1,
-          },{
-            name:'PCS实时无功功率',
-            type: 'line',
-            areaStyle: {
-              color: '#3C81FF'
   },
-            data: data2
-          }]
-      })
-    }
-  }
-}
-
+};
 </script>

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

@@ -1,8 +1,10 @@
-
 <template>
-  <el-card shadow="always" class="common-card-container common-card-container-body-no-padding">
+  <el-card
+    shadow="always"
+    class="common-card-container common-card-container-body-no-padding"
+  >
     <div slot="header">
-      <span class="card-title">电池平均SOC</span>
+      <span class="card-title">平均SOC</span>
     </div>
     <div style="height: 360px" id="dcpjsocChart" />
   </el-card>
@@ -10,90 +12,111 @@
 
 <style scoped lang="scss"></style>
 <script>
-import * as echarts from 'echarts'
-import resize from '@/mixins/ems/resize'
-import {formatDate} from "@/filters/ems";
-import {batteryAveSoc} from '@/api/ems/dzjk'
+import * as echarts from "echarts";
+import resize from "@/mixins/ems/resize";
+import { batteryAveSoc } from "@/api/ems/dzjk";
 export default {
   mixins: [resize],
   data() {
     return {
-      chart: null
-    }
+      chart: null,
+    };
   },
   mounted() {
-    this.chart = echarts.init(document.querySelector('#dcpjsocChart'))
+    this.chart = echarts.init(document.querySelector("#dcpjsocChart"));
   },
   beforeDestroy() {
     if (!this.chart) {
-      return
+      return;
     }
-    this.chart.dispose()
-    this.chart = null
+    this.chart.dispose();
+    this.chart = null;
   },
   methods: {
-    init(siteId){
-      this.chart.showLoading()
-      const x = []
-      const data =[]
-      batteryAveSoc(siteId).then(response => {
-        const source = response?.data?.batteryAveSOCList || []
-        source.forEach(item=>{
-          x.push(formatDate(item.createDate,false,true))
-          data.push(item.batterySOC)
-        })
-        this.setOption(x,data)
-      }).finally(()=>{
-        this.chart.hideLoading()
+    init(siteId,timeRange) {
+      this.chart.showLoading();
+      const [startTime='', endTime=''] = timeRange;
+      batteryAveSoc(siteId,startTime,endTime)
+        .then((response) => {
+          this.setOption(response?.data?.batteryAveSOCList || []);
         })
+        .finally(() => {
+          this.chart.hideLoading();
+        });
+    },
+    setOption(data) {
+      let xdata = [],
+        ydata = [];
+      data.forEach((element) => {
+        xdata.push(element.createDate);
+        ydata.push({
+          value:element.batterySOC,
+          year:element.dateDay,
+        });
+      });
+      this.chart && this.chart.setOption({
+        legend: {
+          left: "center",
+          top: "5",
+          itemWidth: 10,
+          itemHeight: 5,
+          textStyle: {
+            fontSize: 9,
           },
-    setOption(x,data) {
-      this.chart.setOption({
-        color:['#FFBD00','#3C81FF'],
-        // legend: {
-        //   left: 'center',
-        //   bottom: '10',
-        // },
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: { // 坐标轴指示器，坐标轴触发有效
-            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
-          }
         },
         grid: {
-          containLabel: true
+          containLabel: true,
+        },
+        tooltip: {
+          show:true,
+          trigger: "axis",
+          axisPointer: {
+            // 坐标轴指示器，坐标轴触发有效
+            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:x},
+        xAxis: { type: "category", data: xdata },
         yAxis: {
-          type: 'value',
+          type: "value",
         },
         dataZoom: [
           {
-            type: 'inside',
+            type: "inside",
             start: 0,
-            end: 100
+            end: 100,
           },
           {
             start: 0,
-            end: 100
-          }
+            end: 100,
+          },
         ],
         series: [
           {
-            name:'电池平均SOC',
-            data: data,
-            type: 'line',
+            type: "line",
+            name: `平均SOC`,
             areaStyle: {
-              color:'#FFBD00'
-            }
-
-          }]
-      })
-    }
-  }
-}
-
+              // color:'#FFBD00'
+            },
+            data: ydata,
+          },
+        ],
+      },true);
+    },
+  },
+};
 </script>

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

@@ -1,6 +1,8 @@
-
 <template>
-  <el-card shadow="always" class="common-card-container common-card-container-body-no-padding">
+  <el-card
+    shadow="always"
+    class="common-card-container common-card-container-body-no-padding"
+  >
     <div slot="header">
       <span class="card-title">电池平均温度</span>
     </div>
@@ -10,90 +12,114 @@
 
 <style scoped lang="scss"></style>
 <script>
-import * as echarts from 'echarts'
-import resize from '@/mixins/ems/resize'
-import {formatDate} from "@/filters/ems";
-import {batteryAveTemp} from '@/api/ems/dzjk'
+import * as echarts from "echarts";
+import resize from "@/mixins/ems/resize";
+import { batteryAveTemp } from "@/api/ems/dzjk";
 
 export default {
   mixins: [resize],
   data() {
     return {
-      chart: null
-    }
+      chart: null,
+    };
   },
   mounted() {
-    this.chart = echarts.init(document.querySelector('#dcpjwdChart'))
+    this.chart = echarts.init(document.querySelector("#dcpjwdChart"));
   },
   beforeDestroy() {
     if (!this.chart) {
-      return
+      return;
     }
-    this.chart.dispose()
-    this.chart = null
+    this.chart.dispose();
+    this.chart = null;
   },
   methods: {
-    init(siteId){
-      this.chart.showLoading()
-      const x = []
-      const data1 =[],data2 =[]
-      batteryAveTemp(siteId).then(response => {
-        const source = response?.data?.batteryAveTempList || []
-        source.forEach(item=>{
-          x.push(formatDate(item.createDate,false,true))
-          data1.push(item.batteryTemp)
-        })
-        this.setOption(x,data1,data2)
-      }).finally(()=>{
-        this.chart.hideLoading()
+    init(siteId,timeRange) {
+      this.chart.showLoading();
+      const [startTime='', endTime=''] = timeRange;
+      batteryAveTemp(siteId,startTime,endTime)
+        .then((response) => {
+          this.setOption(response?.data?.batteryAveTempList || []);
         })
+        .finally(() => {
+          this.chart.hideLoading();
+        });
     },
-    setOption(x,data) {
-      this.chart.setOption({
-        color:['#3C81FF'],
-        // legend: {
-        //   left: 'center',
-        //   bottom: '10',
-        // },
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: { // 坐标轴指示器，坐标轴触发有效
-            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+    setOption(data) {
+      let xdata = [],
+        ydata = [];
+      data.forEach((element) => {
+        xdata.push(element.createDate);
+        ydata.push(
+          {
+            value: element.batteryTemp,
+            year: element.dateDay
           }
+        );
+      });
+      this.chart && this.chart.setOption({
+        legend: {
+          left: "center",
+          top: "5",
+          itemWidth: 10,
+          itemHeight: 5,
+          textStyle: {
+            fontSize: 9,
+          },
         },
         grid: {
-          containLabel: true
+          containLabel: true,
+        },
+        tooltip: {
+          show:true,
+          trigger: "axis",
+          axisPointer: {
+            // 坐标轴指示器，坐标轴触发有效
+            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:x},
+        xAxis: { type: "category", data: xdata },
         yAxis: {
-          type: 'value',
+          type: "value",
         },
         dataZoom: [
           {
-            type: 'inside',
+            type: "inside",
             start: 0,
-            end: 100
+            end: 100,
           },
           {
             start: 0,
-            end: 100
-          }
+            end: 100,
+          },
         ],
         series: [
           {
-            name:'电池平均温度',
-            data: data,
-            type: 'line',
+            type: "line",
+            name: `电池平均温度`,
             areaStyle: {
-              color:'#3C81FF'
+              // color:'#FFBD00'
             },
-          }]
-      })
-    }
-  }
-}
-
+            data: ydata,
+          },
+        ],
+      },true);
+    },
+  },
+};
 </script>

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

@@ -1,8 +1,10 @@
-
 <template>
-  <el-card shadow="always" class="common-card-container common-card-container-body-no-padding">
+  <el-card
+    shadow="always"
+    class="common-card-container common-card-container-body-no-padding"
+  >
     <div slot="header">
-      <span class="card-title">PCS平均温度</span>
+      <span class="card-title">PCS最高温度</span>
     </div>
     <div style="height: 360px" id="pocpjwdChart" />
   </el-card>
@@ -10,87 +12,114 @@
 
 <style scoped lang="scss"></style>
 <script>
-import * as echarts from 'echarts'
-import resize from '@/mixins/ems/resize'
-import {formatDate} from "@/filters/ems";
-import {stackAveTemp} from '@/api/ems/dzjk'
+import * as echarts from "echarts";
+import resize from "@/mixins/ems/resize";
+import { pcsMaxTemp } from "@/api/ems/dzjk";
 
 export default {
   mixins: [resize],
   data() {
     return {
-      chart: null
-    }
+      chart: null,
+    };
   },
   mounted() {
-    this.chart = echarts.init(document.querySelector('#pocpjwdChart'))
+    this.chart = echarts.init(document.querySelector("#pocpjwdChart"));
   },
   beforeDestroy() {
     if (!this.chart) {
-      return
+      return;
     }
-    this.chart.dispose()
-    this.chart = null
+    this.chart.dispose();
+    this.chart = null;
   },
   methods: {
-    init(siteId){
-      this.chart.showLoading()
-      const x = []
-      const data =[]
-      stackAveTemp(siteId).then(response => {
-        const source = response?.data?.stackAveTempList || []
-        source.forEach(item=>{
-          x.push(formatDate(item.createDate,false,true))
-          data.push(item.temp)
-        })
-        this.setOption(x,data)
-      }).finally(()=>{
-        this.chart.hideLoading()
+    init(siteId,timeRange) {
+      this.chart.showLoading();
+      const [startTime='', endTime=''] = timeRange;
+      pcsMaxTemp(siteId,startTime,endTime)
+        .then((response) => {
+          this.setOption(response?.data?.pcsMaxTempList || []);
         })
+        .finally(() => {
+          this.chart.hideLoading();
+        });
     },
-    setOption(x,data) {
-      this.chart.setOption({
-        color:['#FFBD00','#3C81FF'],
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: { // 坐标轴指示器，坐标轴触发有效
-            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+    setOption(data) {
+      let xdata = [],
+        series = [];
+      data.forEach((element, index) => {
+        if (index === 0) {
+          xdata = (element.maxTempVoList || []).map((i) => i.createDate);
         }
+        series.push({
+          type: "line",
+          name: `${element.deviceId}最高温度`,
+          areaStyle: {
+            // color:'#FFBD00'
+          },
+          data: (element.maxTempVoList || []).map((i) => {
+            return {
+              value: i.temp,
+              year: i.dateDay
+            }
+          }),
+        });
+      });
+      this.chart && this.chart.setOption({
+        legend: {
+          left: "center",
+          top: "5",
+          itemWidth: 10,
+          itemHeight: 5,
+          textStyle: {
+            fontSize: 9,
+          },
         },
         grid: {
-          containLabel: true
+          containLabel: true,
+        },
+        tooltip: {
+          show:true,
+          trigger: "axis",
+          axisPointer: {
+            // 坐标轴指示器，坐标轴触发有效
+            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:x},
+        xAxis: { type: "category", data: xdata },
         yAxis: {
-          type: 'value',
+          type: "value",
         },
         dataZoom: [
           {
-            type: 'inside',
+            type: "inside",
             start: 0,
-            end: 100
+            end: 100,
           },
           {
             start: 0,
-            end: 100
-          }
+            end: 100,
+          },
         ],
-        series: [
-          {
-            name:'PCS平均温度',
-            data: data,
-            type: 'line',
-            areaStyle: {
-              color:'#FFBD00'
-            }
-
-          }]
-      })
-    }
-  }
-}
-
+        series,
+      },true);
+    },
+  },
+};
 </script>

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

@@ -3,6 +3,8 @@
 <div class="ssyx-ems-dashboard-editor-container">
 <!--  6个方块-->
   <real-time-base-info :data="runningHeadData"/>
+  <!-- 时间选择 -->
+  <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">
@@ -27,6 +29,7 @@
 
 </style>
 <script>
+import DateRangeSelect from '@/components/Ems/DateRangeSelect/index.vue'
 import RealTimeBaseInfo from "./../RealTimeBaseInfo.vue";
 import CnglqxChart from './CnglqxChart.vue'
 import PocpjwdChart from './PocpjwdChart.vue'
@@ -38,11 +41,13 @@ import intervalUpdate from "@/mixins/ems/intervalUpdate";
 
 export default {
   name:'DzjkSbjkSsyx',
-  components:{RealTimeBaseInfo,CnglqxChart,PocpjwdChart,DcpjwdChart,DcpjsocChart},
+  components:{RealTimeBaseInfo,CnglqxChart,PocpjwdChart,DcpjwdChart,DcpjsocChart,DateRangeSelect},
   mixins:[getQuerySiteId,intervalUpdate],
   data() {
     return {
       runningHeadData:{},//运行信息
+      timeRange:[],
+      isInit:true
     }
   },
   methods:{
@@ -52,17 +57,27 @@ export default {
         this.runningHeadData = response?.data || {}
       })
     },
+    // 更新时间范围 重置图表
+    updateDate(data){
+      this.timeRange=data
+      !this.isInit && this.updateChart()
+      this.isInit = false
+    },
+    updateChart(){
+      this.$refs.cnglqx.init(this.siteId,this.timeRange||[])
+      this.$refs.pocpjwd.init(this.siteId,this.timeRange||[])
+      this.$refs.dcpjsoc.init(this.siteId,this.timeRange||[])
+      this.$refs.dcpjwd.init(this.siteId,this.timeRange||[])
+      this.updateInterval(this.updateData)
+    },
     updateData(){
       this.getRunningHeadData()
-      this.$refs.cnglqx.init(this.siteId)
-      this.$refs.pocpjwd.init(this.siteId)
-      this.$refs.dcpjsoc.init(this.siteId)
-      this.$refs.dcpjwd.init(this.siteId)
+      this.updateChart()
     },
     init(){
+      this.$refs.dateRangeSelect.init(true)
       this.$nextTick(()=>{
         this.updateData()
-        this.updateInterval(this.updateData)
       })
     }
   }

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

@@ -0,0 +1,134 @@
+<template>
+  <div v-loading="loading">
+    <el-card
+        v-for="(item,index) in list"
+        :key="index+'ylLise'"
+        class="sbjk-card-container running-card-container"
+        :class="{
+        'warning-card-container':item.emsCommunicationStatus && item.emsCommunicationStatus !== '0',
+        'running-card-container':item.emsCommunicationStatus === '0'
+      }"
+        shadow="always">
+      <div slot="header">
+        <span class="large-title">{{ item.deviceName }}</span>
+        <div class="info">
+          <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 :hidden="!item.alarmNum" :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+'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
+                  v-html="tempDataItem.unit"></span></span>
+            </span>
+        </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"/>
+    <point-table ref="pointTable"/>
+  </div>
+</template>
+
+
+<script>
+import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
+import {getXfDataList} from '@/api/ems/dzjk'
+import intervalUpdate from "@/mixins/ems/intervalUpdate";
+import pointChart from "./../PointChart.vue";
+import PointTable from "@/views/ems/site/sblb/PointTable.vue";
+
+export default {
+  name: 'DzjkSbjkXf',
+  mixins: [getQuerySiteId, intervalUpdate],
+  components: {pointChart, PointTable},
+  data() {
+    return {
+      loading: false,
+      list: [],
+      tempData: [
+        {title: '主电源备用电池状态', attr: 'dczt', unit: ''},
+        {title: '手自动状态延时状态', attr: 'yszt', unit: ''},
+        {title: '启动喷洒气体喷洒状态', attr: 'pszt', unit: ''},
+        {title: '压力开关状态电磁阀状态', attr: 'dcfzt', unit: ''},
+      ]
+    }
+  },
+  methods: {
+    // 查看设备电位表格
+    pointDetail(row, dataType) {
+      const {deviceId} = row
+      this.$refs.pointTable.showTable({siteId: this.siteId, deviceId, deviceCategory: 'XF'}, dataType)
+    },
+    showChart(pointName, deviceId) {
+      pointName && this.$refs.pointChart.showChart({pointName, deviceCategory: 'XF', deviceId})
+    },
+    updateData() {
+      this.loading = true
+      getXfDataList(this.siteId).then(response => {
+        this.list = JSON.parse(JSON.stringify(response?.data || []));
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    init() {
+      this.updateData()
+      this.updateInterval(this.updateData)
+    }
+  },
+  mounted() {
+
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.sbjk-card-container {
+  &:not(:last-child) {
+    margin-bottom: 25px;
+  }
+
+  .el-row {
+    background-color: #ffffff;
+    border: 1px solid #eeeeee;
+    font-size: 14px;
+    line-height: 16px;
+    color: #333333;
+
+    .el-col {
+      padding: 12px 0;
+      text-align: center;
+      position: relative;
+    }
+
+    .el-col {
+      border-bottom: 1px solid #eeeeee;
+    }
+
+    .el-col:not(:nth-child(3n)) {
+      border-right: 1px solid #eeeeee;
+    }
+  }
+}
+</style>

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

@@ -1,24 +1,41 @@
-
 <template>
   <div v-loading="loading">
     <el-card
         v-for="(item,index) in list"
         :key="index+'ylLise'"
-          class="sbjk-card-container running-card-container common-card-container-body-no-padding common-card-container-no-title-bg"
+        class="sbjk-card-container running-card-container"
         shadow="always">
       <div slot="header">
-          <span class="large-title">{{index+1}}#{{item.deviceName}}</span>
+        <span class="large-title">{{ item.deviceName }}</span>
+        <div class="info">
+          <div>数据更新时间：{{ item.dataUpdateTime || '-' }}</div>
         </div>
-        <el-row>
-          <el-col v-for="(tempDataItem,tempDataIndex) in tempData" :key="tempDataIndex+'ylTempData'" :span="8">
-            <span class="pointer" @click="showChart(tempDataItem.title,item.deviceName,item.deviceId)">
-              {{tempDataItem.title}}：{{item[tempDataItem.attr]}}<span v-html="tempDataItem.unit"></span>
+        <div class="alarm">
+          <el-button type="primary" round size="small" style="margin-right:20px;" @click="pointDetail(item,'point')">
+            详细
+          </el-button>
+          <el-badge :hidden="!item.alarmNum" :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"
+                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
+                v-html="tempDataItem.unit"></span></span>
             </span>
         </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"/>
+    <point-table ref="pointTable"/>
   </div>
 </template>
 
@@ -28,10 +45,12 @@ import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import {getCoolingDataList} from '@/api/ems/dzjk'
 import intervalUpdate from "@/mixins/ems/intervalUpdate";
 import pointChart from "./../PointChart.vue";
+import PointTable from "@/views/ems/site/sblb/PointTable.vue";
+
 export default {
   name: 'DzjkSbjkYl',
   mixins: [getQuerySiteId, intervalUpdate],
-  components:{pointChart},
+  components: {pointChart, PointTable},
   data() {
     return {
       loading: false,
@@ -48,15 +67,21 @@ export default {
     }
   },
   methods: {
-    showChart(pointName,deviceName,deviceId){
-      console.log('点击查询图表',pointName,deviceName,deviceId)
-      pointName && this.$refs.pointChart.showChart({pointName,deviceName,deviceId})
+    // 查看设备电位表格
+    pointDetail(row, dataType) {
+      const {deviceId} = row
+      this.$refs.pointTable.showTable({siteId: this.siteId, deviceId, deviceCategory: 'COOLING'}, dataType)
+    },
+    showChart(pointName, deviceId) {
+      pointName && this.$refs.pointChart.showChart({pointName, deviceCategory: 'COOLING', deviceId})
     },
     updateData() {
       this.loading = true
       getCoolingDataList(this.siteId).then(response => {
         this.list = JSON.parse(JSON.stringify(response?.data || []));
-      }).finally(() => {this.loading = false})
+      }).finally(() => {
+        this.loading = false
+      })
     },
     init() {
       this.updateData()
@@ -74,34 +99,5 @@ export default {
   &:not(:last-child) {
     margin-bottom: 25px;
   }
-  .el-row{
-    background-color: #ffffff;
-    border:1px solid #eeeeee;
-    font-size: 14px;
-    line-height: 16px;
-    color: #333333;
-    .el-col{
-      padding:12px 0;
-      text-align: center;
-      position: relative;
-    }
-    .el-col{
-      border-bottom: 1px solid #eeeeee;
-    }
-    .el-col:not(:nth-child(3n)){
-      border-right: 1px solid #eeeeee;
-    }
-  }
-}
-.yl-warn-item-container{
-  background-color: #FFF1F0;
-  .header{
-    .header-title{
-      background-color: #FC6B69;
-    }
-    .header-values{
-      color: #FC6B69;
-    }
-  }
 }
 </style>

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

@@ -3,23 +3,18 @@
   <div style="width:100%" v-loading="loading">
     <!--    搜索栏-->
     <el-form :inline="true" class="select-container">
-      <el-form-item label="电表">
-        <el-select v-model="search.deviceId" placeholder="请选择"  loading-text="正在加载数据">
-          <el-option :label="item.deviceName" :value="item.id" v-for="(item,index) in deviceOptions" :key="index+'dbOptions'"></el-option>
-        </el-select>
-      </el-form-item>
-<!--      <el-form-item label="日报">-->
-<!--        <el-select v-model="search.rb" placeholder="请选择" :loading="loading" loading-text="正在加载数据">-->
-<!--          <el-option :label="item.name" :value="item.id" v-for="(item,index) in rbOptions" :key="index+'rbOptions'"></el-option>-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
       <el-form-item label="时间选择">
         <el-date-picker
-          v-model="search.date"
-          type="date"
+            v-model="dateRange"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
+            :clearable="false"
             :picker-options="pickerOptions"
-          :default-value="defaultDate">
-        </el-date-picker>
+            :default-value="defaultDateRange"
+        ></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="onSearch" native-type="button">搜索</el-button>
@@ -40,71 +35,92 @@
               prop="dataTime"
               label="日期"
               width="120">
-              <template slot-scope="scope">
-                <span>{{scope.row.dataTime}}{{scope.row.dataTime === '汇总' ? '' : ':00'}}</span>
-              </template>
             </el-table-column>
           </el-table-column>
 <!--充电量列-->
-          <el-table-column  label="充电量">
+          <el-table-column  label="充电量" align="center">
             <el-table-column
+              align="center"
               prop="activePeakKwh"
               label="尖">
             </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
+                align="center"
               prop="activeValleyKwh"
               label="谷">
             </el-table-column>
             <el-table-column
+                align="center"
               prop="activeTotalKwh"
               label="总">
             </el-table-column>
           </el-table-column>
         <!--充电量列-->
-          <el-table-column  label="放电量">
+          <el-table-column  label="放电量" align="center">
             <el-table-column
+                align="center"
               prop="reActivePeakKwh"
               label="尖">
             </el-table-column>
             <el-table-column
+                align="center"
               prop="reActiveHighKwh"
               label="峰">
             </el-table-column>
             <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="效率(%)">
+          <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, getLoadNameList} from '@/api/ems/dzjk'
+import { getAmmeterData} from '@/api/ems/dzjk'
 import {formatDate} from "@/filters/ems";
 export default {
   name:'DzjkTjbbDbbb',
@@ -117,61 +133,64 @@ export default {
           return time.getTime() > Date.now();
         },
       },
-      defaultDate:'',//默认展示的时间
-      search:{deviceId:'',date:''},
-      deviceOptions:[],
-      // rbOptions:[
-      //   {name:'日报1',id:1},
-      //   {name:'日报2',id:2},
-      // ],
-      tableData:[]
+      defaultDateRange:[],//默认展示的时间
+      dateRange:[],
+      tableData:[],
+      pageSize:10,//分页栏当前每个数据总数
+      pageNum:1,//分页栏当前页数
+      totalSize:0,//table表格数据总数
     }
   },
   methods:{
     // 搜索
     onSearch(){
+      this.pageNum =1//每次搜索从1开始搜索
       this.getData()
     },
     // 重置
     onReset(){
-      this.search.date = ''
+      this.dateRange=this.defaultDateRange
+      this.pageNum =1//每次搜索从1开始搜索
       this.getData()
     },
+    // 分页
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.$nextTick(()=>{
+        this.getData()
+      })
+    },
+    handleCurrentChange(val) {
+      this.pageNum = val
+      this.$nextTick(()=>{
+        this.getData()
+      })
+    },
     // 获取数据
     getData(){
-      if(!this.search.deviceId) return
       this.loading=true
-      getAmmeterData({siteId:this.siteId,deviceId:this.search.deviceId,dateTime:formatDate(this.search.date)}).then(response=>{
-        this.tableData=response?.data || [];
+      const {siteId,pageNum,pageSize} =this
+      const [startTime='',endTime='']=(this.dateRange || [])
+      getAmmeterData({siteId:siteId,startTime,endTime,pageSize,pageNum}).then(response=>{
+        this.tableData=response?.rows || [];
+        this.totalSize = response?.total || 0
       }).finally(()=> {
         this.loading = false
       })
     },
-    getDbList(){
-      return getLoadNameList(this.siteId).then(response=>{
-        this.deviceOptions=response?.data || [];
-        this.deviceOptions.length > 0 && (this.search.deviceId = this.deviceOptions[0].id);
-      })
-    },
     init(){
-      this.loading = true
-      this.deviceOptions = []
-      this.search.deviceId=''
-      this.search.date=''
+      this.dateRange=[]
       this.tableData=[]
-      this.getDbList().then(()=>{
-        if(this.search.deviceId){
-          this.onReset()
-        }else{
-          this.loading = false
-        }
-      })
+      this.totalSize=0
+      this.pageSize=10
+      this.pageNum = 1
+      const now = new Date().getTime();
+      const lastMonth = new Date(now-30 * 24 * 60 * 60 * 1000).getTime();
+      this.defaultDateRange = [formatDate(lastMonth), formatDate(now)];
+      this.dateRange=[formatDate(lastMonth), formatDate(now)];
+      this.getData()
     },
   },
-
-  mounted(){
-    this.defaultDate = new Date()
-  }
 }
 </script>
 

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

@@ -1,28 +1,38 @@
 <template>
-  <el-card shadow="always" class="common-card-container time-range-card" style="margin-top:20px">
+  <el-card
+    shadow="always"
+    class="common-card-container time-range-card"
+    style="margin-top: 20px"
+  >
     <div slot="header" class="time-range-header">
-      <span class="card-title">
-        <el-button-group class="ems-btns-group">
-            <el-button v-for="(item,index) in btnList" :key="index+'dcdqxBtns'" size="mini" :class="{'activeBtn' : activeBtn === item.id}" @click="changeDataType(item.id)">{{item.name}}</el-button>
-          </el-button-group>
-      </span>
+      <span class="card-title"> </span>
       <date-range-select ref="dateRangeSelect" @updateDate="updateDate" />
     </div>
     <div class="card-main" v-loading="loading">
-      <div id="dcdEchart" style="height: 310px;"></div>
+      <el-button-group class="ems-btns-group">
+        <el-button
+          v-for="(item, index) in btnList"
+          :key="index + 'dcdqxBtns'"
+          size="mini"
+          :class="{ activeBtn: activeBtn === item.id }"
+          @click="changeDataType(item.id)"
+          >{{ item.name }}</el-button
+        >
+      </el-button-group>
+      <div id="dcdEchart" style="height: 310px"></div>
     </div>
   </el-card>
 </template>
 
 <script>
-import * as echarts from 'echarts'
+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, getStackNameList } from "@/api/ems/dzjk";
 import { formatDate } from "@/filters/ems";
 import DateRangeSelect from "@/components/Ems/DateRangeSelect/index.vue";
 export default {
-  name:'DzjkTjbbDcdqx',
+  name: "DzjkTjbbDcdqx",
   components: { DateRangeSelect },
   mixins: [resize, getQuerySiteId],
   data() {
@@ -34,53 +44,69 @@ export default {
       },
       dateRange: [],
       loading: false,
-      activeBtn:'1',
+      activeBtn: "1",
       btnList: [
-        {name:'堆平均维度',id:'1',attr:['temp'],source:['有功功率']},
-        {name:'堆电压',id:'2',attr:['voltage'],source:['堆电压']},
-        {name:'堆电流',id:'3',attr:['current'],source:['堆电流']},
-        {name:'堆soc',id:'4',attr:['soc'],source:['堆soc']},
+        { name: "堆平均维度", id: "1", attr: ["temp"], source: ["有功功率"] },
+        { name: "堆电压", id: "2", attr: ["voltage"], source: ["堆电压"] },
+        { name: "堆电流", id: "3", attr: ["current"], source: ["堆电流"] },
+        { name: "堆soc", id: "4", attr: ["soc"], source: ["堆soc"] },
       ],
-    }
+    };
   },
   methods: {
     changeDataType(id) {
       if (id !== this.activeBtn) {
         this.activeBtn = id;
-        this.getData()
+        this.getData();
       }
     },
     // 更新时间范围 重置图表
     updateDate(data) {
-      this.dateRange=data || []
-      this.getData()
+      this.dateRange = data || [];
+      this.getData();
     },
     getData() {
       const { siteId, activeBtn } = this;
-      const [start='',end='']=(this.dateRange || [])
+      const [start = "", end = ""] = this.dateRange || [];
       //接口调用完成之后 设置图表、结束loading
       this.loading = true;
-       getStackData({siteId,startTime:formatDate(start),endTime:formatDate(end),dataType:activeBtn}).then(response => {
-        this.setOption(response?.data || [])
-      }).finally(()=>{this.loading=false;})
+      getStackData({
+        siteId,
+        startTime: formatDate(start),
+        endTime: formatDate(end),
+        dataType: activeBtn,
+      })
+        .then((response) => {
+          this.setOption(response?.data || []);
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
     compareDate(date1, date2) {
-      console.log('比较时间',date1,date2)
+      console.log("比较时间", date1, date2);
       // 年2025-09/天2025-09-15/时2025-09-15/10:00
-      if(date1.indexOf(':') > -1 && date2.indexOf(':') > -1){
-        return parseInt(date1) - parseInt(date2)
+      if (date1.indexOf(":") > -1 && date2.indexOf(":") > -1) {
+        return parseInt(date1) - parseInt(date2);
       }
-      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_Y - date2_Y
+      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_Y - date2_Y
+      );
     },
     setOption(data) {
-      const ele = this.btnList.find((item)=>{return item.id === this.activeBtn})
-      const sourceBase = JSON.parse(JSON.stringify(ele.source))
+      const ele = this.btnList.find((item) => {
+        return item.id === this.activeBtn;
+      });
+      const sourceBase = JSON.parse(JSON.stringify(ele.source));
       // sourceBase={name:'堆平均维度',id:'1',attr:['temp'],source:['有功功率']},
-      const source=[]
-      const sourceTop = ['日期']
-      let map={},mapArr=[]
+      const source = [];
+      const sourceTop = ["日期"];
+      let map = {},
+        mapArr = [];
       // 生成所有{日期:[],日期:[]}格式的对象和所有包含所有日期的[日期1,日期2...]
       data.forEach((item) => {
         item.dataList.forEach((inner) => {
@@ -88,78 +114,78 @@ export default {
           // 年2025-09/天2025-09-15/时2025-09-15/10:00
           // 所有数据的日期格式一致
           if (!map[inner.statisDate]) {
-            map[inner.statisDate] = []
-            mapArr.push(inner.statisDate)
+            map[inner.statisDate] = [];
+            mapArr.push(inner.statisDate);
           }
-        })
-      })
+        });
+      });
       data.forEach((item, itemIndex) => {
-        const dataTimeList = item.dataList.map(i =>i.statisDate)
-        const noDataTime = mapArr.filter(i=>!dataTimeList.includes(i))
+        const dataTimeList = item.dataList.map((i) => i.statisDate);
+        const noDataTime = mapArr.filter((i) => !dataTimeList.includes(i));
         sourceBase.forEach((outer, outerIndex) => {
-          sourceTop.push(`${item.deviceId}-${outer}`)
-          noDataTime.forEach(i=>map[i].push(''))
+          sourceTop.push(`${item.deviceId}-${outer}`);
+          noDataTime.forEach((i) => map[i].push(""));
           item.dataList.forEach((inner, innerIndex) => {
-            map[inner.statisDate].push(inner[ele.attr[outerIndex]])
-          })
-        })
-      })
-      mapArr = mapArr.sort((a,b)=>this.compareDate(a,b))
-      mapArr.forEach(item=>{
-        source.push([item,...map[item]])
-      })
-      source.unshift(sourceTop)
-      console.log('map=',map)
-      console.log('mapArr=',mapArr)
-      console.log('========',source)
-      this.chart.setOption({
+            map[inner.statisDate].push(inner[ele.attr[outerIndex]]);
+          });
+        });
+      });
+      mapArr = mapArr.sort((a, b) => this.compareDate(a, b));
+      mapArr.forEach((item) => {
+        source.push([item, ...map[item]]);
+      });
+      source.unshift(sourceTop);
+      this.chart.setOption(
+        {
           grid: {
-          containLabel: true
+            containLabel: true,
           },
           legend: {
-          left: 'center',
-          bottom: '15',
+            left: "center",
+            bottom: "15",
           },
           tooltip: {
-          trigger: 'axis',
-          axisPointer: { // 坐标轴指示器，坐标轴触发有效
-            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
-          }
+            trigger: "axis",
+            axisPointer: {
+              // 坐标轴指示器，坐标轴触发有效
+              type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+            },
           },
           textStyle: {
             color: "#333333",
           },
           xAxis: {
-          type: 'category',
+            type: "category",
           },
           yAxis: {
-          type: 'value',
+            type: "value",
           },
           dataset: { source },
-        series:source[0].slice(1).map(item=>{
+          series: source[0].slice(1).map((item) => {
             return {
-            type:ele.type || 'scatter'
-          }
-        })
-      },true)
+              type: "line",
+            };
+          }),
+        },
+        true
+      );
     },
     initChart() {
-      this.chart = echarts.init(document.querySelector('#dcdEchart'));
+      this.chart = echarts.init(document.querySelector("#dcdEchart"));
     },
     init() {
       this.$nextTick(() => {
-        this.initChart()
-        this.$refs.dateRangeSelect.init()
-      })
-    }
+        this.initChart();
+        this.$refs.dateRangeSelect.init();
+      });
+    },
   },
   beforeDestroy() {
     if (!this.chart) {
-      return
+      return;
     }
-    this.chart.dispose()
-    this.chart = null
+    this.chart.dispose();
+    this.chart = null;
   },
-}
+};
 </script>
-

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

@@ -1,26 +1,32 @@
-
 <template>
-  <el-card shadow="always" class="common-card-container time-range-card" style="margin-top:20px">
+  <el-card
+    shadow="always"
+    class="common-card-container time-range-card"
+    style="margin-top: 20px"
+  >
     <div slot="header" class="time-range-header">
       <span class="card-title">功率曲线</span>
-      <date-range-select ref="dateRangeSelect" @reset="resetTime" @updateDate="updateDate"/>
+      <date-range-select
+        ref="dateRangeSelect"
+        @reset="resetTime"
+        @updateDate="updateDate"
+      />
     </div>
     <div class="card-main" v-loading="loading">
-      <div id="glqxEchart" style="height: 310px;"></div>
+      <div id="glqxEchart" style="height: 310px"></div>
     </div>
   </el-card>
 </template>
 
-
 <script>
-import * as echarts from 'echarts'
+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 { formatDate } from "@/filters/ems";
 import DateRangeSelect from "@/components/Ems/DateRangeSelect/index.vue";
 export default {
-  name:'DzjkTjbbGlqx',
+  name: "DzjkTjbbGlqx",
   components: { DateRangeSelect },
   mixins: [resize, getQuerySiteId],
   data() {
@@ -33,96 +39,113 @@ export default {
       dateRange: [],
       loading: false,
       dateRangeInit: true,
-    }
+    };
   },
   methods: {
     // 更新时间范围 重置图表
     updateDate(data) {
-      this.dateRange=data || []
-      this.getData()
+      this.dateRange = data || [];
+      this.getData();
     },
     resetTime() {
       this.dateRangeInit = true;
     },
     getData() {
       const { siteId } = this;
-      let [start='',end='']=(this.dateRange || [])
+      let [start = "", end = ""] = this.dateRange || [];
       //接口调用完成之后 设置图表、结束loading
       this.loading = true;
       if (this.dateRangeInit) {
-        start = ''
-        end = ''
-        this.dateRangeInit=false
+        start = "";
+        end = "";
+        this.dateRangeInit = false;
       }
-      getPowerData({siteId,startDate:formatDate(start),endDate:formatDate(end)}).then(response => {
-        this.setOption(response?.data || [])
-      }).finally(()=>{this.loading=false;})
+      getPowerData({
+        siteId,
+        startDate: formatDate(start),
+        endDate: formatDate(end),
+      })
+        .then((response) => {
+          this.setOption(response?.data || []);
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
     setOption(data) {
-      const source = [['日期','电网功率','负载功率','储能功率','光伏功率']]
-      data.forEach(item=>{
-        source.push([item.statisDate,item.gridPower,item.loadPower,item.storagePower,item.pvPower])
-      })
-      this.chart.setOption({
+      const source = [["日期", "电网功率", "负载功率", "储能功率", "光伏功率"]];
+      data.forEach((item) => {
+        source.push([
+          item.statisDate,
+          item.gridPower,
+          item.loadPower,
+          item.storagePower,
+          item.pvPower,
+        ]);
+      });
+      this.chart.setOption(
+        {
           grid: {
-          containLabel: true
+            containLabel: true,
           },
           legend: {
-          left: 'center',
-          bottom: '15',
+            left: "center",
+            bottom: "15",
           },
           tooltip: {
-          trigger: 'axis',
-          axisPointer: { // 坐标轴指示器，坐标轴触发有效
-            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
-          }
+            trigger: "axis",
+            axisPointer: {
+              // 坐标轴指示器，坐标轴触发有效
+              type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+            },
           },
           textStyle: {
             color: "#333333",
           },
           xAxis: {
-          type: 'category',
+            type: "category",
           },
           yAxis: {
-          type: 'value',
+            type: "value",
           },
           dataset: { source },
           series: [
             {
-            type: 'scatter',
+              type: "line",
             },
             {
-            type: 'scatter',
+              type: "line",
             },
             {
-            type: 'scatter',
+              type: "line",
             },
             {
-            type: 'scatter',
-          }
-        ]
-      },true)
+              type: "line",
+            },
+          ],
+        },
+        true
+      );
     },
     initChart() {
-      if(this.chart) return
-      this.chart = echarts.init(document.querySelector('#glqxEchart'));
+      if (this.chart) return;
+      this.chart = echarts.init(document.querySelector("#glqxEchart"));
     },
     init() {
       this.$nextTick(() => {
         this.dateRangeInit = true;
-        this.initChart()
-        this.$refs.dateRangeSelect.init()
-      })
-    }
+        this.initChart();
+        this.$refs.dateRangeSelect.init();
+      });
+    },
   },
 
   beforeDestroy() {
     if (!this.chart) {
-      return
+      return;
     }
-    this.chart.dispose()
-    this.chart = null
+    this.chart.dispose();
+    this.chart = null;
   },
-}
+};
 </script>
-

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

@@ -1,29 +1,38 @@
-
 <template>
-  <el-card shadow="always" class="common-card-container time-range-card" style="margin-top:20px">
+  <el-card
+    shadow="always"
+    class="common-card-container time-range-card"
+    style="margin-top: 20px"
+  >
     <div slot="header" class="time-range-header">
-      <span class="card-title">
-         <el-button-group class="ems-btns-group">
-            <el-button v-for="(item,index) in btnList" :key="index+'flqxcBtns'" size="mini" :class="{'activeBtn' : activeBtn === item.id}" @click="changeDataType(item.id)">{{item.name}}</el-button>
-          </el-button-group>
-      </span>
+      <span class="card-title"> </span>
       <date-range-select ref="dateRangeSelect" @updateDate="updateDate" />
     </div>
     <div class="card-main" v-loading="loading">
-      <div id="pcsEchart" style="height: 310px;"></div>
+      <el-button-group class="ems-btns-group">
+        <el-button
+          v-for="(item, index) in btnList"
+          :key="index + 'flqxcBtns'"
+          size="mini"
+          :class="{ activeBtn: activeBtn === item.id }"
+          @click="changeDataType(item.id)"
+          >{{ item.name }}</el-button
+        >
+      </el-button-group>
+      <div id="pcsEchart" style="height: 310px"></div>
     </div>
   </el-card>
 </template>
 
 <script>
-import * as echarts from 'echarts'
+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, getPcsNameList } from "@/api/ems/dzjk";
 import { formatDate } from "@/filters/ems";
 import DateRangeSelect from "@/components/Ems/DateRangeSelect/index.vue";
 export default {
-  name:'DzjkTjbbPcsqx',
+  name: "DzjkTjbbPcsqx",
   components: { DateRangeSelect },
   mixins: [resize, getQuerySiteId],
   data() {
@@ -35,54 +44,85 @@ export default {
       },
       dateRange: [],
       loading: false,
-      activeBtn:'1',
+      activeBtn: "1",
       btnList: [
-        {name:'有功功率',id:'1',attr:['activePower'],source:['有功功率']},
-        {name:'无功功率',id:'2',attr:['reactivePower'],source:['无功功率']},
-        {name:'三相电流',id:'3',attr:['uCurrent','vCurrent','wCurrent'],source:['u电流','v电流','w电流'],type:'bar'},
+        {
+          name: "有功功率",
+          id: "1",
+          attr: ["activePower"],
+          source: ["有功功率"],
+        },
+        {
+          name: "无功功率",
+          id: "2",
+          attr: ["reactivePower"],
+          source: ["无功功率"],
+        },
+        {
+          name: "三相电流",
+          id: "3",
+          attr: ["uCurrent", "vCurrent", "wCurrent"],
+          source: ["u电流", "v电流", "w电流"],
+          type: "bar",
+        },
       ],
-
-    }
+    };
   },
   methods: {
     changeDataType(id) {
       if (id !== this.activeBtn) {
-        console.log('点击了不同的菜单，更新数据')
+        console.log("点击了不同的菜单，更新数据");
         this.activeBtn = id;
-        this.getData()
+        this.getData();
       }
     },
     // 更新时间范围 重置图表
     updateDate(data) {
-      this.dateRange=data || []
-      this.getData()
+      this.dateRange = data || [];
+      this.getData();
     },
     getData() {
       const { siteId, activeBtn } = this;
-      const [start='',end='']=(this.dateRange || [])
+      const [start = "", end = ""] = this.dateRange || [];
       this.loading = true;
       //接口调用完成之后 设置图表、结束loading
-      getPCSData({siteId,startTime:formatDate(start),endTime:formatDate(end),dataType:activeBtn}).then(response => {
-        this.setOption(response?.data || [])
-      }).finally(()=>{this.loading=false;})
+      getPCSData({
+        siteId,
+        startTime: formatDate(start),
+        endTime: formatDate(end),
+        dataType: activeBtn,
+      })
+        .then((response) => {
+          this.setOption(response?.data || []);
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
     compareDate(date1, date2) {
-      console.log('比较时间',date1,date2)
+      console.log("比较时间", date1, date2);
       // 年2025-09/天2025-09-15/时2025-09-15/10:00
-      if(date1.indexOf(':') > -1 && date2.indexOf(':') > -1){
-        return parseInt(date1) - parseInt(date2)
+      if (date1.indexOf(":") > -1 && date2.indexOf(":") > -1) {
+        return parseInt(date1) - parseInt(date2);
       }
-      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_Y - date2_Y
+      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_Y - date2_Y
+      );
     },
     setOption(data) {
-      const ele = this.btnList.find((item)=>{return item.id === this.activeBtn})
-      const sourceBase = JSON.parse(JSON.stringify(ele.source))
+      const ele = this.btnList.find((item) => {
+        return item.id === this.activeBtn;
+      });
+      const sourceBase = JSON.parse(JSON.stringify(ele.source));
       // sourceBase={name:'堆平均维度',id:'1',attr:['temp'],source:['有功功率']},
-      const source=[]
-      const sourceTop = ['日期']
-      let map={},mapArr=[]
+      const source = [];
+      const sourceTop = ["日期"];
+      let map = {},
+        mapArr = [];
       // 生成所有{日期:[],日期:[]}格式的对象和所有包含所有日期的[日期1,日期2...]
       data.forEach((item) => {
         item.dataList.forEach((inner) => {
@@ -90,78 +130,78 @@ export default {
           // 年2025-09/天2025-09-15/时2025-09-15/10:00
           // 所有数据的日期格式一致
           if (!map[inner.statisDate]) {
-            map[inner.statisDate] = []
-            mapArr.push(inner.statisDate)
+            map[inner.statisDate] = [];
+            mapArr.push(inner.statisDate);
           }
-        })
-      })
+        });
+      });
       data.forEach((item, itemIndex) => {
-        const dataTimeList = item.dataList.map(i =>i.statisDate)
-        const noDataTime = mapArr.filter(i=>!dataTimeList.includes(i))
+        const dataTimeList = item.dataList.map((i) => i.statisDate);
+        const noDataTime = mapArr.filter((i) => !dataTimeList.includes(i));
         sourceBase.forEach((outer, outerIndex) => {
-          sourceTop.push(`${item.deviceId}-${outer}`)
-          noDataTime.forEach(i=>map[i].push(''))
+          sourceTop.push(`${item.deviceId}-${outer}`);
+          noDataTime.forEach((i) => map[i].push(""));
           item.dataList.forEach((inner, innerIndex) => {
-            map[inner.statisDate].push(inner[ele.attr[outerIndex]])
-          })
-        })
-      })
-      mapArr = mapArr.sort((a,b)=>this.compareDate(a,b))
-      mapArr.forEach(item=>{
-        source.push([item,...map[item]])
-      })
-      source.unshift(sourceTop)
-      console.log('map=',map)
-      console.log('mapArr=',mapArr)
-      console.log('========',source)
-      this.chart.setOption({
+            map[inner.statisDate].push(inner[ele.attr[outerIndex]]);
+          });
+        });
+      });
+      mapArr = mapArr.sort((a, b) => this.compareDate(a, b));
+      mapArr.forEach((item) => {
+        source.push([item, ...map[item]]);
+      });
+      source.unshift(sourceTop);
+      this.chart.setOption(
+        {
           grid: {
-          containLabel: true
+            containLabel: true,
           },
           legend: {
-          left: 'center',
-          bottom: '15',
+            left: "center",
+            bottom: "15",
           },
           tooltip: {
-          trigger: 'axis',
-          axisPointer: { // 坐标轴指示器，坐标轴触发有效
-            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
-          }
+            trigger: "axis",
+            axisPointer: {
+              // 坐标轴指示器，坐标轴触发有效
+              type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+            },
           },
           textStyle: {
             color: "#333333",
           },
           xAxis: {
-          type: 'category',
+            type: "category",
           },
           yAxis: {
-          type: 'value',
+            type: "value",
           },
           dataset: { source },
-        series:source[0].slice(1).map(item=>{
+          series: source[0].slice(1).map((item) => {
             return {
-            type:ele.type || 'scatter'
-          }
-        })
-
-      },true)
+              type: "line",
+            };
+          }),
+        },
+        true
+      );
     },
     initChart() {
-      this.chart = echarts.init(document.querySelector('#pcsEchart'));
+      this.chart = echarts.init(document.querySelector("#pcsEchart"));
     },
     init() {
       this.$nextTick(() => {
-        this.initChart()
-        this.$refs.dateRangeSelect.init()
-      })
-    }
+        this.initChart();
+        this.$refs.dateRangeSelect.init();
+      });
+    },
   },
   beforeDestroy() {
     if (!this.chart) {
-      return
+      return;
     }
-    this.chart.dispose()
-    this.chart = null
+    this.chart.dispose();
+    this.chart = null;
   },
-}
+};
 </script>

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

@@ -0,0 +1,215 @@
+<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"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
+            :clearable="false"
+            :picker-options="pickerOptions"
+            :default-value="defaultDateRange"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSearch" native-type="button">搜索</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="onReset" native-type="button">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <!--表格-->
+    <el-table
+        class="common-table"
+        :data="tableData"
+        show-summary
+        stripe
+        style="width: 100%;margin-top:25px;">
+      <!--        汇总列-->
+      <el-table-column label="汇总" min-width="100px" align="center">
+        <el-table-column
+            prop="dataTime"
+            label="日期"
+            min-width="100px" align="center">
+        </el-table-column>
+      </el-table-column>
+      <!--充电量列-->
+      <el-table-column label="充电价格" align="center">
+        <el-table-column
+            align="center"
+            prop="activePeakPrice"
+            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
+            align="center"
+            prop="reActivePeakPrice"
+            label="尖">
+        </el-table-column>
+        <el-table-column
+            align="center"
+            prop="reActiveHighPrice"
+            label="峰">
+        </el-table-column>
+        <el-table-column
+            align="center"
+            prop="reActiveFlatPrice"
+            label="平">
+        </el-table-column>
+        <el-table-column
+            align="center"
+            prop="reActiveValleyPrice"
+            label="谷">
+        </el-table-column>
+        <el-table-column
+            align="center"
+            prop="reActiveTotalPrice"
+            label="总">
+        </el-table-column>
+      </el-table-column>
+      <!--      实际收益-->
+      <el-table-column label="" align="center" fixed="right">
+        <el-table-column
+            prop="actualRevenue"
+            label="实际收益"
+            align="center">
+        </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 {getAmmeterRevenueData} from '@/api/ems/dzjk'
+import {formatDate} from "@/filters/ems";
+
+export default {
+  name: 'DzjkTjbbSybb',
+  mixins: [getQuerySiteId],
+  data() {
+    return {
+      loading: false,
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        },
+      },
+      defaultDateRange: [],//默认展示的时间
+      dateRange: [],
+      tableData: [],
+      pageSize: 10,//分页栏当前每个数据总数
+      pageNum: 1,//分页栏当前页数
+      totalSize: 0,//table表格数据总数
+    }
+  },
+  methods: {
+    // 搜索
+    onSearch() {
+      this.pageNum = 1//每次搜索从1开始搜索
+      this.getData()
+    },
+    // 重置
+    onReset() {
+      this.dateRange = this.defaultDateRange
+      this.pageNum = 1//每次搜索从1开始搜索
+      this.getData()
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.$nextTick(() => {
+        this.getData()
+      })
+    },
+    handleCurrentChange(val) {
+      this.pageNum = val
+      this.$nextTick(() => {
+        this.getData()
+      })
+    },
+    // 获取数据
+    getData() {
+      this.loading = true
+      const {siteId, pageNum, pageSize} = this
+      const [startTime = '', endTime = ''] = (this.dateRange || [])
+      getAmmeterRevenueData({siteId: siteId, startTime, endTime, pageSize, pageNum}).then(response => {
+        this.tableData = response?.rows || [];
+        this.totalSize = response?.total || 0
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    init() {
+      this.dateRange = []
+      this.tableData = []
+      this.totalSize = 0
+      this.pageSize = 10
+      this.pageNum = 1
+      let now = new Date(), lastDay = now.getTime(), firstDay = new Date(now.setDate(1)).getTime();
+      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 {
+      border-bottom: 1px solid #dfe6ec;
+    }
+
+    .el-table__footer-wrapper {
+      tbody td.el-table__cell {
+        color: #000;
+        font-weight: bolder;
+      }
+    }
+  }
+
+}
+
+</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,10 +34,10 @@
                   <div
                       class="status"
                       :class="
-                      item.communicationStatus === '0' ? 'status-running' : ''
+                      item.deviceStatus === '1' ? 'status-running' : ''
                     "
                   >
-                    {{ communicationStatusOptions[item.communicationStatus] }}
+                    {{ deviceStatusOptions[item.deviceStatus] }}
                   </div>
                   <div class="row-items-img">
                     <img
@@ -68,10 +68,10 @@
                   <div
                       class="status"
                       :class="
-                      item.communicationStatus === '0' ? 'status-running' : ''
+                      item.deviceStatus === '1' ? 'status-running' : ''
                     "
                   >
-                    {{ communicationStatusOptions[item.communicationStatus] }}
+                    {{ deviceStatusOptions[item.deviceStatus] }}
                   </div>
                   <div class="row-items-img">
                     <img
@@ -107,10 +107,10 @@
                   <div
                       class="status"
                       :class="
-                      item.communicationStatus === '0' ? 'status-running' : ''
+                      item.deviceStatus === '1' ? 'status-running' : ''
                     "
                   >
-                    {{ communicationStatusOptions[item.communicationStatus] }}
+                    {{ deviceStatusOptions[item.deviceStatus] }}
                   </div>
                   <div class="row-items-img row-items-img-bms">
                     <div style="position:relative;">
@@ -150,10 +150,10 @@
                   <div
                       class="status"
                       :class="
-                      item.communicationStatus === '0' ? 'status-running' : ''
+                      item.deviceStatus === '1' ? 'status-running' : ''
                     "
                   >
-                    {{ communicationStatusOptions[item.communicationStatus] }}
+                    {{ deviceStatusOptions[item.deviceStatus] }}
                   </div>
                   <div class="row-items-img">
                     <img
@@ -171,14 +171,14 @@
                   <div
                       class="status"
                       :class="
-                      item.children[0].communicationStatus === '0'
+                      item.children[0].deviceStatus === '1'
                         ? 'status-running'
                         : ''
                     "
                   >
                     {{
-                      communicationStatusOptions[
-                        item.children[0].communicationStatus
+                      deviceStatusOptions[
+                          item.children[0].deviceStatus
                           ]
                     }}
                   </div>
@@ -207,6 +207,7 @@
 import {getDeviceList} from "@/api/ems/site";
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import {mapState} from "vuex";
+
 export default {
   name: "DzjkZxlt",
   mixins: [getQuerySiteId],
@@ -222,8 +223,8 @@ export default {
   },
   computed: {
     ...mapState({
-      communicationStatusOptions: (state) =>
-        state.ems.communicationStatusOptions,
+      deviceStatusOptions: (state) =>
+          state.ems.deviceStatusOptions,
     }),
 
     showPcs() {
@@ -329,6 +330,7 @@ $lineColor: #86bcc7;
     display: flex;
     position: relative;
   }
+
   //云 、计算机 、箭头
   .top {
     z-index: 2;
@@ -343,6 +345,7 @@ $lineColor: #86bcc7;
     //云 样式
     .cloud-container {
       margin: 0 auto;
+
       .cloud {
         width: 60px;
         height: 26px;
@@ -354,6 +357,7 @@ $lineColor: #86bcc7;
         font-size: 14px;
         line-height: 26px;
       }
+
       .cloud:before,
       .cloud:after {
         content: "";
@@ -363,20 +367,24 @@ $lineColor: #86bcc7;
         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;
@@ -384,6 +392,7 @@ $lineColor: #86bcc7;
         background-color: #5ea9df;
         margin: 0 10px;
         position: relative;
+
         &::after {
           content: "";
           position: absolute;
@@ -392,9 +401,11 @@ $lineColor: #86bcc7;
           height: 0;
         }
       }
+
       .top-arrows {
         vertical-align: super;
       }
+
       .top-arrows::after {
         top: -4px;
         border-bottom: 6px solid transparent;
@@ -403,8 +414,10 @@ $lineColor: #86bcc7;
         border-top: 6px solid transparent;
         left: -11px;
       }
+
       .bottom-arrows {
         margin-top: 8px;
+
         &::after {
           top: -4px;
           border-top: 6px solid transparent;
@@ -425,6 +438,7 @@ $lineColor: #86bcc7;
       font-weight: bold;
       position: relative;
       background: #fff;
+
       img {
         width: 80px;
         height: auto;
@@ -432,6 +446,7 @@ $lineColor: #86bcc7;
       }
     }
   }
+
   .outer-border {
     position: relative;
     width: fit-content;
@@ -467,8 +482,10 @@ $lineColor: #86bcc7;
         color: #000;
         font-weight: bolder;
       }
+
       .row-lists {
         position: relative;
+
         .row-items {
           position: relative;
           padding: 5px 0;
@@ -503,16 +520,20 @@ $lineColor: #86bcc7;
             border-radius: 2px;
             background: #aaaaaa;
             color: #ffffff;
+
             &.status-running {
               background: #00c69c;
             }
           }
+
           // 图片+设备名称
           .row-items-img {
             position: relative;
             padding-top: 12px;
+
             &.row-items-img-bms {
               padding-top: 14px;
+
               .num {
                 position: absolute;
                 top: -2px;
@@ -526,21 +547,26 @@ $lineColor: #86bcc7;
                 color: #fff;
               }
             }
+
             img {
               width: 80px;
               height: auto;
               display: block;
               position: relative;
+
               &.img-lq {
                 width: 50px;
               }
+
               &.img-pcs {
                 width: 50px;
               }
+
               &.img-db {
                 width: 56px;
               }
             }
+
             .name {
               position: absolute;
               top: 1px;
@@ -559,19 +585,24 @@ $lineColor: #86bcc7;
         &:not(:last-child) {
           margin-right: 30px;
         }
+
         .row-items {
           display: flex;
+
           &::after {
             display: none;
           }
+
           .parent-dash {
             position: relative;
             z-index: 2;
             background-color: #fff;
+
             > div {
               z-index: 2;
               position: inherit;
             }
+
             &::after {
               z-index: 1;
               content: "";
@@ -585,16 +616,19 @@ $lineColor: #86bcc7;
               transform: scale(0.4, 1);
             }
           }
+
           .children-dash {
             position: relative;
             z-index: 2;
             background-color: #fff;
             margin: -20px 0 0 26px;
             height: fit-content;
+
             > div {
               z-index: 2;
               position: inherit;
             }
+
             &::after {
               z-index: 1;
               content: "";

src/views/ems/search/index.vue

@@ -1,35 +1,62 @@
 <template>
-  <div v-loading="loading" class="ems-dashboard-editor-container" style="background-color: #ffffff">
+  <div
+      v-loading="loading"
+      class="ems-dashboard-editor-container"
+      style="background-color: #ffffff"
+  >
     <el-form ref="form" :model="form" label-position="top">
       <el-form-item
           label="站点"
           prop="siteIds"
           :rules="[{ required: true, message: '请选择站点' }]"
       >
-        <el-radio-group v-model="form.siteIds" >
-          <el-radio  v-for="(item,index) in siteList" :key="index+'zdListSearch'" :label="item.siteId">
+        <el-radio-group v-model="form.siteIds" @input="changeSiteIds">
+          <el-radio
+              v-for="(item, index) in siteList"
+              :key="index + 'zdListSearch'"
+              :label="item.siteId"
+          >
             {{ item.siteName }}
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="设备" prop="categoryName" :rules="[{ required: true, message: '请选择设备' }]">
-        <el-radio-group v-model="form.categoryName" >
-          <el-radio v-for="(key,index) in deviceCategoryList" :key="index+'sbListSearch'" :label="key">
-            {{ key }}
+      <el-form-item
+          label="设备"
+          prop="deviceCategory"
+          :rules="[{ required: true, message: '请选择设备' }]"
+      >
+        <el-radio-group v-model="form.deviceCategory" @input="changeSiteIds">
+          <el-radio
+              v-for="(item, index) in deviceCategoryList"
+              :key="index + 'sbListSearch'"
+              :label="item.code"
+          >
+            {{ item.name }}
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item v-if="isDtdc" label="单体电池(不超过5个)" prop="child" :rules="[{ required: true, message: '请选择单体电池' }]">
+      <el-form-item
+          v-if="isDtdc"
+          label="单体电池(不超过5个)"
+          prop="child"
+          :rules="[{ required: true, message: '请选择单体电池' }]"
+      >
         <el-cascader
             v-model="form.child"
             style="width: 400px"
             :props="{ multiple: true }"
             :show-all-levels="false"
             :options="childOptions"
-            @change="handleChildChange"></el-cascader>
+            @change="handleChildChange"
+        ></el-cascader>
       </el-form-item>
       <div style="display: flex">
-        <el-form-item label="点位" prop="pointName"  :rules="[{ required: true, message: '请输入点位' }]" style="margin-right: 50px">
+        <el-form-item
+            label="点位"
+            prop="pointName"
+            :rules="[{ required: true, message: '请输入点位' }]"
+            style="margin-right: 50px"
+        >
           <el-autocomplete
               v-model="form.pointName"
               placeholder="请输入点位"
@@ -38,19 +65,15 @@
               @select="handleSelect"
           ></el-autocomplete>
         </el-form-item>
-<!--        <el-form-item label="横坐标" prop="dataUnit" :rules="[{ required: true, message: '请选择横坐标' }]">-->
-<!--          <el-radio-group v-model="form.dataUnit">-->
-<!--            <el-radio :label="1">分钟</el-radio>-->
-<!--            <el-radio :label="2">小时</el-radio>-->
-<!--            <el-radio :label="3">天</el-radio>-->
-<!--          </el-radio-group>-->
-<!--        </el-form-item>-->
       </div>
       <el-form-item>
         <el-button type="primary" @click="submitForm">生成图表</el-button>
       </el-form-item>
     </el-form>
-    <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">
         <span class="card-title">
           <el-radio-group v-model="form.dataUnit">
@@ -59,7 +82,12 @@
             <el-radio :label="3">天</el-radio>
           </el-radio-group>
         </span>
-        <date-time-select ref="dateTimeSelect" :data-unit="form.dataUnit" @initDate="((e)=>form.dataRange=e||[])" @updateDate="updateDate"/>
+        <date-time-select
+            ref="dateTimeSelect"
+            :data-unit="form.dataUnit"
+            @initDate="(e) => (form.dataRange = e || [])"
+            @updateDate="updateDate"
+        />
       </div>
       <div style="height: 350px" id="searchChart"></div>
     </el-card>
@@ -67,42 +95,42 @@
 </template>
 
 <script>
-import * as echarts from 'echarts'
-import resize from '@/mixins/ems/resize'
+import * as echarts from "echarts";
+import resize from "@/mixins/ems/resize";
 import {getAllSites} from "@/api/ems/zddt";
-import {getAllDeviceCategory,getPointValueList,pointFuzzyQuery,getAllBatteryIdsBySites} from '@/api/ems/search'
+import {getAllBatteryIdsBySites, getAllDeviceCategory, getPointValueList, pointFuzzyQuery,} from "@/api/ems/search";
 import DateTimeSelect from "./DateTimeSelect.vue";
+
 export default {
   name: "Search",
   mixins: [resize],
   components: {DateTimeSelect},
   computed: {
     isDtdc() {
-      return this.form.categoryName === '单体电池'
+      return this.form.deviceCategory === "BATTERY";
     },
   },
   watch: {
-    'form.siteIds':{
+    "form.siteIds": {
       handler(newVal) {
-          newVal && this.isDtdc && this.getChildList()
-        }
+        newVal && this.isDtdc && this.getChildList();
+      },
     },
     isDtdc: {
       handler(newVal) {
-        newVal && this.form.siteIds && this.getChildList()
-        !newVal && (this.form.child = [])
-      }
+        newVal && this.form.siteIds && this.getChildList();
+        !newVal && (this.form.child = []);
       },
-    'form.dataUnit':{
+    },
+    "form.dataUnit": {
       handler(newVal, oldVal) {
-        console.log('wacth到了dataUnit的变化',newVal,oldVal)
+        console.log("wacth到了dataUnit的变化", newVal, oldVal);
         this.$nextTick(() => {
-          this.$refs.dateTimeSelect.init()
-          this.getDate()
-        })
-        // this.submitForm()
+          this.$refs.dateTimeSelect.init();
+          this.getDate();
+        });
+      },
     },
-    }
   },
   data() {
     return {
@@ -113,228 +141,432 @@ export default {
       form: {
         dataRange: [], //时间选择范围
         child: [],
-        siteIds: '',//当前选中的站点id 默认选中第一个站点
-        categoryName: '',//设备
-        pointName: '',//点位
+        siteIds: "", //当前选中的站点id 默认选中第一个站点
+        deviceCategory: "", //设备
+        pointName: "", //点位
         dataUnit: 1, //横坐标
       },
       loading: false,
-    }
+    };
   },
   methods: {
+    changeSiteIds(val) {
+      console.log("切换站点或设备清空点位", val);
+      val && (this.form.pointName = "");
+    },
     getChildList() {
-      this.childOptions=[]
-      this.form.child=[]
-      const {siteIds} = this.form
-      getAllBatteryIdsBySites([siteIds]).then(response=>{
+      this.childOptions = [];
+      this.form.child = [];
+      const {siteIds} = this.form;
+      getAllBatteryIdsBySites([siteIds]).then((response) => {
         const data = response?.data || {};
-        const base = 50
-        let options = []
+        const base = 50;
+        let options = [];
         Object.entries(data).forEach(([key, value], index) => {
-          if(!value) value  =[]
+          if (!value) value = [];
           options.push({
             value: key,
-            label: this.siteList.find(s=>s.siteId === key)?.siteName || '',
-            children:[]
-          })
-          const length = value.length
-          const num = Math.ceil(length /base )
-          if(num === 0) return
+            label: this.siteList.find((s) => s.siteId === key)?.siteName || "",
+            children: [],
+          });
+          const length = value.length;
+          const num = Math.ceil(length / base);
+          if (num === 0) return;
           for (let i = 1; i <= num; i++) {
-            const start = (i-1)*base+1,end = i*base
+            const start = (i - 1) * base + 1,
+                end = i * base;
             options[index].children.push({
               value: i,
               label: `${start}-${end}`,
-              children:[]
-            })
+              children: [],
+            });
             for (let s = start; s <= Math.min(length, end); s++) {
               options[index].children[i - 1].children.push({
                 value: value[s - 1],
-                label:value[s-1]
-              })
+                label: value[s - 1],
+              });
             }
           }
-        })
-        console.log('二级设备options',options)
+        });
+        console.log("二级设备options", options);
         this.childOptions = options;
-      })
+      });
     },
     handleChildChange(data) {
-      console.log('选择二级设备',data)
-      this.form.child=data
+      console.log("选择二级设备", data);
+      this.form.child = data;
     },
     showLoading() {
-      this.chart && this.chart.showLoading()
+      this.chart && this.chart.showLoading();
     },
     hideLoading() {
-      this.chart && this.chart.hideLoading()
+      this.chart && this.chart.hideLoading();
     },
     initChart() {
-      this.chart = echarts.init(document.querySelector('#searchChart'))
+      this.chart = echarts.init(document.querySelector("#searchChart"));
     },
     updateDate(val) {
-      this.form.dataRange =val || []
-      this.getDate()
+      this.form.dataRange = val || [];
+      this.getDate();
     },
     setOption(data) {
-      if(!this.chart) return
-      this.chart.clear()
-      console.log('返回的数据',data)
-      let dataset=[]
-      if(data.length>0){
-        data.forEach((item,index)=>{
-          item.deviceList.forEach(inner=>{
-            dataset.push({
-              name:`${this.isDtdc ? `${inner.parentDeviceId ? inner.parentDeviceId+'-' : ''}` : ''}${inner.deviceId}`,
-              type:'line',
-              xdata:[],
-              data:[]
-            })
-            const length = dataset.length
-            inner.pointValueList.forEach(value=>{
-              dataset[length-1].xdata.push(value.valueDate)
-              dataset[length-1].data.push(value.pointValue)
-            })
-          })
-        })
-      }else{
-        this.$message.warning('暂无数据')
+      // 点位类型	dataType	1-瞬时值 2-累计值	仅当值为2展示差值
+      // 图表类型	chartType	1-曲线图，2-箱线图
+      if (!this.chart) return;
+      this.chart.clear();
+      console.log("返回的数据", data);
+      if (!data || data.length <= 0) {
+        this.$message.warning("暂无数据");
       }
-      console.log('图表数据',dataset)
+      console.log('展示的图表类型chartType', data[0].chartType)
+
+      if (data[0].chartType === 2) {
+        //   箱型图
+        this.setBoxOption(data)
+      } else {
+        //折线图
+        this.setLineOption(data)
+      }
+    },
+    setLineOption(data) {
+      let dataset = [];
+      data.forEach((item, index) => {
+        item.deviceList.forEach((inner) => {
+          dataset.push({
+            name: `${
+                this.isDtdc
+                    ? `${inner.parentDeviceId ? inner.parentDeviceId + "-" : ""}`
+                    : ""
+            }${inner.deviceId}`,
+            type: "line",
+            markPoint: {
+              symbolSize: 30,
+              emphasis: {
+                disabled: false//打开 鼠标高亮
+              },
+              data: [//最大值、最小值
+                {
+                  // type: 'max',
+                  name: `最大值`,
+                  coord: [inner.maxDate, inner.maxValue],
+                  relativeTo: 'coordinate',
+                  label: {
+                    position: "top",
+                    formatter: item.dataType === 2 ? ([
+                      `最大值:${inner.maxValue}`,
+                      // `平均值:${inner.avgValue}`,
+                      `差值:${inner.diffValue}`,
+                    ]).join('\n') : ([
+                      `最大值:${inner.maxValue}`,
+                      // `平均值:${inner.avgValue}`,
+                    ]).join('\n'),
+                  },
+                },
+                {
+                  // type: 'min',
+                  name: `最小值`,
+                  coord: [inner.minDate, inner.minValue],
+                  relativeTo: 'coordinate',
+                  label: {
+                    position: "top",
+                    formatter: item.dataType === 2 ? ([
+                      `最小值:${inner.minValue}`,
+                      // `平均值:${inner.avgValue}`,
+                      `差值:${inner.diffValue}`,
+                    ]).join('\n') : ([
+                      `最小值:${inner.minValue}`,
+                      // `平均值:${inner.avgValue}`,
+                    ]).join('\n'),
+                  }
+                }
+              ]
+            },
+            xdata: [],
+            data: [],
+          });
+          const length = dataset.length;
+          inner.pointValueList.forEach((value) => {
+            dataset[length - 1].xdata.push(value.valueDate);
+            dataset[length - 1].data.push(value.pointValue);
+          });
+        });
+      });
+      console.log("折线图图表数据", dataset);
       this.chart.setOption({
         legend: {
           // left: 'center',
           // top: '10',
         },
         grid: {
-          containLabel: true
+          containLabel: true,
         },
         tooltip: {
-          trigger: 'axis',
-          axisPointer: { // 坐标轴指示器，坐标轴触发有效
-            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
-          }
+          trigger: "axis",
+          axisPointer: {
+            type: 'cross',
+          },
+          // axisPointer: {
+          //   // 坐标轴指示器，坐标轴触发有效
+          //   type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+          // },
         },
         textStyle: {
           color: "#333333",
         },
-        xAxis: {type:'category',data:dataset?.[0]?.xdata || []},
+        xAxis: {type: "category", data: dataset?.[0]?.xdata || []},
         yAxis: {
-          type: 'value',
+          type: "value",
         },
         dataZoom: [
           {
-            type: 'inside',
+            type: "inside",
             start: 0,
-            end: 100
+            end: 100,
           },
           {
             start: 0,
-            end: 100
-          }
+            end: 100,
+          },
         ],
-        series: dataset
-      })
+        series: dataset,
+      });
+    },
+    setBoxOption(data) {
+      let dataset = [];
+      data.forEach((item, index) => {
+        item.deviceList.forEach((inner) => {
+          dataset.push({
+            name: `${
+                this.isDtdc
+                    ? `${inner.parentDeviceId ? inner.parentDeviceId + "-" : ""}`
+                    : ""
+            }${inner.deviceId}`,
+            type: "boxplot",
+            // markPoint: {
+            //   symbolSize: 30,
+            //   emphasis: {
+            //     disabled: false//打开 鼠标高亮
+            //   },
+            //   data: [//最大值、最小值
+            //     {
+            //       // type: 'max',
+            //       name: `最大值`,
+            //       coord: [inner.maxDate, inner.maxValue],
+            //       relativeTo: 'coordinate',
+            //       label: {
+            //         position: "top",
+            //         formatter: item.dataType === 2 ? ([
+            //           `最大值:${inner.maxValue}`,
+            //           // `平均值:${inner.avgValue}`,
+            //           `差值:${inner.diffValue}`,
+            //         ]).join('\n') : ([
+            //           `最大值:${inner.maxValue}`,
+            //           // `平均值:${inner.avgValue}`,
+            //         ]).join('\n'),
+            //       },
+            //     },
+            //     {
+            //       // type: 'min',
+            //       name: `最小值`,
+            //       coord: [inner.minDate, inner.minValue],
+            //       relativeTo: 'coordinate',
+            //       label: {
+            //         position: "top",
+            //         formatter: item.dataType === 2 ? ([
+            //           `最小值:${inner.minValue}`,
+            //           // `平均值:${inner.avgValue}`,
+            //           `差值:${inner.diffValue}`,
+            //         ]).join('\n') : ([
+            //           `最小值:${inner.minValue}`,
+            //           // `平均值:${inner.avgValue}`,
+            //         ]).join('\n'),
+            //       }
+            //     }
+            //   ]
+            // },
+            xdata: [],
+            data: [],
+          });
+          const length = dataset.length;
+          inner.pointValueList.forEach((value) => {
+            const {valueDate, min, q1, median, q3, max} = value
+            dataset[length - 1].xdata.push(valueDate);
+            dataset[length - 1].data.push([min, q1, median, q3, max]);
+          });
+        });
+      });
+      console.log("箱型图图表数据", dataset);
+      this.chart.setOption({
+        legend: {
+          // left: 'center',
+          // top: '10',
+        },
+        grid: {
+          containLabel: true,
+        },
+        tooltip: {
+          trigger: 'item',
+          formatter: function (params) {
+            let data = params.data;
+            let result = params.marker + params.name + ' ' + params.seriesName + '<br/>';
+            result += '最小值: ' + data[1] + '<br/>';
+            result += '平均值: ' + data[3] + '<br/>';
+            result += '最大值: ' + data[5];
+            return result;
+          }
+          // trigger: "axis",
+          // axisPointer: {
+          //   type: 'cross',
+          // },
+          // axisPointer: {
+          //   // 坐标轴指示器，坐标轴触发有效
+          //   type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+          // },
+        },
+        textStyle: {
+          color: "#333333",
+        },
+        xAxis: {type: "category", data: dataset?.[0]?.xdata || []},
+        yAxis: {
+          type: "value",
+        },
+        dataZoom: [
+          {
+            type: "inside",
+            start: 0,
+            end: 100,
+          },
+          {
+            start: 0,
+            end: 100,
+          },
+        ],
+        series: dataset,
+      });
     },
     submitForm() {
-      this.getDate()
+      this.getDate();
     },
     handleSelect(data) {
-      this.form.pointName = data.value
+      this.form.pointName = data.value;
     },
     querySearchAsync(query, cb) {
-      console.log('查询数据',query)
-      if(!this.form.siteIds || !this.form.categoryName){
+      console.log("查询数据", query);
+      if (!this.form.siteIds || !this.form.deviceCategory) {
         this.$message({
-          type: 'warning',
-          message: '请先选择站点和设备',
-        })
-        return cb([])
+          type: "warning",
+          message: "请先选择站点和设备",
+        });
+        return cb([]);
       }
       pointFuzzyQuery({
         siteIds: [this.form.siteIds],
-        categoryName:this.form.categoryName,
+        deviceCategory: this.form.deviceCategory,
         pointName: query,
-      }).then(response => {
-        const data  = response?.data || []
-        cb(data.map(item => {
-          return {name: item, value: item}
-        }))
+      }).then((response) => {
+        const data = response?.data || [];
+        cb(
+            data.map((item) => {
+              return {name: item, value: item};
             })
+        );
+      });
     },
     // 获取所有设备
     getDeviceCategory() {
-      return getAllDeviceCategory().then(response => {
-        this.deviceCategoryList=response?.data || []
-      })
+      return getAllDeviceCategory().then((response) => {
+        this.deviceCategoryList = response?.data || [];
+      });
     },
     getZdList() {
-      return getAllSites().then(response => {
-        this.siteList = response.data || []
-      }).finally(() => {
+      return getAllSites()
+          .then((response) => {
+            this.siteList = response.data || [];
           })
+          .finally(() => {
+          });
     },
     getDate() {
-      this.$refs.form.validate(valid => {
+      this.$refs.form.validate((valid) => {
         if (valid) {
           if (!this.form.pointName) {
-            return this.$message.error('请输入正确的点位');
+            return this.$message.error("请输入正确的点位");
           }
-          if(this.isDtdc && (this.form.child.length === 0 || this.form.child.length > 5 )){
-            return this.$message.error('请选择单体电池且不能超过5个');
+          if (
+              this.isDtdc &&
+              (this.form.child.length === 0 || this.form.child.length > 5)
+          ) {
+            return this.$message.error("请选择单体电池且不能超过5个");
           }
-          const{siteIds,dataUnit,categoryName,pointName,dataRange:[start='',end=''],child}=this.form
-          if(!start || !end) return this.$message.error('请选择时间');
-          let siteDeviceMap={}
+          const {
+            siteIds,
+            dataUnit,
+            deviceCategory,
+            pointName,
+            dataRange: [start = "", end = ""],
+            child,
+          } = this.form;
+          if (!start || !end) return this.$message.error("请选择时间");
+          let siteDeviceMap = {};
           child.forEach(([first, second, third]) => {
             if (siteDeviceMap[first]) {
-               siteDeviceMap[first].push(third)
+              siteDeviceMap[first].push(third);
             } else {
-               siteDeviceMap[first]=[]
-               siteDeviceMap[first].push(third)
+              siteDeviceMap[first] = [];
+              siteDeviceMap[first].push(third);
             }
-          })
-          let startDate,endDate
+          });
+          let startDate, endDate;
           if (start && dataUnit === 3) {
             // startDate= start + `${dataUnit === 2 ? ':00' : ' 00:00:00'}`
-            startDate = start + ' 00:00:00'
+            startDate = start + " 00:00:00";
           } else {
-            startDate=start
+            startDate = start;
           }
           if (end && dataUnit === 3) {
             // endDate= end + `${dataUnit === 2 ? ':00' : ' 00:00:00'}`
-            endDate = end + ' 00:00:00'
+            endDate = end + " 00:00:00";
           } else {
-            endDate=end
+            endDate = end;
           }
-          this.loading = true
-          getPointValueList({siteIds:[siteIds],dataUnit,categoryName,pointName,startDate,endDate,siteDeviceMap}).then(response => {
-            this.setOption(response?.data || [])
-          }).finally(()=>{
-            this.loading = false
+          this.loading = true;
+          getPointValueList({
+            siteIds: [siteIds],
+            dataUnit,
+            deviceCategory,
+            pointName,
+            startDate,
+            endDate,
+            siteDeviceMap,
           })
+              .then((response) => {
+                this.setOption(response?.data || []);
+              })
+              .finally(() => {
+                this.loading = false;
+              });
         }
-      })
+      });
     },
   },
   beforeDestroy() {
     if (!this.chart) {
-      return
+      return;
     }
-    this.chart.dispose()
-    this.chart = null
+    this.chart.dispose();
+    this.chart = null;
   },
   mounted() {
-    this.loading= true
+    this.loading = true;
     this.$nextTick(() => {
-      this.initChart()
-      this.$refs.dateTimeSelect.init()
-      Promise.all([this.getDeviceCategory(), this.getZdList()]).finally(()=>this.loading=false)
-    })
-  }
-}
+      this.initChart();
+      this.$refs.dateTimeSelect.init();
+      Promise.all([this.getDeviceCategory(), this.getZdList()]).finally(
+          () => (this.loading = false)
+      );
+    });
+  },
+};
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

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

@@ -0,0 +1,146 @@
+<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="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-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="请选择消息等级">
+            <el-option :value="1">1</el-option>
+            <el-option :value="2">2</el-option>
+            <el-option :value="3">3</el-option>
+          </el-select>
+      </el-form-item>
+      <el-form-item label="订阅topic" prop="mqttTopic">
+        <el-input v-model="formData.mqttTopic" placeholder="请输入" clearable :style="{width: '100%'}">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="topic描述" prop="topicName">
+        <el-input v-model="formData.topicName" type="textarea" placeholder="请输入" clearable :style="{width: '100%'}">
+        </el-input>
+      </el-form-item>
+    </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 {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: {
+        id:'',//设备唯一标识
+        siteId:'',
+        qos:'',
+        topicName:'',
+        mqttTopic:''
+      },
+      rules: {
+        siteId:[
+          { required: true, message: '请选择站点', trigger: 'blur'},
+        ],
+        qos:[
+          { required: true, message: '请选择消息等级', trigger: 'blur'},
+        ],
+        mqttTopic:[
+          { required: true, message: '请输入订阅topic', trigger: 'blur'},
+        ],
+        topicName:[
+          { required: true, message: '请输入topic描述', trigger: 'blur'},
+        ],
+      },
+    }
+  },
+  methods: {
+    showDialog(id){
+      this.dialogTableVisible = true
+      this.getZdList()
+      if(id){
+        this.mode = 'edit'
+        this.formData.id = id
+        this.getDetail(id)
+      }else{
+        this.mode = 'add'
+      }
+    },
+     //获取站点列表
+    getZdList(){
+      this.searchLoading=true
+      getAllSites().then(response => {
+        this.siteList = response?.data || []
+      }).finally(() => {this.searchLoading=false})
+    },
+    getDetail(id){
+      getMqttDetail(id).then(response => {
+        const {topicName='',mqttTopic='',qos='',siteId=''} = JSON.parse(JSON.stringify(response?.data || {}));
+        this.formData.mqttTopic=mqttTopic;
+        this.formData.topicName=topicName;
+        this.formData.qos=qos;
+        this.formData.siteId=siteId;
+      })
+    },
+    saveDialog() {
+      this.$refs.addTempForm.validate(valid => {
+        if (!valid) return
+        this.loading+=1
+        const {
+          id='',
+          siteId='',
+          qos='',
+          mqttTopic='',//站点ID
+          topicName='',//设备id
+        }= this.formData;
+        if(this.mode === 'add'){
+          addMqtt( {mqttTopic,topicName,siteId,qos}).then(response => {
+            if(response.code === 200){
+              //新增成功
+              // 关闭弹窗 更新表格
+              this.$emit('update')
+              this.closeDialog()
+            }
+          }).finally(() => {
+            this.loading-=1
+          })
+        }else{
+          editMqtt({mqttTopic,topicName,id,siteId,qos}).then(response => {
+            if(response.code === 200){
+              //新增成功
+              // 关闭弹窗 更新表格
+              this.$emit('update')
+              this.closeDialog()
+            }
+          }).finally(() => {
+            this.loading-=1
+          })
+        }
+
+      })
+    },
+    closeDialog(){
+      this.$emit('clear')
+      // 清空所有数据
+      this.formData= {
+        id:'',//设备唯一标识
+        mqttTopic:'',
+        topicName:''
+      }
+      this.$refs.addTempForm.resetFields()
+      this.dialogTableVisible=false
+    }
+  }
+}
+
+</script>
+<style scoped>
+</style>

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

@@ -0,0 +1,201 @@
+<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"
+            clearable
+            placeholder="请输入订阅topic"
+            style="width: 150px"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="topic描述">
+        <el-input
+            v-model="form.topicName"
+            clearable
+            placeholder="请输入topic描述"
+            style="width: 150px"
+        ></el-input>
+      </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="addPowerConfig('')">新增</el-button>
+    <el-table
+        :data="tableData"
+        class="common-table"
+        max-height="600px"
+        stripe
+        style="width: 100%;margin-top: 25px">
+        <el-table-column
+          label="站点"
+          prop="siteId">
+      </el-table-column>
+      <el-table-column
+          label="消息等级"
+          prop="qos">
+      </el-table-column>
+      <el-table-column
+          label="订阅topic"
+          prop="mqttTopic">
+      </el-table-column>
+      <el-table-column
+          label="topic描述"
+          prop="topicName">
+      </el-table-column>
+      <el-table-column
+          fixed="right"
+          label="操作">
+        <template slot-scope="scope">
+          <el-button
+              size="mini"
+              style="margin-top:10px;"
+              type="warning"
+              @click="addPowerConfig(scope.row.id)">
+            编辑
+          </el-button>
+          <el-button
+              size="mini"
+              style="margin-top:10px;"
+              type="danger"
+              @click="deleteMqtt(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"
+    >
+    </el-pagination>
+    <add-mqtt ref="addMqtt" @update="getData"/>
+  </div>
+</template>
+
+<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: { },
+  data() {
+    return {
+      form:{
+        siteId:"",
+        topicName:'',
+        mqttTopic:''
+      },
+      siteList:[],
+      searchLoading:false,
+      loading:false,
+      tableData:[],
+      pageSize:10,//分页栏当前每个数据总数
+      pageNum:1,//分页栏当前页数
+      totalSize:0,//table表格数据总数
+    }
+  },
+  methods:{
+    // 分页
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.$nextTick(()=>{
+        this.getData()
+      })
+    },
+    handleCurrentChange(val) {
+      this.pageNum = val
+      this.$nextTick(()=>{
+        this.getData()
+      })
+    },
+    // 搜索
+    onSearch(){
+      this.pageNum =1//每次搜索从1开始搜索
+      this.getData()
+    },
+    onReset(){
+      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(){
+      this.loading=true;
+      const {mqttTopic,topicName,siteId} = this.form;
+      const {pageNum,pageSize} = this;
+      getMqttList({pageNum,pageSize,mqttTopic,topicName,siteId}).then(response => {
+        this.tableData=response?.rows || [];
+        this.totalSize = response?.total || 0
+      }).finally(() => {this.loading=false})
+    },
+    addPowerConfig(id=''){
+      this.$refs.addMqtt.showDialog(id);
+    },
+    deleteMqtt(row){
+      this.$confirm(`确认要删除该配置吗?`, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        showClose:false,
+        closeOnClickModal:false,
+        type: 'warning',
+        beforeClose: (action, instance, done) => {
+          if (action === 'confirm') {
+            instance.confirmButtonLoading = true;
+            deleteMqtt(row.id).then(response => {
+              response.code === 200 && done();
+            }).finally(() => {
+              instance.confirmButtonLoading = false;
+            })
+          } else {
+            done();
+          }
+        }
+      }).then(() => {
+        //只有在废弃成功的情况下会走到这里
+        this.$message({
+          type: 'success',
+          message: '删除成功!'
+        });
+        this.getData()
+        //调用接口 更新表格数据
+      }).catch(() => {
+        //取消关机
+      });
+    },
+  },
+  mounted() {
+    this.loading=true
+    this.getZdList()
+    this.getData()
+  }
+}
+</script>

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

@@ -0,0 +1,306 @@
+//选择年月 配置尖峰平谷对应的电价 配置24小时选择对应的尖峰平谷
+<template>
+  <div>
+    <el-dialog v-loading="loading" width="780px" :visible.sync="dialogTableVisible" class="ems-dialog" title="电价配置" :close-on-click-modal="false" :show-close="false">
+      <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-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">
+        <div class="item-title">时间:</div>
+        <div class="item-content">
+          <el-date-picker
+              v-model="powerDate"
+              format="yyyy-MM"
+              value-format="yyyy-MM"
+              type="month"
+              placeholder="请选择月份"
+              :disabled="mode === 'edit'"
+          >
+          </el-date-picker>
+        </div>
+      </div>
+      <div style="display: flex">
+        <div class="items-container price-types" v-for="item in priceTypeOptions" :key="item.id">
+          <div class="item-title">{{item.name}}:</div>
+          <div class="item-content">
+            <el-input
+                placeholder="请输入价格"
+                v-model="item.price">
+            </el-input>
+          </div>
+        </div>
+      </div>
+      <div class="items-container">
+        <div class="item-title">
+            <el-button
+              @click.native.prevent="addRow"
+              block
+              type="primary"
+              size="mini">
+            新增时间段配置
+          </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 class="time-lists" v-for="(item,index) in hoursOptions" :key="'hoursOptions'+index">
+              <div>
+                <el-time-select
+                    placeholder="开始时间"
+                    v-model="item.startTime"
+                    :picker-options="{
+                        start: '00:00',
+                        step: '01:00',
+                        end: '23:00',
+                    }">
+                </el-time-select>
+              </div>
+              <div>
+                <el-time-select
+                  placeholder="结束时间"
+                  v-model="item.endTime"
+                  :picker-options="{
+                    start: '00:00',
+                    step: '01:00',
+                    end: '24:00',
+                    minTime: item.startTime
+                  }">
+                </el-time-select>
+              </div>
+              <div>
+                <el-select v-model="item.costType" placeholder="请选择">
+                  <el-option v-for="(value,key) in priceTypeOptions" :key="key+'priceTypeOptions'" :label="value.name" :value="value.id"></el-option>
+                </el-select>
+              </div>
+              <div>
+                <el-button
+                    @click.native.prevent="deleteRow(index)"
+                    type="warning"
+                    size="mini">
+                  删除
+                </el-button>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div slot="footer">
+        <el-button @click="closeDialog">取消</el-button>
+        <el-button type="primary" @click="saveDialog">确定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</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:[{
+        id:'peak',
+        name:'尖',
+        price:''
+      },{
+        id:'high',
+        name:'峰',
+        price:''
+      },{
+        id:'flat',
+        name:'平',
+        price:''
+      },{
+        id:'valley',
+        name:'谷',
+        price:''
+      }],
+      hoursOptions:[],
+      loading:false,
+      dialogTableVisible:false,
+    }
+  },
+  methods: {
+    addRow(){
+      this.hoursOptions.push({
+        startTime:'',
+        endTime:'',
+        costType:''
+      })
+    },
+    deleteRow(index){
+      this.hoursOptions.splice(index,1)
+    },
+    //获取站点列表
+    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'
+        //获取详情 初始化hoursOptions
+        this.loading = true
+        detailPriceConfig(id).then(response => {
+          const data = response?.data || {}
+          this.siteId = data?.siteId || ''
+          this.hoursOptions = data?.range || []
+          this.powerDate=data?.year && data?.month  ? data.year +'-'+data.month : ''
+          this.priceTypeOptions.forEach(item=>{
+            item.price = data[item.id]
+          })
+        }).finally(()=>this.loading = false)
+      }else {
+        this.mode='add'
+      }
+      this.dialogTableVisible=true
+    },
+    saveDialog() {
+      if(this.siteId === '') return this.$message.error('请选择站点')
+      if(this.powerDate === '') return this.$message.error('请选择时间')
+      let priceArr=[]
+      this.priceTypeOptions.forEach(item=>{
+        !['0',0].includes(item.price) && !item.price && priceArr.push(item.name)
+      })
+      if(priceArr.length>0) return this.$message.error(`请配置${priceArr.join(',')}的电价`)
+
+      if(this.hoursOptions.length<=0) return this.$message.error(`请配置24小时的电价`)
+      let hours=false,hourDis=false
+      this.hoursOptions.forEach(item=>{
+        if(!item.startTime || !item.endTime || !item.costType ) hours=true
+        if(parseInt(item.startTime)>=parseInt(item.endTime)) hourDis=true
+      })
+      if(hours) return this.$message.error(`时间段电价配置错误`)
+      if(hourDis)  return this.$message.error(`结束时间要大于开始时间`)
+      let hoursMap={}
+      this.hoursOptions.forEach(item=>{
+        let s = parseInt(item.startTime),e=parseInt(item.endTime)
+        for(s;s<e;s++){
+          if(!hoursMap[s]) hoursMap[s]=1
+          else hoursMap[s]+=1
+        }
+      })
+      console.log('hoursMap======',hoursMap)
+      if(Object.values(hoursMap).length<24 || Object.values(hoursMap).find(i=>i>1)) return this.$message.error(`请配置24小时的电价且时间不能重复`)
+      const {powerDate,priceTypeOptions,hoursOptions,mode,id,siteId} =this
+      this.loading = true
+      let params={
+        year:powerDate.split('-')[0],
+        month:parseInt(powerDate.split('-')[1]),
+        range:hoursOptions,
+        siteId,
+      }
+      priceTypeOptions.forEach(item=>{params[item.id]=item.price})
+      if(mode === 'edit') params.id = id
+      console.log('参数=======',params)
+      //调接口传数据 区分新增还是修改 成功之后关闭弹窗 更新表格
+      if(mode === 'add'){
+        addPriceConfig(params).then(response => {
+          if(response.code === 200){
+            this.$emit('update')
+            this.closeDialog()
+          }else{
+            this.$message.error('新增失败')
+          }
+        }).finally(() => {
+          this.loading = false
+        })
+      }else{
+        editPriceConfig(params).then(response => {
+          if(response.code === 200){
+            this.$emit('update')
+            this.closeDialog()
+          }else{
+            this.$message.error('修改失败')
+          }
+        }).finally(() => {
+          this.loading = false
+        })
+      }
+    },
+    closeDialog(){
+      // 清空所有数据
+      this.$emit('clear')
+      this.mode=''
+      this.id=''
+      this.siteId=''
+      this.siteList=[]
+      this.searchLoading=false
+      this.powerDate=''
+      this.hoursOptions=[]
+      this.priceTypeOptions.forEach(item=>{
+        item.price=''
+      })
+      this.dialogTableVisible=false
+    }
+  },
+}
+
+</script>
+
+<style scoped lang="scss">
+.items-container{
+  margin-bottom: 20px;
+  .item-title{
+    line-height: 16px;
+    padding: 10px 0;
+    color: #000;
+  }
+}
+.price-types{
+  width: 150px;
+  &:not(:last-child){
+    margin-right: 20px;
+  }
+}
+.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/powerTariff/index.vue

@@ -0,0 +1,208 @@
+<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"
+            type="year"
+            :clearable="false"
+            placeholder="请选择年份"
+            align="center"
+            format="yyyy年"
+            value-format="yyyy"
+            @change="changeDefaultYear"
+          >
+        </el-date-picker>
+      </el-form-item>
+      <br>
+      <el-form-item>
+        <el-button type="primary" @click="addPowerConfig('')">新增电价配置</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="month-lists-container" v-infinite-scroll="getData" infinite-scroll-immediate="false">
+      <el-empty v-show="tableData.length<=0" :image-size="200"></el-empty>
+      <el-card
+          shadow="always"
+          class="common-card-container time-range-card"
+          v-for="item in tableData"
+          :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>
+          <div>
+            <el-button type="primary" size="mini" @click="addPowerConfig(item.id)">编辑</el-button>
+            <el-button type="warning" size="mini" @click="deletePowerConfig(item)">删除</el-button>
+          </div>
+        </div>
+        <div class="price-table-container">
+          <div class="price-table">
+            <div class="time-list">
+              <div class="time"> </div>
+              <div class="type">时段</div>
+              <div class="price">电价（元/kWh）</div>
+            </div>
+            <div class="time-list" v-for="(rangeItem,rangeIndex) in item.range" :key="rangeIndex+'price'">
+              <div class="time">{{`${rangeItem.startTime}-${rangeItem.endTime}`}}</div>
+              <div class="type">{{priceTypeOptions[rangeItem.costType]}}</div>
+              <div class="price">{{item[rangeItem.costType]}}</div>
+            </div>
+          </div>
+        </div>
+      </el-card>
+    </div>
+    <add-power-tariff ref="addPowerTariff" @update="getData(true)"/>
+  </div>
+</template>
+
+<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: { },
+  data() {
+    return {
+      loading:false,
+      pageNum:1,
+      pageSize:40,
+      searchLoading:false,
+      siteId:'',
+      siteList:[],
+      tableData:[],
+      tableTotal:0,
+      defaultYear:'',
+      pickerOptions:{
+        disabledDate(time) {
+          return time.getFullYear() >= new Date().getFullYear()+1;
+        },
+      },
+      priceTypeOptions:{
+        'peak':'尖',
+        'high':'峰',
+        'flat':'平',
+        'valley':'谷'
+      },
+    }
+  },
+  methods:{
+    resetTableData(){
+      this.tableData=[]
+      this.tableTotal=0
+      this.pageNum=1
+    },
+    // 搜索
+    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(!reset && this.tableData.length>=this.tableTotal) return
+      this.loading=true;
+      const date = new Date(this.defaultYear).getFullYear()
+      const startTime = date+'-01',endTime = date+'-12'
+      listPriceConfig({startTime,endTime,pageNum:this.pageNum,pageSize:this.pageSize,siteId:this.siteId}).then(response => {
+        const data = JSON.parse(JSON.stringify(response?.rows || []))
+        data.length > 0 && (this.pageNum += 1)
+        this.tableData.push(...data)
+        this.tableTotal=response?.total || 0
+      }).finally(() => {this.loading=false})
+    },
+    addPowerConfig(id=''){
+      this.$refs.addPowerTariff.showDialog(id);
+    },
+    deletePowerConfig(row){
+      this.$confirm(`确认要删除${row.month}月的电价配置吗?`, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        showClose:false,
+        closeOnClickModal:false,
+        type: 'warning',
+        beforeClose: (action, instance, done) => {
+          if (action === 'confirm') {
+            instance.confirmButtonLoading = true;
+            energyPriceConfig(row.id).then(response => {
+              response.code === 200 && done();
+            }).finally(() => {
+              instance.confirmButtonLoading = false;
+            })
+          } else {
+            done();
+          }
+        }
+      }).then(() => {
+        //只有在废弃成功的情况下会走到这里
+        this.$message({
+          type: 'success',
+          message: '删除成功!'
+        });
+        this.getData(true)
+        //调用接口 更新表格数据
+      }).catch(() => {
+        //取消关机
+      });
+    },
+  },
+  mounted() {
+    this.defaultYear = new Date()
+    this.loading=true
+    this.getZdList().then(()=>{
+      this.getData(true)
+    })
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.month-lists-container{
+  max-height:100vh ;
+  overflow-y: auto;
+}
+.common-card-container{
+  width: 100%;
+  margin-top: 20px;
+}
+.price-table-container{
+  overflow-x: auto;
+  .price-table{
+    border:1px solid #eee;
+    width: fit-content;
+    overflow-x: auto;
+    display: flex;
+    .time-list{
+      &:not(:first-child){
+        border-left:1px solid #eee;
+      }
+      text-align: center;
+      width: 140px;
+      &>div{
+        height: 30px;
+        font-size: 12px;
+        line-height: 30px;
+        color:#000;
+        &.time,&.type{
+          border-bottom: 1px solid #eee;
+        }
+      }
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,815 @@
+<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"
+                    :props="props"
+                    :show-all-levels="false"
+                    :ref="'protectionSettings'+index"
+                    @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"
+                    :props="props"
+                    :ref="'protectionPlan'+index"
+                    @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 {addProtectPlan, getDeviceListBySiteAndCategory, getProtectPlan, updateProtectPlan} 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 {
+      props: {
+        // emitPath: false,//在选中节点改变时，是否返回由该节点所在的各级菜单的值所组成的数组，若设置 false，则只返回该节点的值
+        lazy: true,
+        lazyLoad: (node, resolve) => {
+          console.log('---------node', node)
+          this.getDeviceList(node, resolve)
+        }
+      },
+      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 => {
+            const index = this.childOptions.findIndex(i => i.value === item.deviceCategory)
+            if (index > -1) {
+              !this.childOptions[index].children.find(i => i.value === item.deviceId) && this.childOptions[index].children.push({
+                value: item.deviceId,
+                label: item.deviceName,
+                leaf: true
+              })
+            }
+            return Object.assign({}, item, {
+              deviceId: [item.deviceCategory || '', item.deviceId || ''],
+              deviceName: [item.categoryName || '', item.deviceName || ''],
+            })
+          })
+          const settings = (JSON.parse(data?.protectionSettings || [])).map(item => {
+            const index = this.childOptions.findIndex(i => i.value === item.deviceCategory)
+            if (index > -1) {
+              !this.childOptions[index].children.find(i => i.value === item.deviceId) && this.childOptions[index].children.push({
+                value: item.deviceId,
+                label: item.deviceName,
+                leaf: true
+              })
+            }
+            return Object.assign({}, item, {
+              deviceId: [item.deviceCategory || '', item.deviceId || ''],
+              deviceName: [item.categoryName || '', item.deviceName || ''],
+            })
+          })
+          this.$nextTick(() => {
+            this.protectionPlan.splice(0, 0, ...plan)
+            this.protectionSettings.splice(0, 0, ...settings)
+          })
+          console.log('获取设备保护详情并初始化', this.formData, this.protectionPlan, this.protectionSettings, this.childOptions)
+
+        })
+      } else {
+        this.mode = 'add'
+      }
+    },
+    // 新增设备保护前提、设备保护方案
+    addRow(type) {
+      const item = type === 'protectionSettings' ? {
+        deviceId: [],//设备ID
+        deviceName: [],
+        deviceCategory: "",//设备类型 英文
+        categoryName: '',//设备类型名称 中文
+        point: "",//点位 英文
+        pointName: "",//点位 中文
+        faultValue: "",//故障值
+        releaseValue: "",//释放值
+        faultOperator: "",//故障值比较关系
+        releaseOperator: "",//释放值比较关系
+        relationNext: "",//与下一个点位的关系
+      } : {
+        deviceId: [],
+        deviceName: [],
+        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 || []);
+            this.$set(this, 'childOptions', [])
+            let arr = []
+            data.forEach((item) => {
+              arr.push({
+                value: item.code,
+                label: item.name,
+                leaf: false,
+                children: []
+              })
+            })
+            this.childOptions.splice(0, 0, ...arr)
+            console.log('获取设备类型', data, this.childOptions)
+          })
+          .finally(() => {
+            this.loading -= 1;
+          });
+    },
+    //获取设备列表-区分站点
+    getDeviceList(node, resolve) {
+      if (!this.formData.siteId) {
+        this.$message({
+          type: "warning",
+          message: "请先选择站点",
+        });
+        return resolve([])
+      }
+      getDeviceListBySiteAndCategory({
+        siteId: this.formData.siteId,
+        deviceCategory: node.value
+      }).then((response) => {
+        const data = (response?.data || []).map(item => {
+          return {
+            label: item.deviceName,
+            value: item.id,
+            leaf: true
+          }
+        })
+        resolve(data)
+      }).catch(() => {
+        resolve([])
+      })
+    },
+    //更新站点下面的设备列表
+    updateSiteDeviceList() {
+      this.childOptions.forEach(item => {
+        const length = item.children.length
+        item.children.splice(0, length)
+      })
+    },
+    //选中设备类型、设备
+    handleChange(data, type, index) {
+      console.log('设置选中设备类型、设备', data, type, index)
+      const {label = '', parent = {}} = this.$refs[type + index][0].getCheckedNodes()[0]
+      console.log('选中设备的名称', parent.label, label)
+      const item = Object.assign({}, this[type][index], {
+        deviceId: data,
+        deviceName: [parent.label, label],
+        deviceCategory: data[0],
+        categoryName: parent.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.deviceName = []
+          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.deviceName = []
+          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],
+            deviceName: item.deviceName[1],
+          })
+        })
+        const plan = protectionPlan.map(item => {
+          return Object.assign({}, item, {
+            deviceId: item.deviceId[1],
+            deviceName: item.deviceName[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

@@ -0,0 +1,259 @@
+<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="故障名称">
+        <el-input
+            v-model="form.faultName"
+            clearable
+            placeholder="请输入故障名称"
+            style="width: 150px"
+        ></el-input>
+      </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>
+    <el-button type="primary" @click="addDevice" native-type="button"
+      >新增设备</el-button
+    >
+    <el-table
+      class="common-table"
+      :data="tableData"
+      stripe
+      max-height="600px"
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="siteId" label="站点"  width="100"> </el-table-column>
+      <el-table-column prop="faultName" label="设备保护名称" width="100"> </el-table-column>
+      <el-table-column prop="faultLevel" label="故障等级" width="100">
+        <template slot-scope="scope">等级{{scope.row.faultLevel}}</template>
+      </el-table-column>
+      <el-table-column prop="isAlert" label="是否告警" width="100">
+        <template slot-scope="scope">{{scope.row.isAlert === 1 ? '是' : '否'}}</template>
+      </el-table-column>
+      <el-table-column prop="description" label="处理方案描述" width="200" show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column prop="protectionSettings" label="保护前提" show-overflow-tooltip width="400">
+        <template slot-scope="scope">
+          <div v-html="handleProtectionSettings(scope.row.protectionSettings)"></div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="faultDelaySeconds" label="保护前提延时(s)" width="120">
+      </el-table-column>
+      <el-table-column prop="protectionPlan" label="保护方案" show-overflow-tooltip width="200">
+        <template slot-scope="scope">
+          <div v-html="handleProtectionPlan(scope.row.protectionPlan)"></div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="releaseDelaySeconds" label="保护方案延时(s)" width="120">
+      </el-table-column>
+      <el-table-column fixed="right" label="操作" width="150">
+        <template slot-scope="scope">
+          <el-button @click="editDevice(scope.row)" type="warning" size="mini">
+            编辑
+          </el-button>
+          <el-button type="danger" @click="deleteDevice(scope.row)" size="mini">
+            删除
+          </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"
+    >
+    </el-pagination>
+    <add-device
+      ref="addDevice"
+      @update="getData"
+    />
+  </div>
+</template>
+
+<script>
+import {
+  protectPlanList,
+  deleteProtectPlan,
+} from "@/api/ems/site";
+import { getAllSites } from "@/api/ems/zddt";
+import AddDevice from "./AddDevice.vue";
+export default {
+  name: "SBBH",
+  components: { AddDevice },
+  data() {
+    return {
+      form:{
+        siteId:'',
+        faultName:''
+      },
+      loading: false,
+      searchLoading: false,
+      siteList: [],
+      tableData: [],
+      pageSize: 10, //分页栏当前每个数据总数
+      pageNum: 1, //分页栏当前页数
+      totalSize: 0, //table表格数据总数
+      dialogTableVisible: false,
+    };
+  },
+  methods: {
+    handleProtectionSettings(data){
+      if(!data || !JSON.parse(data)) return
+      const arr = JSON.parse(data),
+      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){
+      if(!data || !JSON.parse(data)) return
+      const arr = JSON.parse(data),
+          str= arr.map((item,index)=>{
+            const {categoryName='',deviceId='',point='',value=''} = item
+            return `<div>${index+1}、 <span>${categoryName ? categoryName + '-' : ''}${deviceId ? deviceId + '-' : ''}${ point || ''}</span> <span>故障:=${ value || ''}</span> </div>`
+          })
+      return str.join('')
+    },
+    //  新增设备 展示弹窗
+    addDevice() {
+      this.$refs.addDevice.open()
+    },
+    // 编辑设备
+    editDevice(row) {
+      this.$refs.addDevice.open(row.id,row.siteId)
+    },
+    //删除设备
+    deleteDevice(row) {
+      console.log('删除')
+      this.$confirm(`确认要设备保护${row.faultName}吗?`, {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        showClose: false,
+        closeOnClickModal: false,
+        type: "warning",
+        beforeClose: (action, instance, done) => {
+          if (action === "confirm") {
+            instance.confirmButtonLoading = true;
+            deleteProtectPlan(row.id)
+              .then((response) => {
+                response.code === 200 && done();
+              })
+              .finally(() => {
+                instance.confirmButtonLoading = false;
+              });
+          } else {
+            done();
+          }
+        },
+      })
+        .then(() => {
+          //只有在废弃成功的情况下会走到这里
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+          this.getData();
+          //调用接口 更新表格数据
+        })
+        .catch(() => {
+          //取消关机
+        });
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.$nextTick(() => {
+        this.getData();
+      });
+    },
+    handleCurrentChange(val) {
+      this.pageNum = val;
+      this.$nextTick(() => {
+        this.getData();
+      });
+    },
+    // 搜索
+    onSearch() {
+      this.pageNum = 1; //每次搜索从1开始搜索
+      this.getData();
+    },
+    // 重置
+    onReset() {
+      this.form={
+        siteId: "",
+        faultName: "",
+      }
+      this.pageNum = 1; //每次搜索从1开始搜索
+      this.getData();
+    },
+    // 获取数据
+    getData() {
+      this.loading = true;
+      const { pageNum, pageSize } = this,{siteId,faultName=''}=this.form;
+      protectPlanList({ siteId, faultName,pageNum, pageSize })
+        .then((response) => {
+          this.tableData = response?.rows || [];
+          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.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>

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

@@ -1,13 +1,18 @@
 <template>
-  <el-dialog :visible.sync="dialogTableVisible" :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-form v-loading="loading>0" ref="addTempForm" :model="formData" :rules="rules" size="medium" label-width="100px">
+  <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="800px" class="ems-dialog"
+             :title="mode === 'add'?'新增设备':`编辑设备` ">
+    <div v-loading="loading>0">
+      <el-form v-loading="loading>0" ref="addTempForm" inline :model="formData" :rules="rules" size="medium"
+               label-width="120px" class="device-form">
         <el-form-item label="站点" prop="siteId">
-        <el-select v-model="formData.siteId" placeholder="请选择" :style="{width: '100%'}">
-          <el-option :label="item.siteName" :value="item.siteId" v-for="(item,index) in siteList" :key="index+'siteOptions'"></el-option>
+          <el-select v-model="formData.siteId" placeholder="请选择" :style="{width: '100%'}" @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="设备id" prop="deviceId">
-        <el-input v-model="formData.deviceId" maxlength="60" clearable :style="{width: '100%'}">
+          <el-input v-model="formData.deviceId" placeholder="请输入" maxlength="60" clearable :style="{width: '100%'}">
           </el-input>
         </el-form-item>
         <el-form-item label="设备名称" prop="deviceName">
@@ -15,27 +20,35 @@
           </el-input>
         </el-form-item>
         <el-form-item label="设备描述" prop="description">
-        <el-input v-model="formData.description" type="textarea" placeholder="请输入" clearable :style="{width: '100%'}">
+          <el-input v-model="formData.description" type="textarea" placeholder="请输入" clearable
+                    :style="{width: '100%'}">
           </el-input>
         </el-form-item>
         <el-form-item label="工作状态" prop="communicationStatus">
           <el-select v-model="formData.communicationStatus" placeholder="请选择" :style="{width: '100%'}">
-          <el-option :label="value" :value="key" v-for="(value,key) in communicationStatusOptions" :key="key+'communicationStatusOptions'"></el-option>
+            <el-option :label="value" :value="key" v-for="(value,key) in communicationStatusOptions"
+                       :key="key+'communicationStatusOptions'"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="设备类型" prop="deviceType">
           <el-select v-model="formData.deviceType" placeholder="请选择" :style="{width: '100%'}">
-          <el-option :label="value" :value="key" v-for="(value,key) in deviceTypeOptions" :key="key+'deviceTypeOptions'"></el-option>
+            <el-option :label="value" :value="key" v-for="(value,key) in deviceTypeOptions"
+                       :key="key+'deviceTypeOptions'"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="设备类别" prop="deviceCategory">
-        <el-select v-model="formData.deviceCategory" placeholder="请选择" :style="{width: '100%'}">
-          <el-option :label="item" :value="item" v-for="(item,index) in deviceCategoryList" :key="index+'deviceCategoryList'"></el-option>
+          <el-select v-model="formData.deviceCategory" placeholder="请选择" :style="{width: '100%'}"
+                     @change="changeType">
+            <el-option :label="item.name" :value="item.code" v-for="(item,index) in deviceCategoryList"
+                       :key="index+'deviceCategoryList'"></el-option>
           </el-select>
         </el-form-item>
-      <el-form-item label="上级设备" prop="parentId" v-if="formData.deviceCategory === dccDeviceCategory">
-        <el-select v-model="formData.parentId" :placeholder="parentDeviceList.length === 0 && !formData.siteId ? '请先选择站点' : '请选择'" :style="{width: '100%'}">
-          <el-option :label="item.deviceName" :value="item.id" v-for="(item,index) in parentDeviceList" :key="index+'parentDeviceList'" ></el-option>
+        <el-form-item label="上级设备" prop="parentId" v-if="dccDeviceCategoryList.includes(formData.deviceCategory)">
+          <el-select v-model="formData.parentId"
+                     :placeholder="parentDeviceList.length === 0 && !formData.siteId ? '请先选择站点' : '请选择'"
+                     :style="{width: '100%'}">
+            <el-option :label="item.deviceName" :value="item.id" v-for="(item,index) in parentDeviceList"
+                       :key="index+'parentDeviceList'"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="TCP设备的ip地址" prop="ipAddress" v-if="formData.deviceType === 'TCP'">
@@ -46,7 +59,10 @@
           <el-input v-model="formData.ipPort" placeholder="请输入" clearable :style="{width: '100%'}">
           </el-input>
         </el-form-item>
-
+        <el-form-item label="从站地址" prop="slaveId" v-if="formData.deviceType === 'TCP'">
+          <el-input v-model="formData.slaveId" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
         <el-form-item label="串口路径" prop="serialPort">
           <el-input v-model="formData.serialPort" placeholder="请输入" clearable :style="{width: '100%'}">
           </el-input>
@@ -72,6 +88,49 @@
         </el-form-item>
 
       </el-form>
+      <!--      pcs配置-->
+      <el-form v-if="isPcs" ref="pcsSettingForm" inline :model="pcsSetting" size="medium"
+               label-width="120px" class="device-form" :rules="pcsSettingRules">
+        <div style="font-size: 14px;padding: 10px 0 20px;font-weight: 600;">PCS配置</div>
+        <el-form-item label="开关机地址" prop="pointAddress">
+          <el-input v-model="pcsSetting.pointAddress" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="功率地址" prop="powerAddress">
+          <el-input v-model="pcsSetting.powerAddress" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="开机指令" prop="startCommand">
+          <el-input v-model="pcsSetting.startCommand" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="开机目标功率" prop="startPower">
+          <el-input v-model="pcsSetting.startPower" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="关机指令" prop="stopCommand">
+          <el-input v-model="pcsSetting.stopCommand" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="关机目标功率" prop="stopPower">
+          <el-input v-model="pcsSetting.stopPower" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="电池簇数" prop="clusterNum">
+          <el-input v-model="pcsSetting.clusterNum" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <br>
+        <template v-for="index in parseInt(pcsSetting.clusterNum) || 0">
+          <el-form-item :label="'电池簇'+(index)+'地址'"
+                        prop="clusterPointAddress">
+            <el-input v-model="pcsSetting.clusterPointAddress[index-1]" placeholder="请输入" clearable
+                      :style="{width: '100%'}">
+            </el-input>
+          </el-form-item>
+        </template>
+      </el-form>
+    </div>
     <div slot="footer">
       <el-button @click="closeDialog">取消</el-button>
       <el-button type="primary" @click="saveDialog">确定</el-button>
@@ -80,10 +139,11 @@
 </template>
 <script>
 import {mapState} from "vuex";
-import {getStackNameList} from '@/api/ems/dzjk'
 import {getAllSites} from '@/api/ems/zddt'
 import {validText} from '@/utils/validate'
-import {getDeviceDetailInfo,getDeviceCategory,updateDevice,addDevice} from "@/api/ems/site";
+import {addDevice, getDeviceDetailInfo, getParentDeviceId, updateDevice} from "@/api/ems/site";
+import {getAllDeviceCategory} from '@/api/ems/search'
+
 export default {
   props: {
     mode: {
@@ -110,9 +170,16 @@ export default {
         callback();
       }
     }
+    const validateNumber = (rule, value, callback) => {
+      if (value !== '' && !/^[0-9]+$/.test(value)) {
+        callback(new Error('只能输入数字!'));
+      } else {
+        callback();
+      }
+    }
     return {
       loading: 0,
-      dccDeviceCategory:'CLUSTER',
+      dccDeviceCategoryList: ['CLUSTER', 'BATTERY'],//需要展示上级设备的设备类型
       dialogTableVisible: false,
       parentDeviceList: [],//上级设备列表  从接口获取数据
       siteList: [],//站点列表  从接口获取数据
@@ -135,6 +202,18 @@ export default {
         stopBits: '',//停止位
         parity: '',//校验位
         pictureUrl: '',//设备图片
+        slaveId: '',//从站地址
+      },
+      pcsSetting: {
+        deviceSettingId: '',
+        powerAddress: '',//功率地址
+        pointAddress: "",//开关机地址
+        startCommand: "",//开机指令
+        stopCommand: "",//关机指令
+        startPower: '',//开机目标功率
+        stopPower: '',//关机目标功率
+        clusterNum: '',//电池簇数
+        clusterPointAddress: []//电池簇地址
       },
       rules: {
         siteId: [
@@ -167,6 +246,9 @@ export default {
         ipPort: [
           {validator: validateText, trigger: 'blur'}
         ],
+        slaveId: [
+          {validator: validateNumber, trigger: 'blur'}
+        ],
         serialPort: [
           {validator: validateText, trigger: 'blur'}
         ],
@@ -186,33 +268,49 @@ export default {
         //   { 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'}
+        ],
+        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 || {}
-    })
+    }),
+    isPcs() {
+      return this.formData.deviceCategory === 'PCS'
+    }
   },
   watch: {
-    'formData.deviceCategory':{
-      handler(newVal){
-        // 只有电池簇需要选择上级设备 调用接口获取电池堆列表
-        if(newVal && newVal === this.dccDeviceCategory){
-          this.getParentDeviceList()
-        }
-      },
-      immediate:true
-    },
-    'formData.siteId':{
-      handler(newVal,oldVal){
-        // 只有电池簇需要选择上级设备 调用接口获取电池堆列表
-        if(newVal && oldVal!== newVal && this.formData.deviceCategory === this.dccDeviceCategory){
-          this.getParentDeviceList()
-        }
-      },
-      immediate:true
-    },
     dialogTableVisible: {
       handler(newVal) {
         //打开弹窗
@@ -228,14 +326,31 @@ export default {
         if ((newVal || newVal === 0) && this.mode !== 'add') {
           this.loading += 1
           getDeviceDetailInfo(newVal).then(response => {
-            this.formData = JSON.parse(JSON.stringify(response?.data || {}));
-          }).finally(() => {this.loading-=1})
+            const {pcsSetting, ...data} = JSON.parse(JSON.stringify(response?.data || {}))
+            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
+          })
         }
       },
       immediate: true,
     }
   },
   methods: {
+    changeType() {
+      if (this.dccDeviceCategoryList.includes(this.formData.deviceCategory)) {
+        this.getParentDeviceList()
+      }
+    },
     uploadImage(data) {
       this.formData.pictureUrl = data
     },
@@ -244,31 +359,33 @@ export default {
       this.loading += 1
       getAllSites().then(response => {
         this.siteList = response?.data || []
-      }).finally(() => {this.loading-=1})
+      }).finally(() => {
+        this.loading -= 1
+      })
     },
     // 获取设备类别
     getDeviceCategoryList() {
       this.loading += 1
-      getDeviceCategory().then(response => {
+      getAllDeviceCategory().then(response => {
         this.deviceCategoryList = response?.data || []
-      }).finally(() => {this.loading-=1})
+      }).finally(() => {
+        this.loading -= 1
+      })
     },
     //获取上级id列表
-    getParentDeviceList(){
+    getParentDeviceList(init = false) {
       if (!this.formData.siteId) {
         return console.log('请先选择站点')
       }
-      this.formData.parentId=''
+      !init && (this.formData.parentId = '')
       this.loading = this.loading + 1
-      getStackNameList(this.formData.siteId).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
       })
     },
-    saveDialog() {
-      this.$refs.addTempForm.validate(valid => {
-        if (!valid) return
+    saveData() {
       this.loading += 1
       const {
         id = '',
@@ -288,9 +405,52 @@ export default {
         stopBits = '',//停止位
         parity = '',//校验位
         pictureUrl = '',//设备图片
+        slaveId = '',//从站地址
       } = this.formData;
+      const {
+        deviceSettingId,
+        powerAddress,
+        pointAddress,
+        startCommand,
+        stopCommand,
+        startPower,
+        stopPower,
+        clusterNum,
+        clusterPointAddress
+      } = this.pcsSetting
+      let params = {
+        siteId,
+        deviceId,
+        deviceName,
+        description,
+        communicationStatus,
+        deviceType,
+        deviceCategory,
+        parentId,
+        ipAddress,
+        ipPort,
+        serialPort,
+        baudRate,
+        dataBits,
+        stopBits,
+        parity,
+        pictureUrl,
+        slaveId,
+      }
+      if (this.isPcs) {
+        params.pcsSetting = {
+          powerAddress,
+          pointAddress,
+          startCommand,
+          stopCommand,
+          startPower,
+          stopPower,
+          clusterNum,
+          clusterPointAddress: JSON.stringify(!clusterNum ? [] : (clusterPointAddress || []).slice(0, clusterNum))
+        }
+      }
       if (this.mode === 'add') {
-          addDevice({siteId,deviceId,deviceName,description,communicationStatus,deviceType,deviceCategory,parentId,ipAddress,ipPort,serialPort,baudRate,dataBits,stopBits,parity,pictureUrl}).then(response => {
+        addDevice(params).then(response => {
           if (response.code === 200) {
             //新增成功
             // 关闭弹窗 更新表格
@@ -301,7 +461,9 @@ export default {
           this.loading -= 1
         })
       } else {
-          updateDevice({id,siteId,deviceId,deviceName,description,communicationStatus,deviceType,deviceCategory,parentId,ipAddress,ipPort,serialPort,baudRate,dataBits,stopBits,parity,pictureUrl}).then(response => {
+        params.id = id
+        params.pcsSetting && (params.pcsSetting.deviceSettingId = deviceSettingId)
+        updateDevice(params).then(response => {
           if (response.code === 200) {
             //新增成功
             // 关闭弹窗 更新表格
@@ -312,13 +474,23 @@ export default {
           this.loading -= 1
         })
       }
-
+    },
+    saveDialog() {
+      this.$refs.addTempForm.validate(valid => {
+        if (!valid) return
+        if (this.isPcs) {
+          this.$refs.pcsSettingForm.validate(pcsValidate => {
+            if (!pcsValidate) return
+            this.saveData()
+          })
+        } else {
+          this.saveData()
+        }
       })
     },
     closeDialog() {
       this.$emit('clear')
       // 清空所有数据
-      this.$refs.addTempForm.resetFields()
       this.formData = {
         id: '',//设备唯一标识
         siteId: '',//站点ID
@@ -337,12 +509,36 @@ export default {
         stopBits: '',//停止位
         parity: '',//校验位
         pictureUrl: '',//设备图片
+        slaveId: '',//从站地址
       }
+      this.pcsSetting = {
+        deviceSettingId: '',
+        powerAddress: '',//功率地址
+        pointAddress: "",//开关机地址
+        startCommand: "",//开机指令
+        stopCommand: "",//关机指令
+        startPower: '',//开机目标功率
+        stopPower: '',//关机目标功率
+        clusterNum: '',//电池簇数
+        clusterPointAddress: []//电池簇地址
+      }
+      this.$refs.addTempForm.resetFields()
+      this.$refs?.pcsSettingForm?.resetFields()
       this.dialogTableVisible = false
     }
   }
 }
 
 </script>
-<style scoped>
+<style scoped lang="scss">
+.device-form {
+  ::v-deep .el-form-item--medium .el-form-item__content {
+    width: 260px;
+  }
+
+  .el-form-item {
+    width: 50%;
+    margin-right: 0;
+  }
+}
 </style>

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

@@ -0,0 +1,94 @@
+<template>
+  <el-button :size="size" :type="type" :round="round" @click="switchStatus"
+  >
+    {{ label }}
+  </el-button>
+</template>
+
+<style scoped lang="scss">
+
+</style>
+<script>
+import {updateDeviceStatus} from "@/api/ems/site";
+
+export default {
+  props: {
+    size: {
+      type: String,
+      default: 'mini',
+      required: false
+    },
+    round: {
+      type: Boolean,
+      default: false,
+      required: false
+    },
+    type: {
+      type: String,
+      default: 'primary',
+      required: false
+    },
+    data: {
+      type: Object,
+      default: () => {
+        return {
+          workStatus: null,
+          deviceId: null,
+          deviceName: null,
+        }
+      },
+      required: true
+    }
+  },
+  computed: {
+    label() {
+      return this.data.workStatus === '0' ? '关机' : '开机'
+    }
+  },
+  methods: {
+    switchStatus() {
+      console.log(this.data, 11111111)
+      const {workStatus, deviceId, deviceName, siteId} = this.data
+      this.$confirm(`确认要${this.label}设备${deviceName || ''}吗?`, {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        showClose: false,
+        closeOnClickModal: false,
+        type: "warning",
+        beforeClose: (action, instance, done) => {
+          if (action === "confirm") {
+            instance.confirmButtonLoading = true;
+            //做开关机操作,更新成功后刷新表格
+            updateDeviceStatus({
+              siteId,
+              workStatus: workStatus === '0' ? "1" : '0',
+              deviceId
+            })
+                .then((response) => {
+                  response.code === 200 && done();
+                })
+                .finally(() => {
+                  instance.confirmButtonLoading = false;
+                });
+          } else {
+            done();
+          }
+        },
+      })
+          .then(() => {
+            //只有在废弃成功的情况下会走到这里
+            this.$message({
+              type: "success",
+              message: `${deviceName}${this.label}成功!`,
+            });
+            this.$emit('updateSuccess')
+            //调用接口 更新表格数据
+          })
+          .catch(() => {
+            //取消关机
+          });
+    }
+  }
+}
+
+</script>

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

@@ -1,5 +1,6 @@
 <!--电位展示图表-->
 <template>
+  <div>
     <el-dialog
         v-loading="loading"
         :close-on-click-modal="false"
@@ -9,24 +10,59 @@
         destroy-on-close
         lock-scroll
         show-close
-      title="点位清单"
-      width="800px"
+        :title="dataType === 'point' ? '点位清单' : '报警点位'"
+        width="950px"
     >
-
-    <el-form :inline="true" label-width="85px">
+      <el-form :inline="true" label-width="100px">
         <el-form-item label="点位名称">
-        <el-input v-model="form.dataPointName" clearable placeholder="请输入点位名称" style="width: 150px"></el-input>
+          <el-input
+              v-model="form.dataPointName"
+              clearable
+              placeholder="请输入点位名称"
+              style="width: 150px"
+          ></el-input>
         </el-form-item>
         <el-form-item label="点位">
-        <el-input v-model="form.dataPoint" clearable placeholder="请输入点位" style="width: 150px"></el-input>
+          <el-input
+              v-model="form.dataPoint"
+              clearable
+              placeholder="请输入点位"
+              style="width: 150px"
+          ></el-input>
         </el-form-item>
+        <!--        <el-form-item label="modbus ip">-->
+        <!--          <el-input-->
+        <!--            v-model="form.ipAddress"-->
+        <!--            clearable-->
+        <!--            placeholder="请输入ip"-->
+        <!--            style="width: 150px"-->
+        <!--          ></el-input>-->
+        <!--        </el-form-item>-->
         <br>
         <el-form-item label="最小值">
-        <el-input v-model="form.lower" clearable placeholder="请输入最小值" style="width: 150px"></el-input>
+          <el-input
+              v-model="form.lower"
+              clearable
+              placeholder="请输入最小值"
+              style="width: 150px"
+          ></el-input>
         </el-form-item>
         <el-form-item label="最大值">
-        <el-input v-model="form.upper" clearable placeholder="请输入最大值" style="width: 150px"></el-input>
+          <el-input
+              v-model="form.upper"
+              clearable
+              placeholder="请输入最大值"
+              style="width: 150px"
+          ></el-input>
         </el-form-item>
+        <!--        <el-form-item label="modbus 端口">-->
+        <!--          <el-input-->
+        <!--            v-model="form.ipPort"-->
+        <!--            clearable-->
+        <!--            placeholder="请输入端口"-->
+        <!--            style="width: 150px"-->
+        <!--          ></el-input>-->
+        <!--        </el-form-item>-->
         <el-form-item style="margin-left: 20px">
           <el-button type="primary" @click="search">搜索</el-button>
         </el-form-item>
@@ -37,23 +73,39 @@
           class="common-table"
           max-height="400px"
           stripe
-        style="width: 100%;"
-        :default-sort = "{prop: 'updateTime', order: 'descending'}"
-        @sort-change="changeSort">
-      <el-table-column
-          label="数据点位"
-          prop="dataPoint">
-      </el-table-column>
+          style="width: 100%"
+          :default-sort="defaultSort"
+          @sort-change="handleSortChange"
+      >
+        <el-table-column label="数据点位" prop="dataPoint"></el-table-column>
         <el-table-column
             label="数据点位名称"
-          prop="dataPointName">
-      </el-table-column>
+            prop="dataPointName"
+        ></el-table-column>
+        <!--        <el-table-column label="modbus地址">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <span>{{-->
+        <!--              `${scope.row.ipAddress || ""} ${scope.row.ipPort || ""}`-->
+        <!--            }}</span>-->
+        <!--          </template>-->
+        <!--        </el-table-column>
+        <el-table-column label="寄存器地址" prop="寄存器地址"></el-table-column>-->
         <el-table-column
             label="最新值"
-          prop="pointValue">
+            prop="pointValue"
+            align="right"
+            sortable="custom"
+        >
+          <template slot-scope="scope">
+            <span class="pointer" @click="showChart(scope.row)">{{
+                scope.row.pointValue
+              }}</span>
+          </template>
         </el-table-column>
+        <el-table-column label="单位" prop="dataUnit"></el-table-column>
         <el-table-column
             label="更新时间"
+            min-width="160px"
             prop="updateTime"
             sortable="custom"
         >
@@ -75,112 +127,171 @@
       >
       </el-pagination>
     </el-dialog>
+    <point-chart ref="pointChart" :site-id="siteId"/>
+  </div>
 </template>
 <script>
 import {getDevicePointList} from "@/api/ems/site";
+import pointChart from "@/views/ems/dzjk/sbjk/PointChart.vue";
 
 export default {
+  components: {pointChart},
   watch: {
     show(val) {
       if (!val) {
-        this.tableData = []
-        this.deviceId = ''
-        this.deviceName = ''
-        this.siteId = ''
-        this.pageSize = 10
-        this.pageNum = 1
-        this.totalSize = 0
+        this.tableData = [];
+        this.deviceId = "";
+        this.parentId = "";
+        this.siteId = "";
+        this.pageSize = 10;
+        this.pageNum = 1;
+        this.totalSize = 0;
+        this.dataType = '';
         this.form = {
-          sortMethod: 'desc',//升序不传或者asc、降序desc）
-          dataPointName: '',//点位名称
-          dataPoint: '',//点位名称
-          lower: '',//
-          upper: '',//
-        }
-        this.loading = false
+          sortMethod: "desc", //升序不传或者asc、降序desc）
+          sortData: this.defaultSort.prop,
+          dataPointName: "", //点位名称
+          dataPoint: "", //点位名称
+          lower: "", //
+          upper: "", //
+          // ipAddress: "",
+          // ipPort: "",
+        };
+        this.loading = false;
       }
     },
   },
+  computed: {
+    isDtdc() {
+      return this.deviceCategory === "BATTERY";
+    },
+  },
   data() {
     return {
+      // 默认排序
+      defaultSort: {prop: "updateTime", order: "descending"},
       show: false,
       loading: false,
+      dataType: '',//展示的数据类型 point点位/alarmPoint报警点位
       form: {
-        sortMethod: 'desc',//升序不传或者asc、降序desc）
-        dataPointName: '',//点位名称
-        dataPoint: '',//点位名称
-        lower: '',//
-        upper: '',//
+        sortData: "updateTime", //最新值升序不传或者asc、降序desc）
+        sortMethod: "desc", //升序不传或者asc、降序desc）
+        dataPointName: "", //点位名称
+        dataPoint: "", //点位名称
+        lower: "", //
+        upper: "", //
+        // ipAddress: "",
+        // ipPort: "",
       },
-      deviceCategory: '',
-      deviceName: '',
-      deviceId: '',
-      siteId: '',
+      deviceCategory: "",
+      deviceId: "",
+      parentId: "",
+      siteId: "",
       tableData: [],
       pageSize: 10, //分页栏当前每个数据总数
       pageNum: 1, //分页栏当前页数
       totalSize: 0, //table表格数据总数
-    }
+    };
   },
   methods: {
-    changeSort(c) {
-      console.log('切换排序方式', c)
-      if(c.prop === "updateTime" && c.order){
-        this.form.sortMethod = c.order === 'descending' ? 'desc' : 'asc'
-        this.getData()
+    showChart({pointName}) {
+      if (pointName) {
+        const {deviceCategory, deviceId} = this;
+        if (this.isDtdc)
+          this.$refs.pointChart.showChart({
+            pointName,
+            deviceCategory,
+            deviceId: this.parentId,
+            child: [deviceId],
+          });
+        else
+          this.$refs.pointChart.showChart({
+            pointName,
+            deviceCategory,
+            deviceId,
+          });
       }
     },
+    handleSortChange(column) {
+      this.form.sortData = column.prop;
+      this.form.sortMethod = column.order === "descending" ? "desc" : "asc";
+      console.log("切换排序方式", column, this.form);
+      this.getData()
+    },
     search() {
-      this.pageNum = 1
+      this.pageNum = 1;
       this.getData()
     },
-    showTable({deviceCategory, siteId, deviceId, deviceName}) {
-      this.deviceCategory = deviceCategory
-      this.siteId = siteId
-      this.deviceId = deviceId
-      this.deviceName = deviceName
-      this.show = true
-      this.getData()
-    },
-    getData() {
-      this.loading = true
-      const {
-        siteId,
-        deviceId,
-        deviceCategory,
-        pageNum,
-        pageSize,
-        form: {sortMethod, dataPointName, dataPoint, lower, upper}
-      } = this
-      getDevicePointList({
-        siteId,
-        deviceId,
-        deviceCategory,
-        pageNum,
-        pageSize,
-        sortMethod, dataPointName, dataPoint, lower, upper
-      }).then(response => {
-        this.tableData = response?.rows || [];
-        this.totalSize = response?.total || 0
-      }).finally(() => {
-        this.loading = false
-      })
-    },
     // 分页
     handleSizeChange(val) {
       this.pageSize = val;
       this.$nextTick(() => {
         this.getData()
-      })
+      });
     },
     handleCurrentChange(val) {
-      this.pageNum = val
+      this.pageNum = val;
       this.$nextTick(() => {
         this.getData()
-      })
+      });
     },
+    showTable({deviceCategory, siteId, deviceId, parentId = ""}, dataType) {
+      this.dataType = dataType;
+      this.deviceCategory = deviceCategory;
+      this.siteId = siteId;
+      this.deviceId = deviceId;
+      this.parentId = deviceCategory === "BATTERY" ? parentId : ""; //只有单体电池需要这个值
+      this.show = true;
+      this.getData()
+    },
+    getData() {
+      const {
+        siteId,
+        deviceId,
+        deviceCategory,
+        parentId,
+        pageNum,
+        pageSize,
+        form: {
+          sortData,
+          sortMethod,
+          dataPointName,
+          dataPoint,
+          lower,
+          upper,
+          // ipAddress,
+          // ipPort,
+        },
+      } = this;
+      const params = {
+        siteId,
+        deviceId,
+        deviceCategory,
+        parentId,
+        pageNum,
+        pageSize,
+        sortData,
+        sortMethod,
+        dataPointName,
+        dataPoint,
+        lower,
+        upper,
+        // ipAddress: '',
+        // ipPort: '',
       }
-}
+      params.isAlarm = this.dataType === 'point' ? 0 : 1
+      this.loading = true;
+      getDevicePointList(params)
+          .then((response) => {
+            this.tableData = response?.rows || [];
+            this.totalSize = response?.total || 0;
+          })
+          .finally(() => {
+            this.loading = false;
+          });
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
 ::v-deep {
@@ -188,5 +299,4 @@ export default {
     line-height: 40px;
   }
 }
-
 </style>

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

@@ -0,0 +1,80 @@
+<template>
+  <el-dialog :visible.sync="show" class="ems-dialog" title="点位上传" width="400px" append-to-body
+             :close-on-click-modal="false" :close-on-press-escape="false">
+    <!--    <file-upload :fileType='["xls", "xlsx"]' value="String" :limit="1" :drag="false"  @input="updateFile"/>-->
+    <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url"
+               :data="upload.data" :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">
+        <span>仅允许导入xls、xlsx格式文件。</span>
+        <!--        <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>-->
+      </div>
+    </el-upload>
+    <div slot="footer">
+      <el-button @click="handleClosed">取消</el-button>
+      <el-button type="primary" @click="submitFileForm">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<style scoped lang="scss">
+
+</style>
+<script>
+import {getToken} from "@/utils/auth"
+
+export default {
+  data() {
+    return {
+      show: false,
+      // 用户导入参数
+      upload: {
+        data: {},
+        // 是否禁用上传
+        isUploading: false,
+        // 设置上传的请求头部
+        headers: {Authorization: "Bearer " + getToken()},
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/ems/pointMatch/importDataByDevice"
+      },
+    }
+  },
+  methods: {
+    showDialog({siteId, deviceCategory, deviceId}) {
+      this.upload.data = {siteId, deviceCategory, deviceId}
+      this.show = true;
+    },
+    //关闭弹窗 重置数据
+    handleClosed() {
+      this.$refs.upload.clearFiles()//写在before-closed无效
+      this.upload.data = {}
+      this.show = false
+    },
+    // updateFile(data){
+    //   console.log('上传文件emit',data)
+    // },
+    // saveDialog(){
+    //  this.show=true
+    // },
+    // 文件上传中处理 返回参数event, file, fileList
+    handleFileUploadProgress() {
+      this.upload.isUploading = true
+    },
+    // 文件上传成功处理 返回参数response, file, fileList
+    handleFileSuccess(response) {
+      console.log('上传文件结果', response)
+      this.upload.isUploading = false
+      if (response.code === 500 && !response.msg) response.msg = '上传失败'
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + (response.msg || '上传成功') + "</div>", "导入结果", {dangerouslyUseHTMLString: true})
+      this.$emit('update')
+      this.handleClosed()
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit()
+    }
+  }
+}
+</script>

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

@@ -1,18 +1,57 @@
-
 <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="loading" loading-text="正在加载数据" @change="onSearch">
-            <el-option :label="item.siteName" :value="item.siteId" v-for="(item,index) in siteList" :key="index+'zdxeSelect'"></el-option>
+        <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
+              v-for="(item,index) in deviceCategoryList"
+              :key="index+'deviceCategorySelect'"
+              :label="item.name"
+              :value="item.code">
+          </el-option>
         </el-select>
       </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-button @click="onReset" native-type="button">重置</el-button>-->
       </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"
@@ -37,35 +76,65 @@
           label="设备名称">
       </el-table-column>
       <el-table-column
-        prop="deviceType"
-        label="设备类型">
+          prop="categoryName"
+          label="设备类别">
       </el-table-column>
       <el-table-column
-        prop="communicationStatus"
-        label="通信状态">
+          prop="deviceStatus"
+          label="在线状态">
         <template slot-scope="scope">
-          <span>{{$store.state.ems.communicationStatusOptions[scope.row.communicationStatus]}}</span>
+          <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="260">
+          width="250">
         <template slot-scope="scope">
           <el-button
-              @click="pointDetail(scope.row)"
+              @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;"
               type="warning"
               size="mini">
             编辑
           </el-button>
           <el-button
               type="danger"
+              style="margin-top:10px;"
               @click="deleteDevice(scope.row)"
               size="mini">
             删除
@@ -86,27 +155,36 @@
         style="margin-top:15px;text-align: center"
     >
     </el-pagination>
-    <el-dialog :visible.sync="dialogTableVisible" class="ems-dialog" title=" 详细信息" :close-on-click-modal="false" :before-close="handleClosed">
+    <el-dialog :visible.sync="dialogTableVisible" class="ems-dialog" title="详细信息" :close-on-click-modal="false"
+               :before-close="handleClosed">
       <div class="descriptions-main" style="padding: 0">
         <el-descriptions direction="vertical" :column="2" :colon="false" border>
-          <el-descriptions-item v-for="(item,index) in detailData" :key="index+'descriptions'" labelClassName="descriptions-label" contentClassName="descriptions-direction" :span="1" :label="item.label">{{item.value}}</el-descriptions-item>
+          <el-descriptions-item v-for="(item,index) in detailData" :key="index+'descriptions'"
+                                labelClassName="descriptions-label" contentClassName="descriptions-direction" :span="1"
+                                :label="item.label">{{ item.value }}
+          </el-descriptions-item>
         </el-descriptions>
       </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 {getDeviceInfoList,getDeviceDetailInfo,deleteService} from'@/api/ems/site'
+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},
+  components: {AddDevice, PointTable, PointUpload},
   data() {
     return {
       loading: false,
@@ -115,6 +193,8 @@ export default {
       editDeviceId: '',//编辑设备id
       siteId: '',
       siteList: [],
+      deviceCategory: '',//搜索栏设备类型
+      deviceCategoryList: [],//设备类别
       tableData: [],
       pageSize: 10,//分页栏当前每个数据总数
       pageNum: 1,//分页栏当前页数
@@ -144,9 +224,37 @@ export default {
     }
   },
   methods: {
+    // 获取设备类别
+    getDeviceCategoryList() {
+      getAllDeviceCategory().then(response => {
+        this.deviceCategoryList = response?.data || []
+      })
+    },
     // 查看设备电位表格
-    pointDetail(row){
-      this.$refs.pointTable.showTable(row)
+    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 = '';
@@ -196,7 +304,9 @@ export default {
       });
     },
     handleClosed(done) {
-      this.detailData.forEach((item)=>{item.value = ''})
+      this.detailData.forEach((item) => {
+        item.value = ''
+      })
       done()
     },
     toDetail(id) {
@@ -212,7 +322,9 @@ export default {
 
         })
         this.dialogTableVisible = true
-      }).finally(() => {this.loading = false})
+      }).finally(() => {
+        this.loading = false
+      })
 
     },
     // 分页
@@ -242,23 +354,33 @@ export default {
     // 获取数据
     getData() {
       this.loading = true
-      const {siteId,pageNum,pageSize} =this
-      getDeviceInfoList({siteId,pageNum,pageSize}).then(response => {
+      const {siteId, deviceCategory, pageNum, pageSize} = this
+      getDeviceInfoList({siteId, deviceCategory, pageNum, pageSize}).then(response => {
         this.tableData = response?.rows || [];
         this.totalSize = response?.total || 0
-      }).finally(() => {this.loading=false})
+      }).finally(() => {
+        this.loading = false
+      })
     },
     //获取站点列表
     getZdList() {
       this.searchLoading = true
-      getAllSites().then(response => {
+      return getAllSites().then(response => {
         this.siteList = response?.data || []
-      }).finally(() => {this.searchLoading=false})
+        if (this.siteList.length > 0) this.siteId = this.siteList[0].siteId
+      }).finally(() => {
+        this.searchLoading = false
+      })
     }
   },
   mounted() {
-    this.onReset()
-    this.getZdList()
+    this.loading = true
+    this.siteId = ''
+    this.pageNum = 1//每次搜索从1开始搜索
+    this.getDeviceCategoryList()
+    this.getZdList().then(() => {
+      this.getData()
+    })
   }
 }
 </script>

src/views/ems/ticket/AddTicket.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog v-loading="loading>0" :visible.sync="dialogTableVisible" class="ems-dialog" :title="mode === 'add'?'新增工单':`编辑工单` " :close-on-click-modal="false" :show-close="false">
+    <el-dialog v-loading="loading>0" :visible.sync="dialogTableVisible" class="ems-dialog" :title="mode === 'add'?'新增工单':`编辑工单`" :close-on-press-escape="false" :close-on-click-modal="false" :show-close="false">
       <el-form ref="addTempForm" :model="formData" :rules="rules" size="medium" label-width="120px">
         <el-form-item label="工单号" prop="ticketNo" v-if="mode !== 'add'">
           <el-input disabled v-model="formData.ticketNo" clearable :style="{width: '100%'}">
@@ -159,7 +159,7 @@ export default {
       this.$refs.addTempForm.validate(valid => {
         if (!valid) return
         this.loading+=1
-        const {title='',content='',status='',userId='',workUserId='',id='',expectedCompleteTime=''} = this.formData;
+        const {title='',content='',status='',userId='',workUserId='',id='',expectedCompleteTime='',ticketNo=''} = this.formData;
         if(this.mode === 'add'){
           addTicket({title,content,status,userId,workUserId,expectedCompleteTime}).then(response => {
             if(response.code === 200){
@@ -172,7 +172,7 @@ export default {
             this.loading-=1
           })
         }else{
-          updateTicket({title,content,status,userId,workUserId,id,expectedCompleteTime}).then(response => {
+          updateTicket({title,content,status,userId,workUserId,id,expectedCompleteTime,ticketNo}).then(response => {
             if(response.code === 200){
               //新增成功
               // 关闭弹窗 更新表格

src/views/login.vue

@@ -1,7 +1,18 @@
 <template>
   <div class="login">
-    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">{{title}}</h3>
+    <img :src="loginBg" alt="" srcset="" class="login-bg" />
+    <el-form
+      ref="loginForm"
+      :model="loginForm"
+      :rules="loginRules"
+      class="login-form"
+    >
+      <img
+        src="./../assets/images/ems/logo.png"
+        alt=""
+        srcset=""
+        class="login-logo"
+      />
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
@@ -9,7 +20,11 @@
           auto-complete="off"
           placeholder="账号"
         >
-          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+          <svg-icon
+            slot="prefix"
+            icon-class="user"
+            class="el-input__icon input-icon"
+          />
         </el-input>
       </el-form-item>
       <el-form-item prop="password">
@@ -20,7 +35,11 @@
           placeholder="密码"
           @keyup.enter.native="handleLogin"
         >
-          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+          <svg-icon
+            slot="prefix"
+            icon-class="password"
+            class="el-input__icon input-icon"
+          />
         </el-input>
       </el-form-item>
       <el-form-item prop="code" v-if="captchaEnabled">
@@ -31,152 +50,194 @@
           style="width: 63%"
           @keyup.enter.native="handleLogin"
         >
-          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+          <svg-icon
+            slot="prefix"
+            icon-class="validCode"
+            class="el-input__icon input-icon"
+          />
         </el-input>
         <div class="login-code">
           <img :src="codeUrl" @click="getCode" class="login-code-img" />
         </div>
       </el-form-item>
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
-      <el-form-item style="width:100%;">
+      <el-checkbox
+        v-model="loginForm.rememberMe"
+        style="margin: 0px 0px 25px 0px"
+        >记住密码</el-checkbox
+      >
+      <el-form-item style="width: 100%">
         <el-button
           :loading="loading"
           size="medium"
           type="primary"
-          style="width:100%;"
+          style="width: 100%"
           @click.native.prevent="handleLogin"
         >
           <span v-if="!loading">登 录</span>
           <span v-else>登 录 中...</span>
         </el-button>
-        <div style="float: right;" v-if="register">
-          <router-link class="link-type" :to="'/register'">立即注册</router-link>
+        <div style="float: right" v-if="register">
+          <router-link class="link-type" :to="'/register'"
+            >立即注册</router-link
+          >
         </div>
       </el-form-item>
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2025 上海电动工具研究所（集团）有限公司.</span>
+      <span>Copyright © 2025 上动新能源 版权所有</span>
     </div>
   </div>
 </template>
 
 <script>
-import { getCodeImg } from "@/api/login"
-import Cookies from "js-cookie"
-import { encrypt, decrypt } from '@/utils/jsencrypt'
+import { getCodeImg } from "@/api/login";
+import Cookies from "js-cookie";
+import { encrypt, decrypt } from "@/utils/jsencrypt";
+import intervalUpdate from "@/mixins/ems/intervalUpdate";
 
 export default {
   name: "Login",
+  mixins: [intervalUpdate],
+  computed: {
+    loginBg() {
+      return require(`./../assets/images/ems/loginBg/${this.bgNum}.png`);
+    },
+  },
   data() {
     return {
-      title: process.env.VUE_APP_TITLE,
+      bgNum: 1,
       codeUrl: "",
       loginForm: {
         username: "admin",
         password: "admin123",
         rememberMe: false,
         code: "",
-        uuid: ""
+        uuid: "",
       },
       loginRules: {
         username: [
-          { required: true, trigger: "blur", message: "请输入您的账号" }
+          { required: true, trigger: "blur", message: "请输入您的账号" },
         ],
         password: [
-          { required: true, trigger: "blur", message: "请输入您的密码" }
+          { required: true, trigger: "blur", message: "请输入您的密码" },
         ],
-        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
+        code: [{ required: true, trigger: "change", message: "请输入验证码" }],
       },
       loading: false,
       // 验证码开关
       captchaEnabled: true,
       // 注册开关
       register: false,
-      redirect: undefined
-    }
+      redirect: undefined,
+    };
   },
   watch: {
     $route: {
       handler: function (route) {
-        this.redirect = route.query && route.query.redirect
+        this.redirect = route.query && route.query.redirect;
+      },
+      immediate: true,
     },
-      immediate: true
-    }
   },
   created() {
-    this.getCode()
-    this.getCookie()
+    this.getCode();
+    this.getCookie();
+  },
+  mounted() {
+    this.updateInterval(this.updateBgNum, 5000);
   },
   methods: {
+    updateBgNum() {
+      if (this.bgNum >= 4) this.bgNum = 0;
+      this.bgNum += 1;
+    },
     getCode() {
-      getCodeImg().then(res => {
-        this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled
+      getCodeImg().then((res) => {
+        this.captchaEnabled =
+          res.captchaEnabled === undefined ? true : res.captchaEnabled;
         if (this.captchaEnabled) {
-          this.codeUrl = "data:image/gif;base64," + res.img
-          this.loginForm.uuid = res.uuid
+          this.codeUrl = "data:image/gif;base64," + res.img;
+          this.loginForm.uuid = res.uuid;
         }
-      })
+      });
     },
     getCookie() {
-      const username = Cookies.get("username")
-      const password = Cookies.get("password")
-      const rememberMe = Cookies.get('rememberMe')
+      const username = Cookies.get("username");
+      const password = Cookies.get("password");
+      const rememberMe = Cookies.get("rememberMe");
       this.loginForm = {
         username: username === undefined ? this.loginForm.username : username,
-        password: password === undefined ? this.loginForm.password : decrypt(password),
-        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
-      }
+        password:
+          password === undefined ? this.loginForm.password : decrypt(password),
+        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
+      };
     },
     handleLogin() {
-      this.$refs.loginForm.validate(valid => {
+      this.$refs.loginForm.validate((valid) => {
         if (valid) {
-          this.loading = true
+          this.loading = true;
           if (this.loginForm.rememberMe) {
-            Cookies.set("username", this.loginForm.username, { expires: 30 })
-            Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 })
-            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 })
+            Cookies.set("username", this.loginForm.username, { expires: 30 });
+            Cookies.set("password", encrypt(this.loginForm.password), {
+              expires: 30,
+            });
+            Cookies.set("rememberMe", this.loginForm.rememberMe, {
+              expires: 30,
+            });
           } else {
-            Cookies.remove("username")
-            Cookies.remove("password")
-            Cookies.remove('rememberMe')
+            Cookies.remove("username");
+            Cookies.remove("password");
+            Cookies.remove("rememberMe");
           }
-          this.$store.dispatch("Login", this.loginForm).then(() => {
-            this.$router.push({ path: this.redirect || "/" }).catch(()=>{})
-          }).catch(() => {
-            this.loading = false
+          this.$store
+            .dispatch("Login", this.loginForm)
+            .then(() => {
+              this.$router.push({ path: this.redirect || "/" }).catch(() => {});
+            })
+            .catch(() => {
+              this.loading = false;
               if (this.captchaEnabled) {
-              this.getCode()
-            }
-          })
-        }
-      })
-    }
+                this.getCode();
               }
+            });
         }
+      });
+    },
+  },
+};
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
 .login {
+  padding-left: 180px;
   display: flex;
-  justify-content: center;
+  justify-content: left;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/ems/login-background.png");
-  background-size: cover;
 }
-.title {
-  margin: 0px auto 30px auto;
-  text-align: center;
-  color: #707070;
+.login-bg {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 1;
+  display: block;
+  height: 100%;
+  width: 100%;
+}
+.login-logo {
+  display: block;
+  width: 70%;
+  height: auto;
+  margin: 0 auto;
 }
 
 .login-form {
   border-radius: 6px;
   background: #ffffff;
   width: 400px;
-  padding: 25px 25px 5px 25px;
-  z-index: 1;
+  padding: 0 25px 5px 25px;
+  z-index: 2;
   .el-input {
     height: 38px;
     input {
@@ -204,6 +265,8 @@ export default {
   }
 }
 .el-login-footer {
+  margin-left: -180px;
+  z-index:2;
   height: 40px;
   line-height: 40px;
   position: fixed;

src/views/register.vue

@@ -1,10 +1,30 @@
 <template>
   <div class="register">
-    <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">{{title}}</h3>
+    <img :src="loginBg" alt="" srcset="" class="login-bg" />
+    <el-form
+      ref="registerForm"
+      :model="registerForm"
+      :rules="registerRules"
+      class="register-form"
+    >
+      <img
+        src="./../assets/images/ems/logo.png"
+        alt=""
+        srcset=""
+        class="login-logo"
+      />
       <el-form-item prop="username">
-        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
-          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+        <el-input
+          v-model="registerForm.username"
+          type="text"
+          auto-complete="off"
+          placeholder="账号"
+        >
+          <svg-icon
+            slot="prefix"
+            icon-class="user"
+            class="el-input__icon input-icon"
+          />
         </el-input>
       </el-form-item>
       <el-form-item prop="password">
@@ -15,7 +35,11 @@
           placeholder="密码"
           @keyup.enter.native="handleRegister"
         >
-          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+          <svg-icon
+            slot="prefix"
+            icon-class="password"
+            class="el-input__icon input-icon"
+          />
         </el-input>
       </el-form-item>
       <el-form-item prop="confirmPassword">
@@ -26,7 +50,11 @@
           placeholder="确认密码"
           @keyup.enter.native="handleRegister"
         >
-          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+          <svg-icon
+            slot="prefix"
+            icon-class="password"
+            class="el-input__icon input-icon"
+          />
         </el-input>
       </el-form-item>
       <el-form-item prop="code" v-if="captchaEnabled">
@@ -37,136 +65,190 @@
           style="width: 63%"
           @keyup.enter.native="handleRegister"
         >
-          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+          <svg-icon
+            slot="prefix"
+            icon-class="validCode"
+            class="el-input__icon input-icon"
+          />
         </el-input>
         <div class="register-code">
           <img :src="codeUrl" @click="getCode" class="register-code-img" />
         </div>
       </el-form-item>
-      <el-form-item style="width:100%;">
+      <el-form-item style="width: 100%">
         <el-button
           :loading="loading"
           size="medium"
           type="primary"
-          style="width:100%;"
+          style="width: 100%"
           @click.native.prevent="handleRegister"
         >
           <span v-if="!loading">注 册</span>
           <span v-else>注 册 中...</span>
         </el-button>
-        <div style="float: right;">
-          <router-link class="link-type" :to="'/login'">使用已有账户登录</router-link>
+        <div style="float: right">
+          <router-link class="link-type" :to="'/login'"
+            >使用已有账户登录</router-link
+          >
         </div>
       </el-form-item>
     </el-form>
     <!--  底部  -->
     <div class="el-register-footer">
-      <span>Copyright © 2018-2025 上海电动工具研究所（集团）有限公司.</span>
+      <span>Copyright © 2025 上动新能源 版权所有</span>
     </div>
   </div>
 </template>
 
 <script>
-import { getCodeImg, register } from "@/api/login"
+import { getCodeImg, register } from "@/api/login";
+import intervalUpdate from "@/mixins/ems/intervalUpdate";
 
 export default {
   name: "Register",
+  mixins: [intervalUpdate],
+  computed: {
+    loginBg() {
+      return require(`./../assets/images/ems/loginBg/${this.bgNum}.png`);
+    },
+  },
   data() {
     const equalToPassword = (rule, value, callback) => {
       if (this.registerForm.password !== value) {
-        callback(new Error("两次输入的密码不一致"))
+        callback(new Error("两次输入的密码不一致"));
       } else {
-        callback()
-      }
+        callback();
       }
+    };
     return {
-      title: process.env.VUE_APP_TITLE,
+      bgNum: 1,
       codeUrl: "",
       registerForm: {
         username: "",
         password: "",
         confirmPassword: "",
         code: "",
-        uuid: ""
+        uuid: "",
       },
       registerRules: {
         username: [
           { required: true, trigger: "blur", message: "请输入您的账号" },
-          { min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur' }
+          {
+            min: 2,
+            max: 20,
+            message: "用户账号长度必须介于 2 和 20 之间",
+            trigger: "blur",
+          },
         ],
         password: [
           { required: true, trigger: "blur", message: "请输入您的密码" },
-          { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" },
-          { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
+          {
+            min: 5,
+            max: 20,
+            message: "用户密码长度必须介于 5 和 20 之间",
+            trigger: "blur",
+          },
+          {
+            pattern: /^[^<>"'|\\]+$/,
+            message: "不能包含非法字符：< > \" ' \\\ |",
+            trigger: "blur",
+          },
         ],
         confirmPassword: [
           { required: true, trigger: "blur", message: "请再次输入您的密码" },
-          { required: true, validator: equalToPassword, trigger: "blur" }
+          { required: true, validator: equalToPassword, trigger: "blur" },
         ],
-        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
+        code: [{ required: true, trigger: "change", message: "请输入验证码" }],
       },
       loading: false,
-      captchaEnabled: true
-    }
+      captchaEnabled: true,
+    };
   },
   created() {
-    this.getCode()
+    this.getCode();
+  },
+  mounted() {
+    this.updateInterval(this.updateBgNum, 5000);
   },
   methods: {
+    updateBgNum() {
+      if (this.bgNum >= 4) this.bgNum = 0;
+      this.bgNum += 1;
+    },
     getCode() {
-      getCodeImg().then(res => {
-        this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled
+      getCodeImg().then((res) => {
+        this.captchaEnabled =
+          res.captchaEnabled === undefined ? true : res.captchaEnabled;
         if (this.captchaEnabled) {
-          this.codeUrl = "data:image/gif;base64," + res.img
-          this.registerForm.uuid = res.uuid
+          this.codeUrl = "data:image/gif;base64," + res.img;
+          this.registerForm.uuid = res.uuid;
         }
-      })
+      });
     },
     handleRegister() {
-      this.$refs.registerForm.validate(valid => {
+      this.$refs.registerForm.validate((valid) => {
         if (valid) {
-          this.loading = true
-          register(this.registerForm).then(res => {
-            const username = this.registerForm.username
-            this.$alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功！</font>", '系统提示', {
+          this.loading = true;
+          register(this.registerForm)
+            .then((res) => {
+              const username = this.registerForm.username;
+              this.$alert(
+                "<font color='red'>恭喜你，您的账号 " +
+                  username +
+                  " 注册成功！</font>",
+                "系统提示",
+                {
                   dangerouslyUseHTMLString: true,
-              type: 'success'
-            }).then(() => {
-              this.$router.push("/login")
-            }).catch(() => {})
-          }).catch(() => {
-            this.loading = false
+                  type: "success",
+                }
+              )
+                .then(() => {
+                  this.$router.push("/login");
+                })
+                .catch(() => {});
+            })
+            .catch(() => {
+              this.loading = false;
               if (this.captchaEnabled) {
-              this.getCode()
-            }
-          })
-        }
-      })
-    }
+                this.getCode();
               }
+            });
         }
+      });
+    },
+  },
+};
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
 .register {
+  padding-left: 180px;
   display: flex;
-  justify-content: center;
+  justify-content: left;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/ems/login-background.png");
-  background-size: cover;
 }
-.title {
-  margin: 0px auto 30px auto;
-  text-align: center;
-  color: #707070;
+.login-bg {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 1;
+  display: block;
+  height: 100%;
+  width: 100%;
+}
+.login-logo {
+  display: block;
+  width: 70%;
+  height: auto;
+  margin: 0 auto;
 }
-
 .register-form {
+  z-index: 2;
   border-radius: 6px;
   background: #ffffff;
   width: 400px;
-  padding: 25px 25px 5px 25px;
+  padding: 0 25px 5px 25px;
   .el-input {
     height: 38px;
     input {
@@ -194,6 +276,8 @@ export default {
   }
 }
 .el-register-footer {
+  margin-left: -180px;
+  z-index:2;
   height: 40px;
   line-height: 40px;
   position: fixed;

src/views/screen/index.vue

@@ -0,0 +1,418 @@
+<template>
+  <div class="big-screen-container">
+    <!-- 背景容器 -->
+    <div class="bg-wrapper">
+      <!-- 右侧功率曲线图表 -->
+      <div class="chart-box power-chart">
+        <div ref="powerChart" class="chart-content"></div>
+      </div>
+
+      <!-- 底部中间电力需求曲线图表（width:980px, bottom:26px） -->
+      <div class="chart-box demand-chart">
+        <div ref="demandChart" class="chart-content"></div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import * as echarts from 'echarts'
+import { getPointData } from '@/api/ems/dzjk'
+
+export default {
+  name: 'PowerCurveScreen',
+  data() {
+    return {
+      powerChartInstance: null, // 功率曲线实例
+      demandChartInstance: null, // 电力需求曲线实例
+      timer: null,
+      siteId: '021_DDS_01',
+    }
+  },
+  mounted() {
+    this.initPowerChart() // 初始化功率曲线
+    this.initDemandChart() // 初始化电力需求曲线
+    
+    // Initial fetch
+    this.fetchData()
+    // Polling every 5 seconds
+    this.timer = setInterval(() => {
+      this.fetchData()
+    }, 5000)
+
+    window.addEventListener('resize', this.resizeAllCharts)
+  },
+  beforeDestroy() {
+    if (this.timer) {
+      clearInterval(this.timer)
+      this.timer = null
+    }
+    // 销毁两个图表实例
+    if (this.powerChartInstance) {
+      this.powerChartInstance.dispose()
+      this.powerChartInstance = null
+    }
+    if (this.demandChartInstance) {
+      this.demandChartInstance.dispose()
+      this.demandChartInstance = null
+    }
+    window.removeEventListener('resize', this.resizeAllCharts)
+  },
+  methods: {
+    getTodayDate() {
+      const now = new Date()
+      const year = now.getFullYear()
+      const month = String(now.getMonth() + 1).padStart(2, '0')
+      const day = String(now.getDate()).padStart(2, '0')
+      return `${year}-${month}-${day}`
+    },
+    fetchData() {
+      const today = this.getTodayDate()
+      getPointData({
+        siteId: this.siteId,
+        startDate: today,
+        endDate: today
+      }).then(response => {
+        if (response.code === 200 && response.data) {
+          this.updateCharts(response.data)
+        }
+      }).catch(error => {
+        console.error('Failed to fetch point data:', error)
+      })
+    },
+    updateCharts(data) {
+      if (!data || !Array.isArray(data)) return
+      const source = [['日期', '电网功率', '负载功率', '储能功率', '光伏功率']];
+      const demandSource = [['日期', '电网功率', '负载功率']]
+
+      data.forEach(item => {
+        source.push([
+          item.statisDate,
+          item.gridPower,
+          item.loadPower,
+          item.storagePower,
+          item.pvPower
+        ]);
+        demandSource.push([
+          item.statisDate,
+          item.gridPower,  // Mapping Grid Power to Plan Demand (or just as 2nd series)
+          item.loadPower, // Mapping Load Power to Actual Demand
+        ])
+      })
+
+      if (this.powerChartInstance) {
+        this.powerChartInstance.setOption({
+          dataset: {
+            source: source
+          }
+        })
+      }
+
+      if (this.demandChartInstance) {
+        this.demandChartInstance.setOption({
+          dataset: {
+            source: demandSource
+          }
+        })
+      }
+    },
+    // 初始化右侧功率曲线
+    initPowerChart() {
+      this.powerChartInstance = echarts.init(this.$refs.powerChart)
+      
+      const option = {
+        backgroundColor: 'transparent',
+        tooltip: {
+          trigger: 'axis',
+          confine: true,
+          backgroundColor: 'rgba(0, 30, 60, 0.9)',
+          borderColor: '#00ccff',
+          textStyle: { color: '#fff' },
+          axisPointer: { 
+            type: 'line',
+            lineStyle: {
+              color: 'rgba(0, 204, 255, 0.5)',
+              type: 'dashed'
+            }
+          }
+        },
+        legend: {
+          textStyle: { color: '#00ccff', fontSize: 10 },
+          bottom: 0,
+          left: 'center',
+          itemWidth: 9,
+          itemHeight: 9,
+          itemGap: 8,
+          padding: [0, 0, 0, 0]
+        },
+        grid: {
+          left: '2%',
+          right: '2%',
+          top: '15%',
+          bottom: '12%',
+          containLabel: true
+        },
+        dataset: {
+          source: [] // Initial empty source
+        },
+        xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          axisLabel: { 
+            color: '#00ccff', 
+            fontSize: 10, 
+            rotate: 0, // 取消旋转，因为标签较少
+            margin: 10,
+          },
+          axisLine: { 
+            show: true,
+            lineStyle: { color: '#006699', width: 1.5 } 
+          },
+          splitLine: { show: false },
+          axisTick: { show: true }
+        },
+        yAxis: {
+          type: 'value',
+          min: 0, // Remove fixed min/max to let it auto-scale
+          max: 350,
+          interval: 50,
+          axisLabel: { 
+            color: '#00ccff', 
+            fontSize: 12,
+            margin: 10,
+            fontWeight: 'bold'
+          },
+          axisLine: { 
+            show: false,
+            lineStyle: { color: '#006699', width: 1.5 } 
+          },
+          splitLine: { lineStyle: { color: 'rgba(0, 100, 150, 0.2)' } },
+          axisTick: { show: false }
+        },
+        series: [
+          {
+            // name: '电网功率', // Removed, auto-matched from dataset header
+            type: 'line',
+            // data: [], // Removed
+            smooth: true,
+            symbol: 'none',
+            lineStyle: { color: '#0099ff', width: 2 },
+            areaStyle: {
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 0, color: 'rgba(0, 153, 255, 0.4)' },
+                { offset: 1, color: 'rgba(0, 153, 255, 0.05)' }
+              ])
+            }
+          },
+          {
+            // name: '负载功率',
+            type: 'line',
+            // data: [],
+            smooth: true,
+            symbol: 'none',
+            lineStyle: { color: '#00cc66', width: 2 },
+            areaStyle: {
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 0, color: 'rgba(0, 204, 102, 0.4)' },
+                { offset: 1, color: 'rgba(0, 204, 102, 0.05)' }
+              ])
+            }
+          },
+          {
+            // name: '储能功率',
+            type: 'line',
+            // data: [],
+            smooth: true,
+            symbol: 'none',
+            lineStyle: { color: '#ffcc00', width: 2 },
+            areaStyle: {
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 0, color: 'rgba(255, 204, 0, 0.4)' },
+                { offset: 1, color: 'rgba(255, 204, 0, 0.05)' }
+              ])
+            }
+          },
+          {
+            // name: '光伏功率',
+            type: 'line',
+            // data: [],
+            smooth: true,
+            symbol: 'none',
+            lineStyle: { color: '#ff3333', width: 2 },
+            areaStyle: {
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 0, color: 'rgba(255, 51, 51, 0.4)' },
+                { offset: 1, color: 'rgba(255, 51, 51, 0.05)' }
+              ])
+            }
+          }
+        ]
+      }
+      this.powerChartInstance.setOption(option)
+    },
+
+    // 初始化底部中间电力需求曲线（适配980px宽度+130px高度+bottom:26px，两条曲线区分配色）
+    initDemandChart() {
+      this.demandChartInstance = echarts.init(this.$refs.demandChart)
+      
+      const option = {
+        backgroundColor: 'transparent', // 透明背景
+        tooltip: {
+          trigger: 'axis',
+          backgroundColor: 'rgba(0, 30, 60, 0.9)',
+          borderColor: '#00ccff', // 匹配图片主色
+          textStyle: { color: '#fff' },
+          axisPointer: { type: 'shadow' },
+          confine: true,
+        },
+        grid: {
+          left: '2%',
+          right: '2%',
+          top: '5%',
+          bottom: '8%',
+          containLabel: true
+        },
+        dataset: {
+          source: [] // Initial empty
+        },
+        xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          // data: [], // Handled by dataset
+          axisLabel: { 
+            color: '#00ccff', // 匹配图片主色
+            fontSize: 10,
+            margin: 10,
+          },
+          axisLine: { 
+            show: true,
+            lineStyle: { color: '#006699', width: 1.5 } 
+          },
+          splitLine: { show: false },
+          axisTick: { show: true }
+        },
+        yAxis: {
+          type: 'value',
+          min: 0,
+          max: 300,
+          interval: 50,
+          axisLabel: { 
+            color: '#00ccff', // 匹配图片主色
+            fontSize: 12,
+            margin: 10,
+            fontWeight: 'bold'
+          },
+          axisLine: { 
+            show: false,
+            // lineStyle: { color: '#006699', width: 1.5 } 
+          },
+          splitLine: { lineStyle: { color: 'rgba(0, 100, 150, 0.2)' } },
+          axisTick: { show: false }
+        },
+        series: [
+                    {
+            type: 'line',
+            // data: [],
+            smooth: true, // 平滑曲线
+            symbol: 'none', // 无数据点
+            // lineStyle: { color: '#00F2FF', width: 2.5 }, // 匹配图片主题色
+            // areaStyle: {
+            //   // 匹配图片的线性渐变：#00F2FF 从100%不透明到0%不透明
+            //   color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+            //     { offset: 0, color: 'rgba(0, 242, 255, 1)' },    // 0%位置：#00F2FF 100%不透明
+            //     { offset: 1, color: 'rgba(0, 242, 255, 0)' }     // 100%位置：#00F2FF 0%不透明
+            //   ])
+            // }
+                        lineStyle: { color: '#0099ff', width: 2 },
+            areaStyle: {
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 0, color: 'rgba(0, 153, 255, 0.4)' },
+                { offset: 1, color: 'rgba(0, 153, 255, 0.05)' }
+              ])
+            }
+          },
+          {
+            // name: '负载功率',
+            type: 'line',
+            // data: [],
+            smooth: true,
+            symbol: 'none',
+            lineStyle: { color: '#00cc66', width: 2 },
+            areaStyle: {
+              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 0, color: 'rgba(0, 204, 102, 0.4)' },
+                { offset: 1, color: 'rgba(0, 204, 102, 0.05)' }
+              ])
+            }
+          },
+        ]
+      }
+      this.demandChartInstance.setOption(option)
+    },
+
+    // 统一处理窗口缩放（适配两个图表）
+    resizeAllCharts() {
+      if (this.powerChartInstance) this.powerChartInstance.resize()
+      if (this.demandChartInstance) this.demandChartInstance.resize()
+    }
+  }
+}
+</script>
+
+<style scoped>
+/* 大屏容器：固定1920x1080尺寸 */
+.big-screen-container {
+  width: 1920px;
+  height: 1080px;
+  margin: 0;
+  padding: 0;
+  overflow: hidden;
+  position: relative;
+}
+
+/* 背景容器：相对路径 ./background.png */
+.bg-wrapper {
+  width: 100%;
+  height: 100%;
+  background-image: url("./background.png");
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+  position: relative;
+}
+
+/* 通用图表容器样式 */
+.chart-box {
+  background-color: transparent;
+  padding: 0;
+  border: none;
+  box-shadow: none;
+  border-radius: 0;
+  z-index: 10;
+}
+
+/* 右侧功率曲线图表定位+尺寸 */
+.power-chart {
+  position: absolute;
+  top: 143px;
+  right: 40px;
+  width: 380px;
+  height: 270px;
+}
+
+/* 底部中间电力需求曲线图表（核心修改：width:980px, bottom:26px, height:130px） */
+.demand-chart {
+  position: absolute;
+  bottom: 26px;    /* 修改为26px底部间距 */
+  left: 50%;
+  transform: translateX(-50%);
+  width: 980px;    /* 修改为980px宽度 */
+  height: 130px;   /* 保持130px高度不变 */
+}
+
+/* 图表内容区：填满容器 */
+.chart-content {
+  width: 100%;
+  height: 100%;
+}
+</style>

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,19 +48,29 @@
 
             <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>
@@ -59,13 +78,18 @@
             <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
               <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="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-              <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :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="userName" prop="userName" v-if="columns[1].visible"
+                               :show-overflow-tooltip="true"/>
+              <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
+                               :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-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-edit" @click="handleUpdate(scope.row)"
+                             v-hasPermi="['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="handleAuthRole" icon="el-icon-circle-check" v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
+                      <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
+                                        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>
@@ -105,7 +139,8 @@
           </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>
@@ -129,7 +164,8 @@
           </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,11 +264,21 @@
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user"
+import {
+  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 {
@@ -228,6 +301,8 @@ export default {
       total: 0,
       // 用户表格数据
       userList: null,
+      // 站点列表数据
+      siteList: [],
       // 弹出层标题
       title: "",
       // 所有部门树选项
@@ -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,6 +408,29 @@ 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
@@ -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
@@ -479,7 +581,8 @@ export default {
         resetUserPwd(row.userId, value).then(response => {
           this.$modal.msgSuccess("修改成功，新密码是：" + value)
         })
-        }).catch(() => {})
+      }).catch(() => {
+      })
     },
     /** 分配角色操作 */
     handleAuthRole: function (row) {
@@ -491,13 +594,13 @@ export default {
       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()
@@ -514,7 +617,8 @@ export default {
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess("删除成功")
-      }).catch(() => {})
+      }).catch(() => {
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -529,8 +633,7 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-      this.download('system/user/importTemplate', {
-      }, `user_template_${new Date().getTime()}.xlsx`)
+      this.download('system/user/importTemplate', {}, `user_template_${new Date().getTime()}.xlsx`)
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {

src/views/tool/build/index.vue

@@ -2,9 +2,7 @@
   <div class="container">
     <div class="left-board">
       <div class="logo-wrapper">
-        <div class="logo">
-          <img :src="logo" alt="logo"> Form Generator
-        </div>
+        <div class="logo"><img :src="logo" alt="logo" /> Form Generator</div>
       </div>
       <el-scrollbar class="left-scrollbar">
         <div class="components-list">
@@ -21,7 +19,9 @@
             @end="onEnd"
           >
             <div
-              v-for="(element, index) in inputComponents" :key="index" class="components-item"
+              v-for="(element, index) in inputComponents"
+              :key="index"
+              class="components-item"
               @click="addComponent(element)"
             >
               <div class="components-body">
@@ -58,12 +58,18 @@
             <svg-icon icon-class="component" /> 布局型组件
           </div>
           <draggable
-            class="components-draggable" :list="layoutComponents"
-            :group="{ name: 'componentsGroup', pull: 'clone', put: false }" :clone="cloneComponent"
-            draggable=".components-item" :sort="false" @end="onEnd"
+            class="components-draggable"
+            :list="layoutComponents"
+            :group="{ name: 'componentsGroup', pull: 'clone', put: false }"
+            :clone="cloneComponent"
+            draggable=".components-item"
+            :sort="false"
+            @end="onEnd"
           >
             <div
-              v-for="(element, index) in layoutComponents" :key="index" class="components-item"
+              v-for="(element, index) in layoutComponents"
+              :key="index"
+              class="components-item"
               @click="addComponent(element)"
             >
               <div class="components-body">
@@ -81,10 +87,20 @@
         <el-button icon="el-icon-download" type="text" @click="download">
           导出vue文件
         </el-button>
-        <el-button class="copy-btn-main" icon="el-icon-document-copy" type="text" @click="copy">
+        <el-button
+          class="copy-btn-main"
+          icon="el-icon-document-copy"
+          type="text"
+          @click="copy"
+        >
           复制代码
         </el-button>
-        <el-button class="delete-btn" icon="el-icon-delete" type="text" @click="empty">
+        <el-button
+          class="delete-btn"
+          icon="el-icon-delete"
+          type="text"
+          @click="empty"
+        >
           清空
         </el-button>
       </div>
@@ -96,7 +112,12 @@
             :disabled="formConf.disabled"
             :label-width="formConf.labelWidth + 'px'"
           >
-            <draggable class="drawing-board" :list="drawingList" :animation="340" group="componentsGroup">
+            <draggable
+              class="drawing-board"
+              :list="drawingList"
+              :animation="340"
+              group="componentsGroup"
+            >
               <draggable-item
                 v-for="(element, index) in drawingList"
                 :key="element.renderKey"
@@ -131,28 +152,38 @@
       :show-file-name="showFileName"
       @confirm="generate"
     />
-    <input id="copyNode" type="hidden">
+    <input id="copyNode" type="hidden" />
   </div>
 </template>
 
 <script>
-import draggable from 'vuedraggable'
-import beautifier from 'js-beautify'
-import ClipboardJS from 'clipboard'
-import render from '@/utils/generator/render'
-import RightPanel from './RightPanel'
-import { inputComponents, selectComponents, layoutComponents, formConf } from '@/utils/generator/config'
-import { beautifierConf, titleCase } from '@/utils/index'
-import { makeUpHtml, vueTemplate, vueScript, cssStyle } from '@/utils/generator/html'
-import { makeUpJs } from '@/utils/generator/js'
-import { makeUpCss } from '@/utils/generator/css'
-import drawingDefault from '@/utils/generator/drawingDefault'
-import logo from '@/assets/logo/logo.png'
-import CodeTypeDialog from './CodeTypeDialog'
-import DraggableItem from './DraggableItem'
+import draggable from "vuedraggable";
+import beautifier from "js-beautify";
+import ClipboardJS from "clipboard";
+import render from "@/utils/generator/render";
+import RightPanel from "./RightPanel";
+import {
+  inputComponents,
+  selectComponents,
+  layoutComponents,
+  formConf,
+} from "@/utils/generator/config";
+import { beautifierConf, titleCase } from "@/utils/index";
+import {
+  makeUpHtml,
+  vueTemplate,
+  vueScript,
+  cssStyle,
+} from "@/utils/generator/html";
+import { makeUpJs } from "@/utils/generator/js";
+import { makeUpCss } from "@/utils/generator/css";
+import drawingDefault from "@/utils/generator/drawingDefault";
+import logo from "@/assets/images/ems/logo-icon.png";
+import CodeTypeDialog from "./CodeTypeDialog";
+import DraggableItem from "./DraggableItem";
 
-let oldActiveId
-let tempActiveData
+let oldActiveId;
+let tempActiveData;
 
 export default {
   components: {
@@ -160,7 +191,7 @@ export default {
     render,
     RightPanel,
     CodeTypeDialog,
-    DraggableItem
+    DraggableItem,
   },
   data() {
     return {
@@ -179,197 +210,203 @@ export default {
       dialogVisible: false,
       generateConf: null,
       showFileName: false,
-      activeData: drawingDefault[0]
-    }
+      activeData: drawingDefault[0],
+    };
   },
   created() {
     // 防止 firefox 下 拖拽 会新打卡一个选项卡
-    document.body.ondrop = event => {
-      event.preventDefault()
-      event.stopPropagation()
-    }
+    document.body.ondrop = (event) => {
+      event.preventDefault();
+      event.stopPropagation();
+    };
   },
   watch: {
-    'activeData.label': function (val, oldVal) {
+    "activeData.label": function (val, oldVal) {
       if (
-        this.activeData.placeholder === undefined
-        || !this.activeData.tag
-        || oldActiveId !== this.activeId
+        this.activeData.placeholder === undefined ||
+        !this.activeData.tag ||
+        oldActiveId !== this.activeId
       ) {
-        return
+        return;
       }
-      this.activeData.placeholder = this.activeData.placeholder.replace(oldVal, '') + val
+      this.activeData.placeholder =
+        this.activeData.placeholder.replace(oldVal, "") + val;
     },
     activeId: {
       handler(val) {
-        oldActiveId = val
+        oldActiveId = val;
+      },
+      immediate: true,
     },
-      immediate: true
-    }
   },
   mounted() {
-    const clipboard = new ClipboardJS('#copyNode', {
-      text: trigger => {
-        const codeStr = this.generateCode()
+    const clipboard = new ClipboardJS("#copyNode", {
+      text: (trigger) => {
+        const codeStr = this.generateCode();
         this.$notify({
-          title: '成功',
-          message: '代码已复制到剪切板，可粘贴。',
-          type: 'success'
-        })
-        return codeStr
-      }
-    })
-    clipboard.on('error', e => {
-      this.$message.error('代码复制失败')
-    })
+          title: "成功",
+          message: "代码已复制到剪切板，可粘贴。",
+          type: "success",
+        });
+        return codeStr;
+      },
+    });
+    clipboard.on("error", (e) => {
+      this.$message.error("代码复制失败");
+    });
   },
   methods: {
     activeFormItem(element) {
-      this.activeData = element
-      this.activeId = element.formId
+      this.activeData = element;
+      this.activeId = element.formId;
     },
     onEnd(obj, a) {
       if (obj.from !== obj.to) {
-        this.activeData = tempActiveData
-        this.activeId = this.idGlobal
+        this.activeData = tempActiveData;
+        this.activeId = this.idGlobal;
       }
     },
     addComponent(item) {
-      const clone = this.cloneComponent(item)
-      this.drawingList.push(clone)
-      this.activeFormItem(clone)
+      const clone = this.cloneComponent(item);
+      this.drawingList.push(clone);
+      this.activeFormItem(clone);
     },
     cloneComponent(origin) {
-      const clone = JSON.parse(JSON.stringify(origin))
-      clone.formId = ++this.idGlobal
-      clone.span = formConf.span
-      clone.renderKey = +new Date() // 改变renderKey后可以实现强制更新组件
-      if (!clone.layout) clone.layout = 'colFormItem'
-      if (clone.layout === 'colFormItem') {
-        clone.vModel = `field${this.idGlobal}`
-        clone.placeholder !== undefined && (clone.placeholder += clone.label)
-        tempActiveData = clone
-      } else if (clone.layout === 'rowFormItem') {
-        delete clone.label
-        clone.componentName = `row${this.idGlobal}`
-        clone.gutter = this.formConf.gutter
-        tempActiveData = clone
+      const clone = JSON.parse(JSON.stringify(origin));
+      clone.formId = ++this.idGlobal;
+      clone.span = formConf.span;
+      clone.renderKey = +new Date(); // 改变renderKey后可以实现强制更新组件
+      if (!clone.layout) clone.layout = "colFormItem";
+      if (clone.layout === "colFormItem") {
+        clone.vModel = `field${this.idGlobal}`;
+        clone.placeholder !== undefined && (clone.placeholder += clone.label);
+        tempActiveData = clone;
+      } else if (clone.layout === "rowFormItem") {
+        delete clone.label;
+        clone.componentName = `row${this.idGlobal}`;
+        clone.gutter = this.formConf.gutter;
+        tempActiveData = clone;
       }
-      return tempActiveData
+      return tempActiveData;
     },
     AssembleFormData() {
       this.formData = {
         fields: JSON.parse(JSON.stringify(this.drawingList)),
-        ...this.formConf
-      }
+        ...this.formConf,
+      };
     },
     generate(data) {
-      const func = this[`exec${titleCase(this.operationType)}`]
-      this.generateConf = data
-      func && func(data)
+      const func = this[`exec${titleCase(this.operationType)}`];
+      this.generateConf = data;
+      func && func(data);
     },
     execRun(data) {
-      this.AssembleFormData()
-      this.drawerVisible = true
+      this.AssembleFormData();
+      this.drawerVisible = true;
     },
     execDownload(data) {
-      const codeStr = this.generateCode()
-      const blob = new Blob([codeStr], { type: 'text/plain;charset=utf-8' })
-      this.$download.saveAs(blob, data.fileName)
+      const codeStr = this.generateCode();
+      const blob = new Blob([codeStr], { type: "text/plain;charset=utf-8" });
+      this.$download.saveAs(blob, data.fileName);
     },
     execCopy(data) {
-      document.getElementById('copyNode').click()
+      document.getElementById("copyNode").click();
     },
     empty() {
-      this.$confirm('确定要清空所有组件吗？', '提示', { type: 'warning' }).then(
+      this.$confirm("确定要清空所有组件吗？", "提示", { type: "warning" }).then(
         () => {
-          this.drawingList = []
+          this.drawingList = [];
         }
-      )
+      );
     },
     drawingItemCopy(item, parent) {
-      let clone = JSON.parse(JSON.stringify(item))
-      clone = this.createIdAndKey(clone)
-      parent.push(clone)
-      this.activeFormItem(clone)
+      let clone = JSON.parse(JSON.stringify(item));
+      clone = this.createIdAndKey(clone);
+      parent.push(clone);
+      this.activeFormItem(clone);
     },
     createIdAndKey(item) {
-      item.formId = ++this.idGlobal
-      item.renderKey = +new Date()
-      if (item.layout === 'colFormItem') {
-        item.vModel = `field${this.idGlobal}`
-      } else if (item.layout === 'rowFormItem') {
-        item.componentName = `row${this.idGlobal}`
+      item.formId = ++this.idGlobal;
+      item.renderKey = +new Date();
+      if (item.layout === "colFormItem") {
+        item.vModel = `field${this.idGlobal}`;
+      } else if (item.layout === "rowFormItem") {
+        item.componentName = `row${this.idGlobal}`;
       }
       if (Array.isArray(item.children)) {
-        item.children = item.children.map(childItem => this.createIdAndKey(childItem))
+        item.children = item.children.map((childItem) =>
+          this.createIdAndKey(childItem)
+        );
       }
-      return item
+      return item;
     },
     drawingItemDelete(index, parent) {
-      parent.splice(index, 1)
+      parent.splice(index, 1);
       this.$nextTick(() => {
-        const len = this.drawingList.length
+        const len = this.drawingList.length;
         if (len) {
-          this.activeFormItem(this.drawingList[len - 1])
+          this.activeFormItem(this.drawingList[len - 1]);
         }
-      })
+      });
     },
     generateCode() {
-      const { type } = this.generateConf
-      this.AssembleFormData()
-      const script = vueScript(makeUpJs(this.formData, type))
-      const html = vueTemplate(makeUpHtml(this.formData, type))
-      const css = cssStyle(makeUpCss(this.formData))
-      return beautifier.html(html + script + css, beautifierConf.html)
+      const { type } = this.generateConf;
+      this.AssembleFormData();
+      const script = vueScript(makeUpJs(this.formData, type));
+      const html = vueTemplate(makeUpHtml(this.formData, type));
+      const css = cssStyle(makeUpCss(this.formData));
+      return beautifier.html(html + script + css, beautifierConf.html);
     },
     download() {
-      this.dialogVisible = true
-      this.showFileName = true
-      this.operationType = 'download'
+      this.dialogVisible = true;
+      this.showFileName = true;
+      this.operationType = "download";
     },
     run() {
-      this.dialogVisible = true
-      this.showFileName = false
-      this.operationType = 'run'
+      this.dialogVisible = true;
+      this.showFileName = false;
+      this.operationType = "run";
     },
     copy() {
-      this.dialogVisible = true
-      this.showFileName = false
-      this.operationType = 'copy'
+      this.dialogVisible = true;
+      this.showFileName = false;
+      this.operationType = "copy";
     },
     tagChange(newTag) {
-      newTag = this.cloneComponent(newTag)
-      newTag.vModel = this.activeData.vModel
-      newTag.formId = this.activeId
-      newTag.span = this.activeData.span
-      delete this.activeData.tag
-      delete this.activeData.tagIcon
-      delete this.activeData.document
-      Object.keys(newTag).forEach(key => {
-        if (this.activeData[key] !== undefined
-          && typeof this.activeData[key] === typeof newTag[key]) {
-          newTag[key] = this.activeData[key]
+      newTag = this.cloneComponent(newTag);
+      newTag.vModel = this.activeData.vModel;
+      newTag.formId = this.activeId;
+      newTag.span = this.activeData.span;
+      delete this.activeData.tag;
+      delete this.activeData.tagIcon;
+      delete this.activeData.document;
+      Object.keys(newTag).forEach((key) => {
+        if (
+          this.activeData[key] !== undefined &&
+          typeof this.activeData[key] === typeof newTag[key]
+        ) {
+          newTag[key] = this.activeData[key];
         }
-      })
-      this.activeData = newTag
-      this.updateDrawingList(newTag, this.drawingList)
+      });
+      this.activeData = newTag;
+      this.updateDrawingList(newTag, this.drawingList);
     },
     updateDrawingList(newTag, list) {
-      const index = list.findIndex(item => item.formId === this.activeId)
+      const index = list.findIndex((item) => item.formId === this.activeId);
       if (index > -1) {
-        list.splice(index, 1, newTag)
+        list.splice(index, 1, newTag);
       } else {
-        list.forEach(item => {
-          if (Array.isArray(item.children)) this.updateDrawingList(newTag, item.children)
-        })
-      }
-    }
-  }
+        list.forEach((item) => {
+          if (Array.isArray(item.children))
+            this.updateDrawingList(newTag, item.children);
+        });
       }
+    },
+  },
+};
 </script>
 
-<style lang='scss'>
+<style lang="scss">
 .editor-tabs {
   background: #121315;
   .el-tabs__header {
@@ -445,7 +482,7 @@ export default {
     cursor: pointer;
     font-size: 12px;
     &:hover {
-      background: rgba(210, 23, 23, 0.5)
+      background: rgba(210, 23, 23, 0.5);
     }
   }
   & + .reg-item {
@@ -474,7 +511,7 @@ export default {
     margin-left: 6px;
   }
   .el-icon-plus {
-    color: #409EFF;
+    color: #409eff;
   }
   .el-icon-delete {
     color: #157a0c;
@@ -494,7 +531,7 @@ export default {
 }
 
 $selectedColor: #f6f7ff;
-$lighterBlue: #409EFF;
+$lighterBlue: #409eff;
 
 .container {
   position: relative;
@@ -585,12 +622,12 @@ $lighterBlue: #409EFF;
   height: 42px;
   text-align: right;
   padding: 0 15px;
-  box-sizing: border-box;;
+  box-sizing: border-box;
   border: 1px solid #f1e8e8;
   border-top: none;
   border-left: none;
   .delete-btn {
-    color: #F56C6C;
+    color: #f56c6c;
   }
 }
 .logo-wrapper {
@@ -665,7 +702,8 @@ $lighterBlue: #409EFF;
       background: $selectedColor;
       border-radius: 6px;
     }
-    & > .drawing-item-copy, & > .drawing-item-delete{
+    & > .drawing-item-copy,
+    & > .drawing-item-delete {
       display: initial;
     }
     & > .component-name {
@@ -719,17 +757,20 @@ $lighterBlue: #409EFF;
     padding: 0 6px;
   }
 }
-.drawing-item, .drawing-row-item{
+.drawing-item,
+.drawing-row-item {
   &:hover {
     & > .el-form-item {
       background: $selectedColor;
       border-radius: 6px;
     }
-    & > .drawing-item-copy, & > .drawing-item-delete{
+    & > .drawing-item-copy,
+    & > .drawing-item-delete {
       display: initial;
     }
   }
-  & > .drawing-item-copy, & > .drawing-item-delete{
+  & > .drawing-item-copy,
+  & > .drawing-item-delete {
     display: none;
     position: absolute;
     top: -10px;
@@ -755,11 +796,11 @@ $lighterBlue: #409EFF;
   }
   & > .drawing-item-delete {
     right: 24px;
-    border-color: #F56C6C;
-    color: #F56C6C;
+    border-color: #f56c6c;
+    color: #f56c6c;
     background: #fff;
     &:hover {
-      background: #F56C6C;
+      background: #f56c6c;
       color: #fff;
     }
   }

vue.config.js

@@ -9,8 +9,6 @@ const CompressionPlugin = require('compression-webpack-plugin')
 
 const name = process.env.VUE_APP_TITLE || 'EMS管理系统' // 网页标题
 
-const baseUrl = 'http://110.40.171.179:8089' // 后端接口
-
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
 // vue.config.js 配置说明
@@ -34,19 +32,27 @@ module.exports = {
     port: port,
     open: true,
     proxy: {
-      // detail: https://cli.vuejs.org/config/#devserver-proxy
-      [process.env.VUE_APP_BASE_API]: {
-        target: baseUrl,
+      // // detail: https://cli.vuejs.org/config/#devserver-proxy
+      // [process.env.VUE_APP_BASE_API]: {
+      //   target: baseUrl,
+      //   changeOrigin: true,
+      //   pathRewrite: {
+      //     ['^' + process.env.VUE_APP_BASE_API]: ''
+      //   }
+      // },
+      // // springdoc proxy
+      // '^/v3/api-docs/(.*)': {
+      //   target: baseUrl,
+      //   changeOrigin: true
+      // }
+      // 当请求前缀是/dev-api时,使用下面的代理
+      '/dev-api': {
+        target: 'http://110.40.171.179:8089',
         changeOrigin: true,
         pathRewrite: {
-          ['^' + process.env.VUE_APP_BASE_API]: ''
+          '^/dev-api': ''
         }
       },
-      // springdoc proxy
-      '^/v3/api-docs/(.*)': {
-        target: baseUrl,
-        changeOrigin: true
-      }
     },
     disableHostCheck: true
   },