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
     })
 }
 
@@ -40,3 +39,4 @@ export function listPriceConfig({startTime,endTime,pageSize,pageNum}) {
         method: 'get',
     })
 }
+

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'
       }

src/views/ems/powerTariff/index.vue

@@ -11,12 +11,12 @@
             format="yyyy年"
             value-format="yyyy"
             :picker-options="pickerOptions"
+            @change="changeDefaultYear"
           >
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="getData">搜索</el-button>
+        <el-button type="primary" @click="addPowerConfig('')">新增电价配置</el-button>
-        <el-button type="success" @click="addPowerConfig('')">新增电价配置</el-button>
       </el-form-item>
     </el-form>
     <div class="month-lists-container">
@@ -29,9 +29,10 @@
       >
         <div slot="header" class="time-range-header">
           <span class="card-title">{{item.month}}月电价时段划分</span>
-
+          <div>
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="addPowerConfig(item.id)"></el-button>
+            <el-button type="primary" size="mini" @click="addPowerConfig(item.id)">编辑</el-button>
-          <el-button type="warning" icon="el-icon-edit" size="mini" @click="deletePowerConfig(item)"></el-button>
+            <el-button type="warning" size="mini" @click="deletePowerConfig(item)">删除</el-button>
+          </div>
         </div>
         <div class="price-table-container">
           <div class="price-table">
@@ -71,25 +72,20 @@ export default {
           return time.getFullYear() >= new Date().getFullYear()+1;
         },
       },
-      priceTypeOptions:[{
+      priceTypeOptions:{
-        id:'peak',
+        'peak':'尖',
-        name:'尖',
+        'high':'峰',
-      },{
+        'flat':'平',
-        id:'high',
+        'valley':'谷'
-        name:'峰',
+      },
-      },{
-        id:'flat',
-        name:'平',
-      },{
-        id:'valley',
-        name:'谷',
-      }],
     }
   },
   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 {
 
 <style lang="scss" scoped>
 .common-card-container{
-  width: fit-content;
+  width: 100%;
-  max-width: 100%;
   margin-top: 20px;
 }
 .price-table-container{
   overflow-x: auto;
   .price-table{
-    margin: 0 auto;
     border:1px solid #eee;
     width: fit-content;
     overflow-x: auto;

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

@@ -3,13 +3,13 @@
   <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">
+          <el-select v-model="siteId" placeholder="请选择换电站名称" :loading="loading" 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>
 <!--        <el-button type="primary" @click="onSearch" native-type="button">搜索</el-button>-->
-        <el-button @click="onReset" native-type="button">重置</el-button>
+<!--        <el-button @click="onReset" native-type="button">重置</el-button>-->
       </el-form-item>
     </el-form>
     <el-button type="primary" @click="addDevice" native-type="button">新增设备</el-button>