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

src/components/BigDataPopup/index.vue

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

@@ -6,9 +6,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,27 +1,30 @@
-
 <template>
-  <div  v-loading="loading" class="ems-dashboard-editor-container ems-content-container-padding">
+  <div v-loading="loading" class="ems-dashboard-editor-container ems-content-container-padding">
     <!--    搜索栏-->
     <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="时间选择">
         <el-date-picker
-          v-model="dateRange"
-          type="daterange"
-          range-separator="至"
-          start-placeholder="开始时间"
-          :picker-options="pickerOptions"
-          :default-value="defaultDateRange"
-          end-placeholder="结束时间">
+            v-model="dateRange"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始时间"
+            :picker-options="pickerOptions"
+            :default-value="defaultDateRange"
+            end-placeholder="结束时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -36,7 +39,9 @@
       <el-row style="">
         <el-col :xs="24" :sm="24" :lg="24">
           <el-button-group class="ems-btns-group">
-            <el-button v-for="(item,index) in btnList" :key="index+'dtdcBtns'" :class="{'activeBtn' : activeBtn === item.id}" @click="changeDataType(item.id)">{{item.name}}</el-button>
+            <el-button v-for="(item,index) in btnList" :key="index+'dtdcBtns'"
+                       :class="{'activeBtn' : activeBtn === item.id}" @click="changeDataType(item.id)">{{ item.name }}
+            </el-button>
           </el-button-group>
         </el-col>
       </el-row>
@@ -47,64 +52,67 @@
           stripe
           max-height="500"
           style="width: 100%;margin-top:25px;">
-          <el-table-column
+        <el-table-column
             prop="deviceName"
             label="设备名称">
-          </el-table-column>
-          <el-table-column
+        </el-table-column>
+        <el-table-column
             label="告警等级"
-          >
-            <template slot-scope="scope">
-              <span>{{$store.state.ems.alarmLevelOptions[scope.row.alarmLevel]}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
+        >
+          <template slot-scope="scope">
+            <span>{{ $store.state.ems.alarmLevelOptions[scope.row.alarmLevel] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
             prop="alarmContent"
             show-overflow-tooltip
             label="告警内容">
-          </el-table-column>
-          <el-table-column
+        </el-table-column>
+        <el-table-column
             prop="alarmStartTime"
             label="告警发生时间">
-            <template slot-scope="scope">
-              <span>{{formatDate(scope.row.alarmStartTime,true)}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
+          <template slot-scope="scope">
+            <span>{{ formatDate(scope.row.alarmStartTime, true) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
             prop="alarmEndTime"
             label="告警结束时间">
-            <template slot-scope="scope">
-              <span>{{formatDate(scope.row.alarmEndTime,true)}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
+          <template slot-scope="scope">
+            <span>{{ formatDate(scope.row.alarmEndTime, true) }}</span>
+          </template>
+        </el-table-column>
+        <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>
-            </template>
-          </el-table-column>
-          <el-table-column
+          <template slot-scope="scope">
+            <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
             label="工单"
             fixed="right"
             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="primary" size="mini" v-else @click="createTicket(scope.row.id)">生成工单</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+        >
+          <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="createTicket(scope.row.id)">生成工单</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"
+          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>
@@ -113,113 +121,127 @@
 
 
 <script>
-import {getAlarmDetailList,createTicketNo} from'@/api/ems/dzjk'
-import {getDeviceList} from'@/api/ems/site'
+import {createTicketNo, getAlarmDetailList} from '@/api/ems/dzjk'
+import {getDeviceList} from '@/api/ems/site'
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import { formatDate } from '@/filters/ems'
+import {formatDate} from '@/filters/ems'
+
 export default {
-  name:'DzjkGzgj',
-  mixins:[getQuerySiteId],
+  name: 'DzjkGzgj',
+  mixins: [getQuerySiteId],
   data() {
     return {
-      loading:false,
-      btnList:[
-        {name:'未处理告警',id:'today'},
-        {name:'历史告警',id:'history'},
+      loading: false,
+      btnList: [
+        {name: '未处理告警', id: 'today'},
+        {name: '历史告警', id: 'history'},
       ],
-      deviceOptions:[],//设备列表
-      pickerOptions:{
+      deviceOptions: [],//设备列表
+      pickerOptions: {
         disabledDate(time) {
           return time.getTime() > Date.now();
         },
       },
-      defaultDateRange:[],//默认展示的时间
-      dateRange:[],//alarmStartTime,alarmEndTime
-      activeBtn:'today',
-      search:{deviceId:'',alarmLevel:''},
+      defaultDateRange: [],//默认展示的时间
+      dateRange: [],//alarmStartTime,alarmEndTime
+      activeBtn: 'today',
+      search: {deviceId: '', alarmLevel: ''},
       // 表格、分页
-      tableData:[],
-      pageSize:10,//分页栏当前每个数据总数
-      pageNum:1,//分页栏当前页数
-      totalSize:0,//table表格数据总数
+      tableData: [],
+      pageSize: 10,//分页栏当前每个数据总数
+      pageNum: 1,//分页栏当前页数
+      totalSize: 0,//table表格数据总数
     }
   },
-  methods:{
+  methods: {
     formatDate,
-    toTicket(){
-      this.$router.push({path:'/ticket'})
+    toTicket() {
+      this.$router.push({path: '/ticket'})
     },
     //生成工单
-    createTicket(id){
+    createTicket(id) {
       this.loading = true
-      createTicketNo({id}).then(response=>{
+      createTicketNo({id}).then(response => {
         response?.data && this.toTicket()
-      }).finally(()=>{this.loading = false})
+      }).finally(() => {
+        this.loading = false
+      })
     },
     // 判断是否是同一天
     isSameDay(day1, day2) {
-      const date1 = new Date(day1),date2 = new Date(day2)
+      const date1 = new Date(day1), date2 = new Date(day2)
       return date1.getFullYear() === date2.getFullYear() &&
-        date1.getMonth() === date2.getMonth() &&
-        date1.getDate() === date2.getDate();
+          date1.getMonth() === date2.getMonth() &&
+          date1.getDate() === date2.getDate();
     },
     // 分页
     handleSizeChange(val) {
       this.pageSize = val;
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         this.getData()
       })
     },
     handleCurrentChange(val) {
       this.pageNum = val
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         this.getData()
       })
     },
     // 搜索
-    onSearch(){
-      this.pageNum =1//每次搜索从1开始搜索
+    onSearch() {
+      this.pageNum = 1//每次搜索从1开始搜索
       this.getData()
     },
     // 重置
-    onReset(){
-      this.search={deviceId:'',alarmLevel:''}
-      this.dateRange=[]
-      this.pageNum =1//每次搜索从1开始搜索
+    onReset() {
+      this.search = {deviceId: '', alarmLevel: ''}
+      this.dateRange = []
+      this.pageNum = 1//每次搜索从1开始搜索
       this.getData()
     },
     // 切换今日、历史告警
-    changeDataType(id){
-      if(id !== this.activeBtn){
+    changeDataType(id) {
+      if (id !== this.activeBtn) {
         console.log('点击了不同的菜单，更新数据')
-        this.activeBtn=id;
+        this.activeBtn = id;
         this.getData()
       }
     },
     // 获取数据
-    getData(){
-      this.$store.dispatch('getSiteAlarmNum',this.siteId)
-      this.loading=true
-      const {deviceId,alarmLevel} = this.search
-      const {siteId,pageNum,pageSize,activeBtn} =this
-      const [alarmStartTime='',alarmEndTime='']=(this.dateRange || [])
+    getData() {
+      this.$store.dispatch('getSiteAlarmNum', this.siteId)
+      this.loading = true
+      const {deviceId, alarmLevel} = this.search
+      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 => {
-        this.tableData=response?.rows || [];
+      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(){
+    getDeviceOptions() {
       getDeviceList(this.siteId).then(response => {
         this.deviceOptions = JSON.parse(JSON.stringify(response?.data || []))
       })
     },
-    init(){
+    init() {
       this.getDeviceOptions()
       this.onReset()
     },
   },
-  mounted(){
+  mounted() {
     const now = new Date();
     const lastMonth = new Date(now.getFullYear(), now.getMonth() - 1, 1);
     this.defaultDateRange = [lastMonth, now];

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'}`"
-                                  :span="1" label="工作状态">
-              {{ $store.state.ems.workStatusOptions[baseInfo.workStatus] }}
+            <el-descriptions-item
+                contentClassName="descriptions-direction work-status"
+                :span="1" label="工作状态">
+              {{ 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

@@ -19,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

@@ -37,7 +37,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,172 +21,185 @@
       <el-form-item>
         <el-button @click="onReset" native-type="button">重置</el-button>
       </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="exportTable" native-type="button">导出</el-button>
+      </el-form-item>
     </el-form>
     <!--表格-->
     <el-table
-          class="common-table"
-          :data="tableData"
-          stripe
-          style="width: 100%;margin-top:25px;">
-<!--        汇总列-->
-          <el-table-column label="汇总">
-            <el-table-column
-              prop="dataTime"
-              label="日期"
-              width="120">
-            </el-table-column>
-          </el-table-column>
-<!--充电量列-->
-          <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="放电量" 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="效率(%)" 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>
+        class="common-table"
+        :data="tableData"
+        stripe
+        style="width: 100%;margin-top:25px;">
+      <!--        汇总列-->
+      <el-table-column label="汇总">
+        <el-table-column
+            prop="dataTime"
+            label="日期"
+            width="120">
+        </el-table-column>
+      </el-table-column>
+      <!--充电量列-->
+      <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="放电量" 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="效率(%)" align="center">
+        <el-table-column
+            align="center"
+            prop="effect">
+        </el-table-column>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+        v-show="tableData.length>0"
+        background
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="pageNum"
+        :page-size="pageSize"
+        :page-sizes="[10, 20, 30, 40]"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="totalSize"
+        style="margin-top:15px;text-align: center"
+    >
+    </el-pagination>
   </div>
 </template>
 
 
 <script>
 import getQuerySiteId from "@/mixins/ems/getQuerySiteId";
-import { getAmmeterData} from '@/api/ems/dzjk'
+import {getAmmeterData} from '@/api/ems/dzjk'
 import {formatDate} from "@/filters/ems";
+
 export default {
-  name:'DzjkTjbbDbbb',
+  name: 'DzjkTjbbDbbb',
   mixins: [getQuerySiteId],
   data() {
     return {
-      loading:false,
-      pickerOptions:{
+      loading: false,
+      pickerOptions: {
         disabledDate(time) {
           return time.getTime() > Date.now();
         },
       },
-      defaultDateRange:[],//默认展示的时间
-      dateRange:[],
-      tableData:[],
-      pageSize:10,//分页栏当前每个数据总数
-      pageNum:1,//分页栏当前页数
-      totalSize:0,//table表格数据总数
+      defaultDateRange: [],//默认展示的时间
+      dateRange: [],
+      tableData: [],
+      pageSize: 10,//分页栏当前每个数据总数
+      pageNum: 1,//分页栏当前页数
+      totalSize: 0,//table表格数据总数
     }
   },
-  methods:{
+  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开始搜索
+    onSearch() {
+      this.pageNum = 1//每次搜索从1开始搜索
       this.getData()
     },
     // 重置
-    onReset(){
-      this.dateRange=this.defaultDateRange
-      this.pageNum =1//每次搜索从1开始搜索
+    onReset() {
+      this.dateRange = this.defaultDateRange
+      this.pageNum = 1//每次搜索从1开始搜索
       this.getData()
     },
     // 分页
     handleSizeChange(val) {
       this.pageSize = val;
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         this.getData()
       })
     },
     handleCurrentChange(val) {
       this.pageNum = val
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         this.getData()
       })
     },
     // 获取数据
-    getData(){
-      this.loading=true
-      const {siteId,pageNum,pageSize} =this
-      const [startTime='',endTime='']=(this.dateRange || [])
-      getAmmeterData({siteId:siteId,startTime,endTime,pageSize,pageNum}).then(response=>{
-        this.tableData=response?.rows || [];
+    getData() {
+      this.loading = true
+      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(()=> {
+      }).finally(() => {
         this.loading = false
       })
     },
-    init(){
-      this.dateRange=[]
-      this.tableData=[]
-      this.totalSize=0
-      this.pageSize=10
+    init() {
+      this.dateRange = []
+      this.tableData = []
+      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()
     },
   },
@@ -195,8 +207,8 @@ export default {
 </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{
+::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;
   }
 }

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

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

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

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

@@ -65,7 +65,7 @@ export default {
             //做开关机操作,更新成功后刷新表格
             updateDeviceStatus({
               siteId,
-              workStatus: this.runningStatusMap.includes(workStatus) ? "1" : '0',
+              workStatus: this.runningStatusMap.includes(workStatus) ? "1" : '0',//1 关机 0开机
               deviceId
             })
                 .then((response) => {

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

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