电表报表

2025-10-11 17:30:23 +08:00
parent 7d51c37cad
commit 376b50c3b5
4 changed files with 81 additions and 17 deletions
--- a/src/api/ems/powerTariff.js
+++ b/src/api/ems/powerTariff.js
@ -33,9 +33,9 @@ export function detailPriceConfig(id) {
 }

 //列表
-export function listPriceConfig({startTime,endTime,pageSize,pageNum}) {
+export function listPriceConfig({startTime,endTime,pageSize,pageNum,siteId}) {
    return request({
-        url: `/ems/energyPriceConfig/list?startTime=${startTime}&endTime=${endTime}&pageNum=${pageNum}&pageSize=${pageSize}`,
+        url: `/ems/energyPriceConfig/list?startTime=${startTime}&endTime=${endTime}&pageNum=${pageNum}&pageSize=${pageSize}&siteId=${siteId}`,
        method: 'get',
    })
 }
--- a/src/views/ems/site/powerTariff/AddPowerTariff.vue
+++ b/src/views/ems/site/powerTariff/AddPowerTariff.vue
@ -2,6 +2,14 @@
 <template>
  <div>
    <el-dialog v-loading="loading" width="780px" :visible.sync="dialogTableVisible" class="ems-dialog" title="电价配置" :close-on-click-modal="false" :show-close="false">
+      <div class="items-container">
+        <div class="item-title">站点:</div>
+        <div class="item-content">
+          <el-select v-model="siteId" :disabled="mode === 'edit'" placeholder="请选择站点" :loading="searchLoading" loading-text="正在加载数据">
+            <el-option :label="item.siteName" :value="item.siteId" v-for="(item,index) in siteList" :key="index+'zdxeSelect'"></el-option>
+          </el-select>
+        </div>
+      </div>
      <div class="items-container">
        <div class="item-title">时间:</div>
        <div class="item-content">
@ -95,11 +103,15 @@
 </template>
 <script>
 import {addPriceConfig,editPriceConfig,detailPriceConfig} from '@/api/ems/powerTariff'
+import {getAllSites} from '@/api/ems/zddt'
 export default {
  data() {
    return {
      mode:'',
      id:'',
+      searchLoading:false,
+      siteId:'',
+      siteList:[],
      powerDate:'',//时间
      //尖-peak,峰-high,平-flat,谷=valley
      priceTypeOptions:[{
@ -135,8 +147,15 @@ export default {
    deleteRow(index){
      this.hoursOptions.splice(index,1)
    },
+    //获取站点列表
+    getZdList(){
+      this.searchLoading=true
+      getAllSites().then(response => {
+        this.siteList = response?.data || []
+      }).finally(() => {this.searchLoading=false})
+    },
    showDialog(id){
-      console.log('id ======',id)
+      this.getZdList()
      this.id = id
      if(id) {
        this.mode='edit'
@ -144,6 +163,7 @@ export default {
        this.loading = true
        detailPriceConfig(id).then(response => {
          const data = response?.data || {}
+          this.siteId = data?.siteId || ''
          this.hoursOptions = data?.range || []
          this.powerDate=data?.year && data?.month  ? data.year +'-'+data.month : ''
          this.priceTypeOptions.forEach(item=>{
@ -156,6 +176,7 @@ export default {
      this.dialogTableVisible=true
    },
    saveDialog() {
+      if(this.siteId === '') return this.$message.error('请选择站点')
      if(this.powerDate === '') return this.$message.error('请选择时间')
      let priceArr=[]
      this.priceTypeOptions.forEach(item=>{
@ -181,12 +202,13 @@ export default {
      })
      console.log('hoursMap======',hoursMap)
      if(Object.values(hoursMap).length<24 || Object.values(hoursMap).find(i=>i>1)) return this.$message.error(`请配置24小时的电价且时间不能重复`)
-      const {powerDate,priceTypeOptions,hoursOptions,mode,id} =this
+      const {powerDate,priceTypeOptions,hoursOptions,mode,id,siteId} =this
      this.loading = true
      let params={
        year:powerDate.split('-')[0],
        month:parseInt(powerDate.split('-')[1]),
-        range:hoursOptions
+        range:hoursOptions,
+        siteId,
      }
      priceTypeOptions.forEach(item=>{params[item.id]=item.price})
      if(mode === 'edit') params.id = id
@ -221,6 +243,9 @@ export default {
      this.$emit('clear')
      this.mode=''
      this.id=''
+      this.siteId=''
+      this.siteList=[]
+      this.searchLoading=false
      this.powerDate=''
      this.hoursOptions=[]
      this.priceTypeOptions.forEach(item=>{
--- a/src/views/ems/site/powerTariff/index.vue
+++ b/src/views/ems/site/powerTariff/index.vue
@ -1,6 +1,11 @@
 <template>
  <div class="ems-dashboard-editor-container" style="background-color: #ffffff" v-loading="loading">
    <el-form :inline="true" class="select-container">
+      <el-form-item label="站点选择">
+        <el-select v-model="siteId" placeholder="请选择换电站名称" :loading="searchLoading" loading-text="正在加载数据" @change="onSearch" clearable>
+          <el-option :label="item.siteName" :value="item.siteId" v-for="(item,index) in siteList" :key="index+'zdxeSelect'"></el-option>
+        </el-select>
+      </el-form-item>
      <el-form-item label="年份选择">
        <el-date-picker
            v-model="defaultYear"
@ -10,16 +15,16 @@
            align="center"
            format="yyyy年"
            value-format="yyyy"
-            :picker-options="pickerOptions"
            @change="changeDefaultYear"
          >
        </el-date-picker>
      </el-form-item>
+      <br>
      <el-form-item>
        <el-button type="primary" @click="addPowerConfig('')">新增电价配置</el-button>
      </el-form-item>
    </el-form>
-    <div class="month-lists-container">
+    <div class="month-lists-container" v-infinite-scroll="getData" infinite-scroll-immediate="false">
      <el-empty v-show="tableData.length<=0" :image-size="200"></el-empty>
      <el-card
          shadow="always"
@ -28,7 +33,7 @@
          :key="item.id"
      >
        <div slot="header" class="time-range-header">
-          <span class="card-title">{{item.month}}月电价时段划分</span>
+          <span class="card-title">{{siteList.find(i=>i.siteId===item.siteId).siteName || item.siteId || ''}}-{{item.month}}月电价时段划分</span>
          <div>
            <el-button type="primary" size="mini" @click="addPowerConfig(item.id)">编辑</el-button>
            <el-button type="warning" size="mini" @click="deletePowerConfig(item)">删除</el-button>
@ -50,12 +55,13 @@
        </div>
      </el-card>
    </div>
-    <add-power-tariff ref="addPowerTariff" @update="getData"/>
+    <add-power-tariff ref="addPowerTariff" @update="getData(true)"/>
  </div>
 </template>

 <script>
 import {energyPriceConfig,listPriceConfig} from '@/api/ems/powerTariff'
+import {getAllSites} from '@/api/ems/zddt'
 import AddPowerTariff from './AddPowerTariff.vue'
 import DateTimeSelect from "@/views/ems/search/DateTimeSelect.vue";
 export default {
@ -65,7 +71,13 @@ export default {
  data() {
    return {
      loading:false,
+      pageNum:1,
+      pageSize:10,
+      searchLoading:false,
+      siteId:'',
+      siteList:[],
      tableData:[],
+      tableTotal:0,
      defaultYear:'',
      pickerOptions:{
        disabledDate(time) {
@ -81,15 +93,37 @@ export default {
    }
  },
  methods:{
-    changeDefaultYear(){
-      this.getData();
+    resetTableData(){
+      this.tableData=[]
+      this.tableTotal=0
+      this.pageNum=1
    },
-    getData(){
+    // 搜索
+    onSearch(){
+      this.getData(true)
+    },
+    //获取站点列表
+    getZdList(){
+      this.searchLoading=true
+      getAllSites().then(response => {
+        this.siteList = response?.data || []
+      }).finally(() => {this.searchLoading=false})
+    },
+    changeDefaultYear(){
+      this.getData(true)
+    },
+    getData(reset=false){
+      reset && this.resetTableData()
+      console.log('湖区====',reset,this.tableData.length,this.tableTotal,this.pageNum);
+      if(!reset && this.tableData.length>=this.tableTotal) return
      this.loading=true;
      const date = new Date(this.defaultYear).getFullYear()
      const startTime = date+'-01',endTime = date+'-12'
-      listPriceConfig({startTime,endTime,pageNum:1,pageSize:20}).then(response => {
-        this.tableData = JSON.parse(JSON.stringify(response?.rows || []))
+      listPriceConfig({startTime,endTime,pageNum:this.pageNum,pageSize:this.pageSize,siteId:this.siteId}).then(response => {
+        const data = JSON.parse(JSON.stringify(response?.rows || []))
+        data.length > 0 && (this.pageNum += 1)
+        this.tableData.push(...data)
+        this.tableTotal=response?.total || 0
      }).finally(() => {this.loading=false})
    },
    addPowerConfig(id=''){
@ -120,7 +154,7 @@ export default {
          type: 'success',
          message: '删除成功!'
        });
-        this.getData()
+        this.getData(true)
        //调用接口 更新表格数据
      }).catch(() => {
        //取消关机
@ -129,12 +163,17 @@ export default {
  },
  mounted() {
    this.defaultYear = new Date()
-    this.getData()
+    this.getZdList()
+    this.getData(true)
  }
 }
 </script>

 <style lang="scss" scoped>
+.month-lists-container{
+  max-height:100vh ;
+  overflow-y: auto;
+}
 .common-card-container{
  width: 100%;
  margin-top: 20px;
--- a/src/views/ems/site/sblb/index.vue
+++ b/src/views/ems/site/sblb/index.vue
@ -3,7 +3,7 @@
  <div class="ems-dashboard-editor-container" style="background-color: #ffffff" v-loading="loading">
    <el-form :inline="true" class="select-container">
        <el-form-item label="站点选择">
-          <el-select v-model="siteId" placeholder="请选择换电站名称" :loading="loading" loading-text="正在加载数据" @change="onSearch" clearable>
+          <el-select v-model="siteId" placeholder="请选择换电站名称" :loading="searchLoading" loading-text="正在加载数据" @change="onSearch" clearable>
            <el-option :label="item.siteName" :value="item.siteId" v-for="(item,index) in siteList" :key="index+'zdxeSelect'"></el-option>
          </el-select>
        </el-form-item>