Merge branch 'develop' into single-develop

2026-01-23 19:52:13 +08:00
parent 1b712a70f6 8cb6fbee3e
commit fccddab04a
20 changed files with 602 additions and 1581 deletions
--- a/src/views/ems/dzjk/sbjk/bmszl/index.vue
+++ b/src/views/ems/dzjk/sbjk/bmszl/index.vue
@ -1,12 +1,10 @@
 <template>
  <div v-loading="loading">
    <div v-for="(baseInfo,index) in baseInfoList" :key="index+'bmszlContainer'" style="margin-bottom:25px;">
-      <el-card :class="{
-        'timing-card-container':!['0','2'].includes(baseInfo.workStatus),
-        'warning-card-container':baseInfo.workStatus === '2',
-        'running-card-container':baseInfo.workStatus === '0'
-      }" class="sbjk-card-container common-card-container-body-no-padding common-card-container-no-title-bg"
-               shadow="always">
+      <el-card
+          :class="handleCardClass(baseInfo)"
+          class="sbjk-card-container common-card-container-body-no-padding common-card-container-no-title-bg"
+          shadow="always">
        <div slot="header">
          <span class="large-title">{{ baseInfo.deviceName }}</span>
          <div class="info">
@ -27,9 +25,9 @@
        <div class="descriptions-main">
          <el-descriptions :colon="false" :column="3" direction="vertical">
            <el-descriptions-item
-                :contentClassName="`descriptions-direction ${baseInfo.workStatus === '0' ? 'save' :'danger'}`" :span="1"
+                contentClassName="descriptions-direction work-status"
                label="工作状态" labelClassName="descriptions-label">
-              {{ $store.state.ems.workStatusOptions[baseInfo.workStatus] }}
+              {{ STACKWorkStatusOptions[baseInfo.workStatus] }}
            </el-descriptions-item>
            <el-descriptions-item :span="1" contentClassName="descriptions-direction" label="与PCS通信"
                                  labelClassName="descriptions-label">
@ -164,11 +162,17 @@ import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import intervalUpdate from "@/mixins/ems/intervalUpdate";
 import pointChart from "./../PointChart.vue";
 import PointTable from "@/views/ems/site/sblb/PointTable.vue";
+import {mapState} from "vuex";

 export default {
  name: 'DzjkSbjkBmszl',
  components: {pointChart, PointTable},
  mixins: [getQuerySiteId, intervalUpdate],
+  computed: {
+    ...mapState({
+      STACKWorkStatusOptions: state => state?.ems?.PCSWorkStatusOptions || {},
+    })
+  },
  data() {
    return {
      loading: false,
@ -187,6 +191,11 @@ export default {
    }
  },
  methods: {
+    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
--- a/src/views/ems/dzjk/sbjk/db/index.vue
+++ b/src/views/ems/dzjk/sbjk/db/index.vue
@ -35,7 +35,8 @@
        </div>
      </div>
      <el-row class="device-info-row">
-        <el-col v-for="(tempDataItem,tempDataIndex) in deviceIdTypeMsg[item.deviceId]" :key="tempDataIndex+'dbTempData'"
+        <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
@ -70,89 +71,125 @@ export default {
          {
            name: '正向有功电能',
            attr: 'forwardActive',
-            pointName: '正向有功电能'
+            pointName: '正向有功电能',
+            unit: 'kWh'
          },
          {
            name: '反向有功电能',
            attr: 'reverseActive',
-            pointName: '反向有功电能'
+            pointName: '反向有功电能',
+            unit: 'kWh'
          },
          {
            name: '正向无功电能',
            attr: 'forwardReactive',
-            pointName: '正向无功电能'
+            pointName: '正向无功电能',
+            unit: 'kvarh'
          },
          {
            name: '反向无功电能',
            attr: 'reverseReactive',
-            pointName: '反向无功电能'
+            pointName: '反向无功电能',
+            unit: 'kvarh'
          },
          {
            name: '有功功率',
            attr: 'activePower',
-            pointName: '总有功功率'
+            pointName: '总有功功率',
+            unit: 'kW'
          },
          {
            name: '无功功率',
            attr: 'reactivePower',
-            pointName: '总无功功率'
+            pointName: '总无功功率',
+            unit: 'kvar'
          }
        ],
        'METE': [
          {
            name: '正向有功电能',
            attr: 'forwardActive',
-            pointName: '正向有功电能'
+            pointName: '正向有功电能',
+            unit: 'kWh'
          },
          {
            name: '反向有功电能',
            attr: 'reverseActive',
-            pointName: '反向有功电能'
+            pointName: '反向有功电能',
+            unit: 'kWh'
          },
          {
            name: '正向无功电能',
            attr: 'forwardReactive',
-            pointName: '正向无功电能'
+            pointName: '正向无功电能',
+            unit: 'kvarh'
          },
          {
            name: '反向无功电能',
            attr: 'reverseReactive',
-            pointName: '反向无功电能'
+            pointName: '反向无功电能',
+            unit: 'kvarh'
          },
          {
            name: '有功功率',
            attr: 'activePower',
-            pointName: '总有功功率'
+            pointName: '总有功功率',
+            unit: 'kW'
          },
          {
            name: '无功功率',
            attr: 'reactivePower',
-            pointName: '总无功功率'
+            pointName: '总无功功率',
+            unit: 'kvar'
          }
        ],
        'METEGF': [
          {
            name: '有功电能',
            attr: 'activeEnergy',
-            pointName: '有功电能'
+            pointName: '有功电能',
+            unit: 'kWh'
          },
          {
            name: '无功电能',
            attr: 'reactiveEnergy',
-            pointName: '无功电能'
+            pointName: '无功电能',
+            unit: 'kvarh'
          },
          {
            name: '有功功率',
            attr: 'activePower',
-            pointName: '总有功功率'
+            pointName: '总有功功率',
+            unit: 'kW'
          },
          {
            name: '无功功率',
            attr: 'reactivePower',
-            pointName: '总无功功率'
+            pointName: '总无功功率',
+            unit: 'kvar'
          }
        ]
-      }
+      },
+      otherTypeMsg: [
+        {
+          name: '正向有功电能',
+          attr: 'forwardActive',
+          pointName: '正向有功电能',
+          unit: 'kWh'
+        },
+        {
+          name: '反向有功电能',
+          attr: 'reverseActive',
+          pointName: '反向有功电能',
+          unit: 'kWh'
+        },
+        {
+          name: '有功功率',
+          attr: 'activePower',
+          pointName: '总有功功率',
+          unit: 'kW'
+        },
+      ]
    };
  },
  methods: {
--- a/src/views/ems/dzjk/sbjk/pcs/index.vue
+++ b/src/views/ems/dzjk/sbjk/pcs/index.vue
@ -8,11 +8,7 @@
        style="margin-bottom: 25px"
    >
      <el-card
-          :class="{
-          'timing-card-container':!['0','2'].includes(pcsItem.workStatus),
-          'warning-card-container':pcsItem.workStatus === '2',
-          'running-card-container':pcsItem.workStatus === '0'
-        }"
+          :class="handleCardClass(pcsItem)"
          class="sbjk-card-container common-card-container-body-no-padding common-card-container-no-title-bg"
          shadow="always"
      >
@ -52,14 +48,12 @@
        <div class="descriptions-main">
          <el-descriptions :colon="false" :column="4" direction="vertical">
            <el-descriptions-item
-                :contentClassName="`descriptions-direction ${
-                pcsItem.workStatus === '0' ? 'save' : 'danger'
-              }`"
+                contentClassName="descriptions-direction work-status"
                :span="1"
                label="工作状态"
                labelClassName="descriptions-label"
            >{{
-                $store.state.ems.workStatusOptions[pcsItem.workStatus]
+                PCSWorkStatusOptions[pcsItem.workStatus]
              }}
            </el-descriptions-item
            >
@ -197,11 +191,17 @@ import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import {getPcsDetailInfo, getRunningHeadInfo} from "@/api/ems/dzjk";
 import intervalUpdate from "@/mixins/ems/intervalUpdate";
 import PcsSwitch from "@/views/ems/site/sblb/PcsSwitch.vue";
+import {mapState} from "vuex";

 export default {
  name: "DzjkSbjkPcs",
  components: {RealTimeBaseInfo, pointChart, PointTable, PcsSwitch},
  mixins: [getQuerySiteId, intervalUpdate],
+  computed: {
+    ...mapState({
+      PCSWorkStatusOptions: state => state?.ems?.PCSWorkStatusOptions || {},
+    })
+  },
  data() {
    return {
      loading: false,
@ -288,6 +288,10 @@ export default {
    };
  },
  methods: {
+    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
--- a/src/views/ems/dzjk/sbjk/ssyx/CnglqxChart.vue
+++ b/src/views/ems/dzjk/sbjk/ssyx/CnglqxChart.vue
@ -1,12 +1,12 @@
 <template>
  <el-card
-    shadow="always"
-    class="common-card-container common-card-container-body-no-padding"
+      shadow="always"
+      class="common-card-container common-card-container-body-no-padding"
  >
    <div slot="header">
      <span class="card-title">PCS有功功率/PCS无功功率</span>
    </div>
-    <div style="height: 360px" id="cnglqxChart" />
+    <div style="height: 360px" id="cnglqxChart"/>
  </el-card>
 </template>

@ -14,7 +14,7 @@
 <script>
 import * as echarts from "echarts";
 import resize from "@/mixins/ems/resize";
-import { storagePower } from "@/api/ems/dzjk";
+import {storagePower} from "@/api/ems/dzjk";

 export default {
  mixins: [resize],
@ -36,56 +36,56 @@ export default {
  methods: {
    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();
-        });
+      const [startTime = '', endTime = ''] = timeRange;
+      storagePower(siteId, startTime, endTime)
+          .then((response) => {
+            this.setOption(response?.data?.pcsPowerList || []);
+          })
+          .finally(() => {
+            this.chart.hideLoading();
+          });
    },
    setOption(data) {
      let xdata = [],
-        series = [];
+          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'
+            {
+              type: "line",
+              name: `${element.deviceId}有功功率`,
+              areaStyle: {
+                // color:'#FFBD00'
+              },
+              data: (element.energyStoragePowList || []).map(
+                  (i) => {
+                    return {
+                      value: i.pcsTotalActPower,
+                      year: i.dateDay || ''
+                    }
+                  }
+              )
            },
-            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 || ''
-                }
-              }
-            ),
-          }
+            {
+              type: "line",
+              name: `${element.deviceId}无功功率`,
+              areaStyle: {
+                // color:'#FFBD00'
+              },
+              data: (element.energyStoragePowList || []).map(
+                  (i) => {
+                    return {
+                      value: i.pcsTotalReactivePower,
+                      year: i.dateDay || ''
+                    }
+                  }
+              ),
+            }
        );
      });
-      this.chart.setOption({
+      this.chart && this.chart.setOption({
        legend: {
          left: "center",
          top: "5",
@ -99,29 +99,29 @@ export default {
          containLabel: true,
        },
        tooltip: {
-          show:true,
+          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;">
+          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>'
+            result += '</div>'
            return result
          }
        },
        textStyle: {
          color: "#333333",
        },
-        xAxis: { type: "category", data: xdata },
+        xAxis: {type: "category", data: xdata},
        yAxis: {
          type: "value",
        },
@ -137,7 +137,7 @@ export default {
          },
        ],
        series,
-      });
+      }, true);
    },
  },
 };
--- a/src/views/ems/dzjk/sbjk/ssyx/DcpjsocChart.vue
+++ b/src/views/ems/dzjk/sbjk/ssyx/DcpjsocChart.vue
@ -54,7 +54,7 @@ export default {
          year:element.dateDay,
        });
      });
-      xdata = this.chart.setOption({
+      this.chart && this.chart.setOption({
        legend: {
          left: "center",
          top: "5",
@ -115,7 +115,7 @@ export default {
            data: ydata,
          },
        ],
-      });
+      },true);
    },
  },
 };
--- a/src/views/ems/dzjk/sbjk/ssyx/DcpjwdChart.vue
+++ b/src/views/ems/dzjk/sbjk/ssyx/DcpjwdChart.vue
@ -57,7 +57,7 @@ export default {
          }
        );
      });
-      xdata = this.chart.setOption({
+      this.chart && this.chart.setOption({
        legend: {
          left: "center",
          top: "5",
@ -118,7 +118,7 @@ export default {
            data: ydata,
          },
        ],
-      });
+      },true);
    },
  },
 };
--- a/src/views/ems/dzjk/sbjk/ssyx/PocpjwdChart.vue
+++ b/src/views/ems/dzjk/sbjk/ssyx/PocpjwdChart.vue
@ -66,7 +66,7 @@ export default {
          }),
        });
      });
-      this.chart.setOption({
+      this.chart && this.chart.setOption({
        legend: {
          left: "center",
          top: "5",
@ -118,7 +118,7 @@ export default {
          },
        ],
        series,
-      });
+      },true);
    },
  },
 };