故障告警,搜索栏 告警等级宽度调整

src/components/BigDataPopup/index.vue

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

src/store/modules/ems.js

@@ -5,9 +5,17 @@ const ems = {
         dzjkAlarmLighting: false,//单站监控 告警统计红点标志
         zdList: [],
         zdDeviceCategoryOptions: {},//站点各个站点包含的设备种类 {021_DDS_01:["BATTERY","CLUSTER","STACK", "DH", "AMMETER", "PCS", "XF"],021_DDS_02:[]...}
-        workStatusOptions: {'0': '运行', '1': '停机', '2': '故障'},//工作状态
+        CLUSTERWorkStatusOptions: {'0': '静置', '1': '充电', '2': '放电', '3': '待机', '5': '运行', '9': "故障"},//电池簇工作状态
         PCSWorkStatusOptions: {'0': '运行', '1': '停机', '2': '故障', '3': '待机', '4': '充电', '5': '放电'},//PCS工作状态
-        STACKWorkStatusOptions: {"0": "净置", "1": "充电", "2": "放电", "3": "浮充", '9': "故障"},//STACK电池簇工作状态
+        STACKWorkStatusOptions: {
+            "0": "静置",
+            "1": "充电",
+            "2": "放电",
+            "3": "浮充",
+            '4': '待机',
+            '5': '运行',
+            '9': "故障"
+        },//STACKBMS总览工作状态
         deviceStatusOptions: {'0': '离线', '1': '在线'},//设备状态
         gridStatusOptions: {'0': '并网', '1': '未并网'},//并网状态
         controlModeOptions: {'0': '远程', '1': '本地'},//控制模式

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

@@ -1,16 +1,19 @@
-
 <template>
   <el-card v-loading="loading" gshadow="always" class="common-card-container common-card-container-no-title-bg">
     <!--    搜索栏-->
     <el-form :inline="true" class="select-container">
       <el-form-item label="设备清单">
-        <el-select v-model="search.deviceId" clearable placeholder="请选择" :loading="loading" loading-text="正在加载数据">
-          <el-option :label="item.deviceName" :value="item.deviceId" v-for="(item,key) in deviceOptions" :key="key+'deviceIdOptions'"></el-option>
+        <el-select v-model="search.deviceId" clearable placeholder="请选择" :loading="loading"
+                   loading-text="正在加载数据">
+          <el-option :label="item.deviceName" :value="item.deviceId" v-for="(item,key) in deviceOptions"
+                     :key="key+'deviceIdOptions'"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="告警等级">
-        <el-select v-model="search.alarmLevel" clearable placeholder="请选择" :loading="loading" loading-text="正在加载数据">
-          <el-option :label="value" :value="key" v-for="(value,key) in $store.state.ems.alarmLevelOptions" :key="key+'alarmLevelOptions'"></el-option>
+        <el-select v-model="search.alarmLevel" clearable placeholder="请选择" :loading="loading"
+                   loading-text="正在加载数据" style="width: 130px">
+          <el-option :label="value" :value="key" v-for="(value,key) in $store.state.ems.alarmLevelOptions"
+                     :key="key+'alarmLevelOptions'"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="时间选择">
@@ -36,7 +39,9 @@
       <el-row style="">
         <el-col :xs="24" :sm="24" :lg="24">
           <el-button-group class="ems-btns-group">
-            <el-button v-for="(item,index) in btnList" :key="index+'dtdcBtns'" :class="{'activeBtn' : activeBtn === item.id}" @click="changeDataType(item.id)">{{item.name}}</el-button>
+            <el-button v-for="(item,index) in btnList" :key="index+'dtdcBtns'"
+                       :class="{'activeBtn' : activeBtn === item.id}" @click="changeDataType(item.id)">{{ item.name }}
+            </el-button>
           </el-button-group>
         </el-col>
       </el-row>
@@ -80,7 +85,10 @@
         <el-table-column
             label="状态">
           <template slot-scope="scope">
-              <span :class="['0','2'].includes(scope.row.status) ? 'warning-status' : ''">{{$store.state.ems.alarmStatusOptions[scope.row.status]}}</span>
+            <span
+                :class="['0','2'].includes(scope.row.status) ? 'warning-status' : ''">{{
+                $store.state.ems.alarmStatusOptions[scope.row.status]
+              }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -89,7 +97,9 @@
             width="250"
         >
           <template slot-scope="scope">
-              <el-button type="text" size="mini"  v-if="scope.row.ticketNo" @click="toTicket">已生成工单(工单号:{{scope.row.ticketNo}})</el-button>
+            <el-button type="text" size="mini" v-if="scope.row.ticketNo" @click="toTicket">
+              已生成工单(工单号:{{ scope.row.ticketNo }})
+            </el-button>
             <el-button type="primary" size="mini" v-else @click="createTicket(scope.row.id)">生成工单</el-button>
           </template>
         </el-table-column>
@@ -113,10 +123,11 @@
 
 
 <script>
-import {getAlarmDetailList,createTicketNo} from'@/api/ems/dzjk'
+import {createTicketNo, getAlarmDetailList} from '@/api/ems/dzjk'
 import {getDeviceList} from '@/api/ems/site'
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import {formatDate} from '@/filters/ems'
+
 export default {
   name: 'DzjkGzgj',
   mixins: [getQuerySiteId],
@@ -154,7 +165,9 @@ export default {
       this.loading = true
       createTicketNo({id}).then(response => {
         response?.data && this.toTicket()
-      }).finally(()=>{this.loading = false})
+      }).finally(() => {
+        this.loading = false
+      })
     },
     // 判断是否是同一天
     isSameDay(day1, day2) {
@@ -204,10 +217,21 @@ export default {
       const {siteId, pageNum, pageSize, activeBtn} = this
       const [alarmStartTime = '', alarmEndTime = ''] = (this.dateRange || [])
       let status = activeBtn === 'today' ? '0' : '1,2'
-      getAlarmDetailList({status,deviceId,alarmLevel,siteId,pageSize,pageNum,alarmStartTime:formatDate(alarmStartTime),alarmEndTime:formatDate(alarmEndTime)}).then(response => {
+      getAlarmDetailList({
+        status,
+        deviceId,
+        alarmLevel,
+        siteId,
+        pageSize,
+        pageNum,
+        alarmStartTime: formatDate(alarmStartTime),
+        alarmEndTime: formatDate(alarmEndTime)
+      }).then(response => {
         this.tableData = response?.rows || [];
         this.totalSize = response?.total || 0
-      }).finally(() => {this.loading=false})
+      }).finally(() => {
+        this.loading = false
+      })
     },
     getDeviceOptions() {
       getDeviceList(this.siteId).then(response => {

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

@@ -3,11 +3,7 @@
     <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="{
-        'timing-card-container':!['0','2'].includes(baseInfo.workStatus),
-        'warning-card-container':baseInfo.workStatus === '2',
-        'running-card-container':baseInfo.workStatus === '0'
-      }">
+               :class="handleCardClass(baseInfo)">
         <div slot="header">
           <span
               class="large-title">{{
@@ -20,7 +16,7 @@
             <el-button type="primary" round size="small" style="margin-right:20px;"
                        @click="pointDetail(baseInfo,'point')">详细
             </el-button>
-            <el-badge :value="baseInfo.alarmNum || 0" class="item">
+            <el-badge :hidden="!baseInfo.alarmNum" :value="baseInfo.alarmNum || 0" class="item">
               <i
                   class="el-icon-message-solid alarm-icon"
                   @click="pointDetail(baseInfo,'alarmPoint')"
@@ -30,16 +26,16 @@
         </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'}`"
+            <el-descriptions-item
+                contentClassName="descriptions-direction work-status"
                 :span="1" label="工作状态">
-              {{ $store.state.ems.workStatusOptions[baseInfo.workStatus] }}
+              {{ CLUSTERWorkStatusOptions[baseInfo.workStatus] }}
             </el-descriptions-item>
-            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"
+            <el-descriptions-item contentClassName="descriptions-direction"
                                   :span="1" label="与PCS通信">
               {{ $store.state.ems.communicationStatusOptions[baseInfo.pcsCommunicationStatus] }}
             </el-descriptions-item>
-            <el-descriptions-item labelClassName="descriptions-label" contentClassName="descriptions-direction"
+            <el-descriptions-item contentClassName="descriptions-direction"
                                   :span="1" label="与EMS通信">
               {{ $store.state.ems.communicationStatusOptions[baseInfo.emsCommunicationStatus] }}
             </el-descriptions-item>
@@ -132,11 +128,17 @@ 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: {PointTable, pointChart},
+  computed: {
+    ...mapState({
+      CLUSTERWorkStatusOptions: state => state?.ems?.CLUSTERWorkStatusOptions || {},
+    })
+  },
   data() {
     return {
       loading: false,
@@ -171,6 +173,10 @@ export default {
     }
   },
   methods: {
+    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

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

@@ -14,7 +14,7 @@
             <el-button type="primary" round size="small" style="margin-right:20px;"
                        @click="pointDetail(baseInfo,'point')">详细
             </el-button>
-            <el-badge :value="baseInfo.alarmNum || 0" class="item">
+            <el-badge :hidden="!baseInfo.alarmNum" :value="baseInfo.alarmNum || 0" class="item">
               <i
                   class="el-icon-message-solid alarm-icon"
                   @click="pointDetail(baseInfo,'alarmPoint')"
@@ -170,7 +170,7 @@ export default {
   mixins: [getQuerySiteId, intervalUpdate],
   computed: {
     ...mapState({
-      STACKWorkStatusOptions: state => state?.ems?.PCSWorkStatusOptions || {},
+      STACKWorkStatusOptions: state => state?.ems?.STACKWorkStatusOptions || {},
     })
   },
   data() {

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,18 +16,16 @@
         <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 :value="item.alarmNum || 0" class="item">
+          <el-badge :hidden="!item.alarmNum" :value="item.alarmNum || 0" class="item">
             <i
                 class="el-icon-message-solid alarm-icon"
                 @click="pointDetail(item,'alarmPoint')"
@@ -57,11 +56,18 @@ 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: {PointTable, pointChart},
+  computed: {
+
+    ...mapState({
+      communicationStatusOptions: state => state?.ems?.communicationStatusOptions || {},
+    })
+  },
   data() {
     return {
       loading: false,

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

@@ -14,7 +14,7 @@
           <el-button type="primary" round size="small" style="margin-right:20px;" @click="pointDetail(item,'point')">
             详细
           </el-button>
-          <el-badge :value="item.alarmNum || 0" class="item">
+          <el-badge :hidden="!item.alarmNum" :value="item.alarmNum || 0" class="item">
             <i
                 class="el-icon-message-solid alarm-icon"
                 @click="pointDetail(item,'alarmPoint')"

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

@@ -1,206 +1,5 @@
 <template>
   <div v-loading="loading" class="ems">
-    <!--    <div-->
-    <!--        v-for="(item, index) in list"-->
-    <!--        :key="index + 'PcsHome'"-->
-    <!--        style="margin-bottom: 25px"-->
-    <!--    >-->
-    <!--      <el-card-->
-    <!--          :class="{-->
-    <!--          'warning-card-container': item.workStatus === '1',-->
-    <!--          'timing-card-container': item.workStatus === '2',-->
-    <!--          'running-card-container': !['1', '2'].includes(item.workStatus),-->
-    <!--        }"-->
-    <!--          class="sbjk-card-container common-card-container-body-no-padding common-card-container-no-title-bg"-->
-    <!--          shadow="always"-->
-    <!--      >-->
-    <!--        &lt;!&ndash;        标题&ndash;&gt;-->
-    <!--        <div slot="header">-->
-    <!--          <span class="large-title"-->
-    <!--          >{{ item.deviceName }}</span-->
-    <!--          >-->
-    <!--          <div class="info">-->
-    <!--            <div>-->
-    <!--              {{-->
-    <!--                $store.state.ems.workStatusOptions[item.workStatus]-->
-    <!--              }}-->
-    <!--            </div>-->
-    <!--            <div>数据更新时间：{{ item.dataUpdateTime }}</div>-->
-    <!--          </div>-->
-    <!--          <div class="alarm">-->
-    <!--            <el-button type="primary" size="small" style="margin-right:20px;" @click="pointDetail(item,'point')">-->
-    <!--              详细-->
-    <!--            </el-button>-->
-    <!--            <el-badge :value="item.alarmNum || 0" class="item">-->
-    <!--              <i-->
-    <!--                  class="el-icon-message-solid alarm-icon"-->
-    <!--                  @click="pointDetail(item,'alarmPoint')"-->
-    <!--              ></i>-->
-    <!--            </el-badge>-->
-    <!--          </div>-->
-    <!--        </div>-->
-    <!--        &lt;!&ndash;        工作状态&ndash;&gt;-->
-    <!--        <div class="descriptions-main">-->
-    <!--          <el-descriptions :colon="false" :column="5" direction="vertical">-->
-    <!--            <el-descriptions-item-->
-    <!--                :contentClassName="`descriptions-direction ${-->
-    <!--                            item.workStatus === '0' ? 'save' : 'danger'-->
-    <!--                          }`"-->
-    <!--                :span="1"-->
-    <!--                label="工作状态"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >{{-->
-    <!--                $store.state.ems.workStatusOptions[item.workStatus]-->
-    <!--              }}-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--            <el-descriptions-item-->
-    <!--                :span="1"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="工作模式"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >-->
-    <!--              todo 手动/自动-->
-    <!--              {{-->
-    <!--                $store.state.ems.gridStatusOptions[item.gridStatus]-->
-    <!--              }}-->
-
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--            <el-descriptions-item-->
-    <!--                :span="1"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="并网状态"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >{{-->
-    <!--                $store.state.ems.gridStatusOptions[item.gridStatus]-->
-    <!--              }}-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--            <el-descriptions-item-->
-    <!--                :span="1"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="告警状态"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >-->
-    <!--              todo-->
-    <!--              &lt;!&ndash;-->
-    <!--              {{-->
-    <!--                              $store.state.ems.warnOptions[item.warnMode]-->
-    <!--                            }}&ndash;&gt;-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--            <el-descriptions-item-->
-    <!--                :contentClassName="`descriptions-direction ${-->
-    <!--                item.deviceStatus === '2' ? 'save' : 'danger'-->
-    <!--              }`"-->
-    <!--                :span="1"-->
-    <!--                label="设备状态"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >{{-->
-    <!--                $store.state.ems.deviceStatusOptions[item.deviceStatus]-->
-    <!--              }}-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--          </el-descriptions>-->
-    <!--        </div>-->
-    <!--        &lt;!&ndash;        用电量&ndash;&gt;-->
-    <!--        <div class="descriptions-main descriptions-main-bg-color">-->
-    <!--          <el-descriptions :colon="false" :column="5" direction="vertical">-->
-    <!--            <el-descriptions-item-->
-    <!--                :span="5"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="当日用电量："-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--            <el-descriptions-item-->
-    <!--                :span="1"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="电网用电量"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--            <el-descriptions-item-->
-    <!--                :span="1"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="储能放电量"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--            <el-descriptions-item-->
-    <!--                :span="1"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="储能充电量"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-
-    <!--            <el-descriptions-item-->
-    <!--                :span="1"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="负荷用电量"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--            <el-descriptions-item-->
-    <!--                :span="1"-->
-    <!--                contentClassName="descriptions-direction"-->
-    <!--                label="光伏发电量"-->
-    <!--                labelClassName="descriptions-label"-->
-    <!--            >-->
-    <!--            </el-descriptions-item-->
-    <!--            >-->
-    <!--          </el-descriptions>-->
-    <!--        </div>-->
-    <!--        &lt;!&ndash;        表格&ndash;&gt;-->
-    <!--        <el-table-->
-    <!--            class="common-table"-->
-    <!--            stripe-->
-    <!--            style="width: 100%;margin-top:25px;">-->
-    <!--          <el-table-column-->
-    <!--              label="功率"-->
-    <!--              prop="type">-->
-    <!--          </el-table-column>-->
-    <!--          <el-table-column-->
-    <!--              label="电网"-->
-    <!--          >-->
-    <!--            <template slot-scope="scope">-->
-    <!--              <span class="pointer"-->
-    <!--                    @click="showChart('簇电压',scope.row.clusterId)">{{ scope.row.clusterVoltage }} V</span>-->
-    <!--            </template>-->
-    <!--          </el-table-column>-->
-    <!--          <el-table-column-->
-    <!--              label="储能">-->
-    <!--            <template slot-scope="scope">-->
-    <!--              <span class="pointer"-->
-    <!--                    @click="showChart('簇电流',scope.row.clusterId)">{{ scope.row.clusterCurrent }} A</span>-->
-    <!--            </template>-->
-    <!--          </el-table-column>-->
-    <!--          <el-table-column-->
-    <!--              label="负荷">-->
-    <!--            <template slot-scope="scope">-->
-    <!--              <span class="pointer"-->
-    <!--                    @click="showChart('簇电流',scope.row.clusterId)">{{ scope.row.clusterCurrent }} A</span>-->
-    <!--            </template>-->
-    <!--          </el-table-column>-->
-    <!--          <el-table-column-->
-    <!--              label="光伏">-->
-    <!--            <template slot-scope="scope">-->
-    <!--              <span class="pointer"-->
-    <!--                    @click="showChart('当前SOC',scope.row.clusterId)">{{ scope.row.currentSoc }} %</span>-->
-    <!--            </template>-->
-    <!--          </el-table-column>-->
-    <!--        </el-table>-->
-    <!--        &lt;!&ndash;        图表&ndash;&gt;-->
-    <!--        <div id="emsChart" style="height: 350px"></div>-->
-    <!--      </el-card>-->
-    <!--    </div>-->
     <el-card
         v-for="(item,index) in list"
         :key="index+'emsList'"
@@ -220,7 +19,7 @@
         <div class="alarm">
           <el-button size="small" round style="margin-right:20px;" type="primary" @click="pointDetail(item,'point')">详细
           </el-button>
-          <el-badge :value="item.alarmNum || 0" class="item">
+          <el-badge :hidden="!item.alarmNum" :value="item.alarmNum || 0" class="item">
             <i
                 class="el-icon-message-solid alarm-icon"
                 @click="pointDetail(item,'alarmPoint')"

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

@@ -31,7 +31,7 @@
                        @click="pointDetail(pcsItem,'point')">
               详细
             </el-button>
-            <el-badge :value="pcsItem.alarmNum || 0" class="item">
+            <el-badge :hidden="!pcsItem.alarmNum" :value="pcsItem.alarmNum || 0" class="item">
               <i
                   class="el-icon-message-solid alarm-icon"
                   @click="pointDetail(pcsItem,'alarmPoint')"

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

@@ -25,7 +25,7 @@
           <el-button type="primary" round size="small" style="margin-right:20px;" @click="pointDetail(item,'point')">
             详细
           </el-button>
-          <el-badge :value="item.alarmNum || 0" class="item">
+          <el-badge :hidden="!item.alarmNum" :value="item.alarmNum || 0" class="item">
             <i
                 class="el-icon-message-solid alarm-icon"
                 @click="pointDetail(item,'alarmPoint')"

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

@@ -14,7 +14,7 @@
           <el-button type="primary" round size="small" style="margin-right:20px;" @click="pointDetail(item,'point')">
             详细
           </el-button>
-          <el-badge :value="item.alarmNum || 0" class="item">
+          <el-badge :hidden="!item.alarmNum" :value="item.alarmNum || 0" class="item">
             <i
                 class="el-icon-message-solid alarm-icon"
                 @click="pointDetail(item,'alarmPoint')"

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

@@ -1,4 +1,3 @@
-
 <template>
   <div style="width:100%" v-loading="loading">
     <!--    搜索栏-->
@@ -22,6 +21,9 @@
       <el-form-item>
         <el-button @click="onReset" native-type="button">重置</el-button>
       </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="exportTable" native-type="button">导出</el-button>
+      </el-form-item>
     </el-form>
     <!--表格-->
     <el-table
@@ -122,6 +124,7 @@
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
 import {getAmmeterData} from '@/api/ems/dzjk'
 import {formatDate} from "@/filters/ems";
+
 export default {
   name: 'DzjkTjbbDbbb',
   mixins: [getQuerySiteId],
@@ -142,6 +145,16 @@ export default {
     }
   },
   methods: {
+    // 导出表格
+    exportTable() {
+      if (!this.dateRange?.length) return
+      const [startTime, endTime] = this.dateRange
+      this.download('ems/statsReport/exportAmmeterData', {
+        siteId: this.siteId,
+        startTime,
+        endTime,
+      }, `电表报表_${startTime}-${endTime}.xlsx`)
+    },
     // 搜索
     onSearch() {
       this.pageNum = 1//每次搜索从1开始搜索
@@ -184,10 +197,9 @@ export default {
       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)];
+      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()
     },
   },

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

@@ -16,7 +16,8 @@
             size="mini"
             :class="{ activeBtn: activeBtn === item.id }"
             @click="changeDataType(item.id)"
-          >{{ item.name }}</el-button
+        >{{ item.name }}
+        </el-button
         >
       </el-button-group>
       <div id="dcdEchart" style="height: 310px"></div>
@@ -28,9 +29,10 @@
 import * as echarts from "echarts";
 import resize from "@/mixins/ems/resize";
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import { getStackData, getStackNameList } from "@/api/ems/dzjk";
+import {getStackData} from "@/api/ems/dzjk";
 import {formatDate} from "@/filters/ems";
 import DateRangeSelect from "@/components/Ems/DateRangeSelect/index.vue";
+
 export default {
   name: "DzjkTjbbDcdqx",
   components: {DateRangeSelect},
@@ -142,7 +144,7 @@ export default {
             },
             legend: {
               left: "center",
-            bottom: "15",
+              top: "10",
             },
             tooltip: {
               trigger: "axis",
@@ -160,10 +162,25 @@ export default {
             yAxis: {
               type: "value",
             },
+            dataZoom: [
+              {
+                type: "inside",
+                start: 0,
+                end: 100,
+              },
+              {
+                start: 0,
+                end: 100,
+              },
+            ],
             dataset: {source},
             series: source[0].slice(1).map((item) => {
               return {
                 type: "line",
+                smooth: true,
+                areaStyle: {
+                  opacity: 0.7,
+                },
               };
             }),
           },
@@ -176,7 +193,7 @@ export default {
     init() {
       this.$nextTick(() => {
         this.initChart();
-        this.$refs.dateRangeSelect.init();
+        this.$refs.dateRangeSelect.init(true);
       });
     },
   },

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

@@ -8,7 +8,6 @@
       <span class="card-title">功率曲线</span>
       <date-range-select
           ref="dateRangeSelect"
-        @reset="resetTime"
           @updateDate="updateDate"
       />
     </div>
@@ -22,9 +21,10 @@
 import * as echarts from "echarts";
 import resize from "@/mixins/ems/resize";
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import { getPcsNameList, getPowerData } from "@/api/ems/dzjk";
+import {getPowerData} from "@/api/ems/dzjk";
 import {formatDate} from "@/filters/ems";
 import DateRangeSelect from "@/components/Ems/DateRangeSelect/index.vue";
+
 export default {
   name: "DzjkTjbbGlqx",
   components: {DateRangeSelect},
@@ -38,7 +38,6 @@ export default {
       },
       dateRange: [],
       loading: false,
-      dateRangeInit: true,
     };
   },
   methods: {
@@ -47,19 +46,11 @@ export default {
       this.dateRange = data || [];
       this.getData();
     },
-    resetTime() {
-      this.dateRangeInit = true;
-    },
     getData() {
       const {siteId} = this;
       let [start = "", end = ""] = this.dateRange || [];
       //接口调用完成之后 设置图表、结束loading
       this.loading = true;
-      if (this.dateRangeInit) {
-        start = "";
-        end = "";
-        this.dateRangeInit = false;
-      }
       getPowerData({
         siteId,
         startDate: formatDate(start),
@@ -90,7 +81,7 @@ export default {
             },
             legend: {
               left: "center",
-            bottom: "15",
+              top: "10",
             },
             tooltip: {
               trigger: "axis",
@@ -109,18 +100,45 @@ export default {
               type: "value",
             },
             dataset: {source},
+            dataZoom: [
+              {
+                type: "inside",
+                start: 0,
+                end: 100,
+              },
+              {
+                start: 0,
+                end: 100,
+              },
+            ],
             series: [
               {
                 type: "line",
+                smooth: true,
+                areaStyle: {
+                  opacity: 0.7,
+                },
               },
               {
                 type: "line",
+                smooth: true,
+                areaStyle: {
+                  opacity: 0.7,
+                },
               },
               {
                 type: "line",
+                smooth: true,
+                areaStyle: {
+                  opacity: 0.7,
+                },
               },
               {
                 type: "line",
+                smooth: true,
+                areaStyle: {
+                  opacity: 0.7,
+                },
               },
             ],
           },
@@ -133,7 +151,6 @@ export default {
     },
     init() {
       this.$nextTick(() => {
-        this.dateRangeInit = true;
         this.initChart();
         this.$refs.dateRangeSelect.init();
       });

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

@@ -16,7 +16,8 @@
             size="mini"
             :class="{ activeBtn: activeBtn === item.id }"
             @click="changeDataType(item.id)"
-          >{{ item.name }}</el-button
+        >{{ item.name }}
+        </el-button
         >
       </el-button-group>
       <div id="pcsEchart" style="height: 310px"></div>
@@ -28,9 +29,10 @@
 import * as echarts from "echarts";
 import resize from "@/mixins/ems/resize";
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import { getPCSData, getPcsNameList } from "@/api/ems/dzjk";
+import {getPCSData} from "@/api/ems/dzjk";
 import {formatDate} from "@/filters/ems";
 import DateRangeSelect from "@/components/Ems/DateRangeSelect/index.vue";
+
 export default {
   name: "DzjkTjbbPcsqx",
   components: {DateRangeSelect},
@@ -158,7 +160,7 @@ export default {
             },
             legend: {
               left: "center",
-            bottom: "15",
+              top: "10",
             },
             tooltip: {
               trigger: "axis",
@@ -176,10 +178,25 @@ export default {
             yAxis: {
               type: "value",
             },
+            dataZoom: [
+              {
+                type: "inside",
+                start: 0,
+                end: 100,
+              },
+              {
+                start: 0,
+                end: 100,
+              },
+            ],
             dataset: {source},
             series: source[0].slice(1).map((item) => {
               return {
                 type: "line",
+                smooth: true,
+                areaStyle: {
+                  opacity: 0.7,
+                },
               };
             }),
           },
@@ -192,7 +209,7 @@ export default {
     init() {
       this.$nextTick(() => {
         this.initChart();
-        this.$refs.dateRangeSelect.init();
+        this.$refs.dateRangeSelect.init(true);
       });
     },
   },

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

@@ -21,6 +21,9 @@
       <el-form-item>
         <el-button @click="onReset" native-type="button">重置</el-button>
       </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="exportTable" native-type="button">导出</el-button>
+      </el-form-item>
     </el-form>
     <!--表格-->
     <el-table
@@ -144,6 +147,16 @@ export default {
     }
   },
   methods: {
+    // 导出表格
+    exportTable() {
+      if (!this.dateRange?.length) return
+      const [startTime, endTime] = this.dateRange
+      this.download('ems/statsReport/exportAmmeterRevenueData', {
+        siteId: this.siteId,
+        startTime,
+        endTime,
+      }, `收益报表_${startTime}-${endTime}.xlsx`)
+    },
     // 搜索
     onSearch() {
       this.pageNum = 1//每次搜索从1开始搜索

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

@@ -80,7 +80,7 @@
         <el-table-column label="数据点位" prop="dataPoint"></el-table-column>
         <el-table-column
             label="数据点位名称"
-            prop="pointName"
+            prop="dataPointName"
         ></el-table-column>
         <!--        <el-table-column label="modbus地址">-->
         <!--          <template slot-scope="scope">-->
@@ -88,8 +88,8 @@
         <!--              `${scope.row.ipAddress || ""} ${scope.row.ipPort || ""}`-->
         <!--            }}</span>-->
         <!--          </template>-->
-        <!--        </el-table-column>-->
-        <el-table-column label="寄存器地址" prop="寄存器地址"></el-table-column>
+        <!--        </el-table-column>
+        <el-table-column label="寄存器地址" prop="寄存器地址"></el-table-column>-->
         <el-table-column
             label="最新值"
             prop="pointValue"