diff --git a/src/api/ems/powerTariff.js b/src/api/ems/powerTariff.js index 6a00ad3..ff058fe 100644 --- a/src/api/ems/powerTariff.js +++ b/src/api/ems/powerTariff.js @@ -24,12 +24,11 @@ export function energyPriceConfig(id) { method: 'DELETE', }) } -//列表 -export function detailPriceConfig(data) { +//详情 +export function detailPriceConfig(id) { return request({ - url: `/ems/energyPriceConfig/todo`, + url: `/ems/energyPriceConfig/${id}`, method: 'get', - data }) } @@ -39,4 +38,5 @@ export function listPriceConfig({startTime,endTime,pageSize,pageNum}) { url: `/ems/energyPriceConfig/list?startTime=${startTime}&endTime=${endTime}&pageNum=${pageNum}&pageSize=${pageSize}`, method: 'get', }) -} \ No newline at end of file +} + diff --git a/src/views/ems/powerTariff/AddPowerTariff.vue b/src/views/ems/powerTariff/AddPowerTariff.vue index 5c3def0..9e44c0d 100644 --- a/src/views/ems/powerTariff/AddPowerTariff.vue +++ b/src/views/ems/powerTariff/AddPowerTariff.vue @@ -142,14 +142,14 @@ export default { this.mode='edit' //获取详情 初始化hoursOptions this.loading = true - detailPriceConfig({id}).then(response => { + detailPriceConfig(id).then(response => { const data = response?.data || {} this.hoursOptions = data?.range || [] this.powerDate=data?.year && data?.month ? data.year +'-'+data.month : '' this.priceTypeOptions.forEach(item=>{ - item.price = data[item.id] || '' + item.price = data[item.id] }) - }) + }).finally(()=>this.loading = false) }else { this.mode='add' } diff --git a/src/views/ems/powerTariff/index.vue b/src/views/ems/powerTariff/index.vue index 49a5104..a9dbd65 100644 --- a/src/views/ems/powerTariff/index.vue +++ b/src/views/ems/powerTariff/index.vue @@ -11,12 +11,12 @@ format="yyyy年" value-format="yyyy" :picker-options="pickerOptions" + @change="changeDefaultYear" > - 搜索 - 新增电价配置 + 新增电价配置
@@ -29,9 +29,10 @@ >
{{item.month}}月电价时段划分 - - - +
+ 编辑 + 删除 +
@@ -71,25 +72,20 @@ export default { return time.getFullYear() >= new Date().getFullYear()+1; }, }, - priceTypeOptions:[{ - id:'peak', - name:'尖', - },{ - id:'high', - name:'峰', - },{ - id:'flat', - name:'平', - },{ - id:'valley', - name:'谷', - }], + priceTypeOptions:{ + 'peak':'尖', + 'high':'峰', + 'flat':'平', + 'valley':'谷' + }, } }, methods:{ + changeDefaultYear(){ + this.getData(); + }, getData(){ this.loading=true; - console.log('this.defaultYear=====',this.defaultYear) const date = new Date(this.defaultYear).getFullYear() const startTime = date+'-01',endTime = date+'-12' listPriceConfig({startTime,endTime,pageNum:1,pageSize:20}).then(response => { @@ -109,7 +105,7 @@ export default { beforeClose: (action, instance, done) => { if (action === 'confirm') { instance.confirmButtonLoading = true; - energyPriceConfig({id:row.id}).then(response => { + energyPriceConfig(row.id).then(response => { response.code === 200 && done(); }).finally(() => { instance.confirmButtonLoading = false; @@ -140,14 +136,12 @@ export default {