Merge branch 'master' of http://git.xt.wenhq.top:8083/hs/zhny_ui

ems-ui/src/api/basecfg/electricity.js → ems-ui/src/api/basecfg/elecAttr.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询服务区用电属性列表
 export function listAttr(query) {
   return request({
-    url: '/ems/basecfg/electricity/attr/list',
+    url: '/ems/basecfg/elec/attr/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listAttr(query) {
 // 查询服务区用电属性详细
 export function getAttr(id) {
   return request({
-    url: '/ems/basecfg/electricity/attr/' + id,
+    url: '/ems/basecfg/elec/attr/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getAttr(id) {
 // 新增服务区用电属性
 export function addAttr(data) {
   return request({
-    url: '/ems/basecfg/electricity/attr',
+    url: '/ems/basecfg/elec/attr',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addAttr(data) {
 // 修改服务区用电属性
 export function updateAttr(data) {
   return request({
-    url: '/ems/basecfg/electricity/attr',
+    url: '/ems/basecfg/elec/attr',
     method: 'put',
     data: data
   })
@@ -38,15 +38,7 @@ export function updateAttr(data) {
 // 删除服务区用电属性
 export function delAttr(id) {
   return request({
-    url: '/ems/basecfg/electricity/attr/' + id,
+    url: '/ems/basecfg/elec/attr/' + id,
     method: 'delete'
   })
 }
-
-// 获取电价配置
-export function getElecConfig() {
-  return request({
-    url: '/ems/basecfg/electricity/config/list',
-    method: 'get'
-  })
-}

ems-ui/src/api/basecfg/elecvalency.js → ems-ui/src/api/basecfg/elecGwPrice.js

@@ -1,52 +1,52 @@
 import request from '@/utils/request'
 
 // 查询电价配置列表
-export function listValency(query) {
+export function listGwPriceConfig(query) {
   return request({
-    url: '/ems/basecfg/elecvalency/list',
+    url: '/ems/basecfg/elecPrice/gw/list',
     method: 'get',
     params: query
   })
 }
 
 // 列出所有
-export function listValencyAll() {
+export function listGwPriceConfigAll() {
   return request({
-    url: '/ems/basecfg/elecvalency/listall',
+    url: '/ems/basecfg/elecPrice/gw/listall',
     method: 'get'
   })
 }
 
 // 查询电价配置详细
-export function getValency(id) {
+export function getGwPriceConfig(id) {
   return request({
-    url: '/ems/basecfg/elecvalency/' + id,
+    url: '/ems/basecfg/elecPrice/gw/' + id,
     method: 'get'
   })
 }
 
 // 新增电价配置
-export function addValency(data) {
+export function addGwPriceConfig(data) {
   return request({
-    url: '/ems/basecfg/elecvalency',
+    url: '/ems/basecfg/elecPrice/gw',
     method: 'post',
     data: data
   })
 }
 
 // 修改电价配置
-export function updateValency(data) {
+export function updateGwPriceConfig(data) {
   return request({
-    url: '/ems/basecfg/elecvalency',
+    url: '/ems/basecfg/elecPrice/gw',
     method: 'put',
     data: data
   })
 }
 
 // 删除电价配置
-export function delValency(id) {
+export function delGwPriceConfig(id) {
   return request({
-    url: '/ems/basecfg/elecvalency/' + id,
+    url: '/ems/basecfg/elecPrice/gw/' + id,
     method: 'delete'
   })
 }

ems-ui/src/api/basecfg/pvprice.js → ems-ui/src/api/basecfg/elecPvPrice.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询光伏电价配置列表
 export function listPvPriceConfig(query) {
   return request({
-    url: '/ems/basecfg/pvprice/list',
+    url: '/ems/basecfg/elecPrice/pv/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listPvPriceConfig(query) {
 // 查询光伏电价配置详细
 export function getPvPriceConfig(id) {
   return request({
-    url: '/ems/basecfg/pvprice/' + id,
+    url: '/ems/basecfg/elecPrice/pv/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getPvPriceConfig(id) {
 // 新增光伏电价配置
 export function addPvPriceConfig(data) {
   return request({
-    url: '/ems/basecfg/pvprice',
+    url: '/ems/basecfg/elecPrice/pv',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addPvPriceConfig(data) {
 // 修改光伏电价配置
 export function updatePvPriceConfig(data) {
   return request({
-    url: '/ems/basecfg/pvprice',
+    url: '/ems/basecfg/elecPrice/pv',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updatePvPriceConfig(data) {
 // 删除光伏电价配置
 export function delPvPriceConfig(id) {
   return request({
-    url: '/ems/basecfg/pvprice/' + id,
+    url: '/ems/basecfg/elecPrice/pv/' + id,
     method: 'delete'
   })
 }

ems-ui/src/api/commonApi.js

@@ -1,9 +1,9 @@
 import request from '@/utils/request';
 
 // 查询用电分类
-export function getElecValencyType(){
+export function getElecPriceType(){
   return request({
-    url: '/ems/common/elecvalency/type',
+    url: '/ems/common/elecprice/type',
     method: 'get'
   })
 }

ems-ui/src/views/basecfg/price/index.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="app-container">
+    <!-- 国网电价配置 -->
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">电价策略</el-col>
+      <el-col :span="1.5">国网电价</el-col>
     </el-row>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -10,21 +11,26 @@
           plain
           icon="el-icon-plus"
           size="mini"
-          @click="handleAttrAdd"
+          @click="handleGwPriceAdd"
           v-hasPermi="['basecfg:price:add']"
         >新增</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getAttrList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getGwPriceList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="attrList" >
-      <el-table-column label="服务区" align="center" prop="areaName" />
+    <el-table v-loading="loading" :data="gwPriceList">
       <el-table-column label="用电分类" align="center" prop="elecTypeName" />
       <el-table-column label="电压等级" align="center" prop="voltageLevel" />
-      <el-table-column label="容(需)量策略" align="center">
-      <el-table-column label="容(需）量类型" align="center" prop="reqCapacityFlag" :formatter="matchReqCapacityFlag" />
-      <el-table-column label="变压器容量（千伏·安）" align="center" prop="transCapacity" />
-      <el-table-column label="最大需量（千瓦）" align="center" prop="reqQuantity" />
+      <el-table-column label="电度用电价格" align="center" prop="degreePrice" />
+      <el-table-column label="分时电度用电价格" align="center">
+        <el-table-column label="尖峰时段" align="center" prop="fsPeakDegreePrice" />
+        <el-table-column label="高峰时段" align="center" prop="fsHighDegreePrice" />
+        <el-table-column label="平峰时段" align="center" prop="fsFlatDegreePrice" />
+        <el-table-column label="低谷时段" align="center" prop="fsLowDegreePrice" />
+      </el-table-column>
+      <el-table-column label="容(需)量用电价格" align="center">
+        <el-table-column label="最大需量 (元/千瓦时·月)"  align="center" prop="maxReqPrice" width="80px"/>
+        <el-table-column label="变压器容量（元/千伏安·月）" align="center" prop="transCapacityPrice" width="80px"/>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -32,14 +38,14 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            @click="handleAttrUpdate(scope.row)"
+            @click="handleGwPriceUpdate(scope.row)"
             v-hasPermi="['basecfg:price:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-            @click="handleAttrDelete(scope.row)"
+            @click="handleGwPriceDelete(scope.row)"
             v-hasPermi="['basecfg:price:remove']"
           >删除</el-button>
         </template>
@@ -49,44 +55,55 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryAttrParams.pageNum"
-      :limit.sync="queryAttrParams.pageSize"
-      @pagination="getAttrList"
+      :page.sync="queryGwPriceParams.pageNum"
+      :limit.sync="queryGwPriceParams.pageSize"
+      @pagination="getGwPriceList"
     />
-    <!-- 添加或修改服务区用电属性对话框 -->
-    <el-dialog :title="title" :visible.sync="attrOpen" width="500px" append-to-body>
-      <el-form ref="attrForm" :model="attrForm" :rules="attrRules" label-width="150px">
-        <el-form-item label="园区" prop="areaCode">
-          <el-select v-model="attrForm.areaCode">
-            <el-option v-for="item in areaOptions" :label="item.label" :value="item.id" :key="item.id" />
-          </el-select>
+
+    <!-- 添加或修改电价配置对话框 -->
+    <el-dialog :title="title" :visible.sync="gwPriceCfgOpen" width="500px" append-to-body>
+      <el-form ref="gwPriceForm" :model="gwPriceForm" :rules="gwPriceRules" label-width="150px">
+        <el-form-item label="配置代码" prop="cfgCode">
+          <el-input v-model="gwPriceForm.cfgCode" maxlength="4" placeholder="请输入配置代码" />
         </el-form-item>
-        <el-form-item label="价格策略" prop="priceCode" >
-          <el-select v-model="attrForm.priceCode">
-            <el-option v-for="item in valencyOptions" :label="`${item.elecTypeName}&lt;${item.voltageLevel}&gt;`" :value="item.cfgCode" :key="item.cfgCode" />
+        <el-form-item label="用电分类" prop="elecType">
+          <el-select v-model="gwPriceForm.elecType">
+            <el-option v-for="item in priceTypeOptions" :label="item.name" :value="item.code" :key="item.code" />
           </el-select>
         </el-form-item>
-        <el-form-item label="容(需）量类型" prop="reqCapacityFlag">
-          <el-select v-model="attrForm.reqCapacityFlag">
-            <el-option v-for="item in reqCapacityOptions" :label="item.name" :value="item.code" :key="item.code" />
-          </el-select>
+        <el-form-item label="电压等级" prop="voltageLevel">
+          <el-input v-model="gwPriceForm.voltageLevel" placeholder="请输入电压等级" />
         </el-form-item>
-        <el-form-item label="变压器容量(kVA/月)" prop="transCapacity" v-if="attrForm.reqCapacityFlag === 1">
-          <el-input v-model="attrForm.transCapacity" placeholder="请输入变压器容量" />
+        <el-form-item label="电度用电价格" prop="degreePrice">
+          <el-input v-model="gwPriceForm.degreePrice" placeholder="请输入电度用电价格" />
         </el-form-item>
-        <el-form-item label="最大需量(kW·h/月)" prop="reqQuantity" v-if="attrForm.reqCapacityFlag === 2">
-          <el-input v-model="attrForm.reqQuantity" placeholder="请输入最大需量" />
+        <el-form-item label="尖峰时段价格" prop="fsPeakDegreePrice">
+          <el-input v-model="gwPriceForm.fsPeakDegreePrice" placeholder="请输入分时尖峰时段价格" />
+        </el-form-item>
+        <el-form-item label="高峰时段价格" prop="fsHighDegreePrice">
+          <el-input v-model="gwPriceForm.fsHighDegreePrice" placeholder="请输入分时高峰时段价格" />
+        </el-form-item>
+        <el-form-item label="平峰时段价格" prop="fsFlatDegreePrice">
+          <el-input v-model="gwPriceForm.fsFlatDegreePrice" placeholder="请输入分时平峰时段价格" />
+        </el-form-item>
+        <el-form-item label="低谷时段价格" prop="fsLowDegreePrice">
+          <el-input v-model="gwPriceForm.fsLowDegreePrice" placeholder="请输入分时低谷时段价格" />
+        </el-form-item>
+        <el-form-item label="最大需量用电价格" prop="maxReqPrice" v-if="gwPriceForm.elecType === 4">
+          <el-input v-model="gwPriceForm.maxReqPrice" placeholder="请输入最大需量用电价格" />
+        </el-form-item>
+        <el-form-item label="变压器容量用电价格" prop="transCapacityPrice" v-if="gwPriceForm.elecType === 4">
+          <el-input v-model="gwPriceForm.transCapacityPrice" placeholder="请输入变压器容量用电价格" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitAttrForm">确 定</el-button>
-        <el-button @click="attrCancel">取 消</el-button>
+        <el-button type="primary" @click="submitGwPriceForm">确 定</el-button>
+        <el-button @click="gwPriceCancel">取 消</el-button>
       </div>
     </el-dialog>
 
-    <!-- 国网电价配置 -->
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">国网电价</el-col>
+      <el-col :span="1.5">电价策略</el-col>
     </el-row>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -95,26 +112,21 @@
           plain
           icon="el-icon-plus"
           size="mini"
-          @click="handleValencyAdd"
+          @click="handleAttrAdd"
           v-hasPermi="['basecfg:price:add']"
         >新增</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getValencyList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getAttrList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="valencyList">
+    <el-table v-loading="loading" :data="attrList" >
+      <el-table-column label="服务区" align="center" prop="areaName" />
       <el-table-column label="用电分类" align="center" prop="elecTypeName" />
       <el-table-column label="电压等级" align="center" prop="voltageLevel" />
-      <el-table-column label="电度用电价格" align="center" prop="degreePrice" />
-      <el-table-column label="分时电度用电价格" align="center">
-        <el-table-column label="尖峰时段" align="center" prop="fsPeakDegreePrice" />
-        <el-table-column label="高峰时段" align="center" prop="fsHighDegreePrice" />
-        <el-table-column label="平峰时段" align="center" prop="fsFlatDegreePrice" />
-        <el-table-column label="低谷时段" align="center" prop="fsLowDegreePrice" />
-      </el-table-column>
-      <el-table-column label="容(需)量用电价格" align="center">
-        <el-table-column label="最大需量 (元/千瓦时·月)"  align="center" prop="maxReqPrice" width="80px"/>
-        <el-table-column label="变压器容量（元/千伏安·月）" align="center" prop="transCapacityPrice" width="80px"/>
+      <el-table-column label="容(需)量策略" align="center">
+      <el-table-column label="容(需）量类型" align="center" prop="reqCapacityFlag" :formatter="matchReqCapacityFlag" />
+      <el-table-column label="变压器容量（千伏·安）" align="center" prop="transCapacity" />
+      <el-table-column label="最大需量（千瓦）" align="center" prop="reqQuantity" />
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -122,14 +134,14 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            @click="handleValencyUpdate(scope.row)"
+            @click="handleAttrUpdate(scope.row)"
             v-hasPermi="['basecfg:price:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-            @click="handleValencyDelete(scope.row)"
+            @click="handleAttrDelete(scope.row)"
             v-hasPermi="['basecfg:price:remove']"
           >删除</el-button>
         </template>
@@ -139,50 +151,38 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryValencyParams.pageNum"
-      :limit.sync="queryValencyParams.pageSize"
-      @pagination="getValencyList"
+      :page.sync="queryAttrParams.pageNum"
+      :limit.sync="queryAttrParams.pageSize"
+      @pagination="getAttrList"
     />
-
-    <!-- 添加或修改电价配置对话框 -->
-    <el-dialog :title="title" :visible.sync="valencyOpen" width="500px" append-to-body>
-      <el-form ref="valencyForm" :model="valencyFrom" :rules="valencyRules" label-width="150px">
-        <el-form-item label="配置代码" prop="cfgCode">
-          <el-input v-model="valencyFrom.cfgCode" maxlength="4" placeholder="请输入配置代码" />
-        </el-form-item>
-        <el-form-item label="用电分类" prop="elecType">
-          <el-select v-model="valencyFrom.elecType">
-            <el-option v-for="item in valencyTypeOptions" :label="item.name" :value="item.code" :key="item.code" />
+    <!-- 添加或修改服务区用电属性对话框 -->
+    <el-dialog :title="title" :visible.sync="attrOpen" width="500px" append-to-body>
+      <el-form ref="attrForm" :model="attrForm" :rules="attrRules" label-width="150px">
+        <el-form-item label="园区" prop="areaCode">
+          <el-select v-model="attrForm.areaCode">
+            <el-option v-for="item in areaOptions" :label="item.label" :value="item.id" :key="item.id" />
           </el-select>
         </el-form-item>
-        <el-form-item label="电压等级" prop="voltageLevel">
-          <el-input v-model="valencyFrom.voltageLevel" placeholder="请输入电压等级" />
-        </el-form-item>
-        <el-form-item label="电度用电价格" prop="degreePrice">
-          <el-input v-model="valencyFrom.degreePrice" placeholder="请输入电度用电价格" />
-        </el-form-item>
-        <el-form-item label="尖峰时段价格" prop="fsPeakDegreePrice">
-          <el-input v-model="valencyFrom.fsPeakDegreePrice" placeholder="请输入分时尖峰时段价格" />
-        </el-form-item>
-        <el-form-item label="高峰时段价格" prop="fsHighDegreePrice">
-          <el-input v-model="valencyFrom.fsHighDegreePrice" placeholder="请输入分时高峰时段价格" />
-        </el-form-item>
-        <el-form-item label="平峰时段价格" prop="fsFlatDegreePrice">
-          <el-input v-model="valencyFrom.fsFlatDegreePrice" placeholder="请输入分时平峰时段价格" />
+        <el-form-item label="价格策略" prop="priceCode" >
+          <el-select v-model="attrForm.priceCode">
+            <el-option v-for="item in gwPriceOptions" :label="`${item.elecTypeName}&lt;${item.voltageLevel}&gt;`" :value="item.cfgCode" :key="item.cfgCode" />
+          </el-select>
         </el-form-item>
-        <el-form-item label="低谷时段价格" prop="fsLowDegreePrice">
-          <el-input v-model="valencyFrom.fsLowDegreePrice" placeholder="请输入分时低谷时段价格" />
+        <el-form-item label="容(需）量类型" prop="reqCapacityFlag">
+          <el-select v-model="attrForm.reqCapacityFlag">
+            <el-option v-for="item in reqCapacityOptions" :label="item.name" :value="item.code" :key="item.code" />
+          </el-select>
         </el-form-item>
-        <el-form-item label="最大需量用电价格" prop="maxReqPrice" v-if="valencyFrom.elecType === 4">
-          <el-input v-model="valencyFrom.maxReqPrice" placeholder="请输入最大需量用电价格" />
+        <el-form-item label="变压器容量(kVA/月)" prop="transCapacity" v-if="attrForm.reqCapacityFlag === 1">
+          <el-input v-model="attrForm.transCapacity" placeholder="请输入变压器容量" />
         </el-form-item>
-        <el-form-item label="变压器容量用电价格" prop="transCapacityPrice" v-if="valencyFrom.elecType === 4">
-          <el-input v-model="valencyFrom.transCapacityPrice" placeholder="请输入变压器容量用电价格" />
+        <el-form-item label="最大需量(kW·h/月)" prop="reqQuantity" v-if="attrForm.reqCapacityFlag === 2">
+          <el-input v-model="attrForm.reqQuantity" placeholder="请输入最大需量" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitValencyForm">确 定</el-button>
-        <el-button @click="valencyCancel">取 消</el-button>
+        <el-button type="primary" @click="submitAttrForm">确 定</el-button>
+        <el-button @click="attrCancel">取 消</el-button>
       </div>
     </el-dialog>
 
@@ -223,21 +223,21 @@
 
     <!-- 添加或修改电价配置对话框 -->
     <el-dialog :title="title" :visible.sync="pvPriceOpen" width="500px" append-to-body>
-      <el-form ref="pvPriceFrom" :model="pvPriceFrom" :rules="pvPriceRules" label-width="150px">
+      <el-form ref="pvPriceForm" :model="pvPriceForm" :rules="pvPriceRules" label-width="150px">
         <el-form-item label="配置代码" prop="cfgCode">
-          <el-input v-model="pvPriceFrom.cfgCode"  placeholder="请输入配置代码" />
+          <el-input v-model="pvPriceForm.cfgCode"  placeholder="请输入配置代码" />
         </el-form-item>
         <el-form-item label="价格名称" prop="priceName">
-          <el-input v-model="pvPriceFrom.priceName"  placeholder="请输入价格名称" />
+          <el-input v-model="pvPriceForm.priceName"  placeholder="请输入价格名称" />
         </el-form-item>
         <el-form-item label="用户/脱硫煤电价" prop="objPrice">
-          <el-input v-model="pvPriceFrom.objPrice" placeholder="请输入价格" />
+          <el-input v-model="pvPriceForm.objPrice" placeholder="请输入价格" />
         </el-form-item>
         <el-form-item label="国家补贴" prop="stateSubsidy">
-          <el-input v-model="pvPriceFrom.stateSubsidy" placeholder="请输入国家补贴" />
+          <el-input v-model="pvPriceForm.stateSubsidy" placeholder="请输入国家补贴" />
         </el-form-item>
         <el-form-item label="地方补贴" prop="localSubsidy">
-          <el-input v-model="pvPriceFrom.localSubsidy" placeholder="请输入国家补贴" />
+          <el-input v-model="pvPriceForm.localSubsidy" placeholder="请输入国家补贴" />
         </el-form-item>
 
       </el-form>
@@ -250,16 +250,10 @@
 </template>
 
 <script>
-import { listAttr, getAttr, delAttr, addAttr, updateAttr } from "@/api/basecfg/electricity";
-import { listValency, listValencyAll, getValency, addValency, delValency, updateValency } from '@/api/basecfg/elecvalency'
-import {
-  addPvPriceConfig,
-  delPvPriceConfig,
-  getPvPriceConfig,
-  listPvPriceConfig,
-  updatePvPriceConfig
-} from '@/api/basecfg/pvprice'
-import { getElecValencyType } from '@/api/commonApi'
+import { listAttr, getAttr, delAttr, addAttr, updateAttr } from "@/api/basecfg/elecAttr";
+import { listGwPriceConfig, listGwPriceConfigAll, getGwPriceConfig, addGwPriceConfig, delGwPriceConfig, updateGwPriceConfig } from '@/api/basecfg/elecGwPrice'
+import { addPvPriceConfig, delPvPriceConfig, getPvPriceConfig, listPvPriceConfig, updatePvPriceConfig } from '@/api/basecfg/elecPvPrice'
+import { getElecPriceType } from '@/api/commonApi'
 import { areaTreeSelect } from "@/api/basecfg/area"
 
 export default {
@@ -281,21 +275,21 @@ export default {
       // 服务区用电属性表格数据
       attrList: [],
       // 电价表格
-      valencyList: [],
+      gwPriceList: [],
       // 光伏电价
       pvPriceList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       attrOpen: false,
-      valencyOpen: false,
+      gwPriceCfgOpen: false,
       pvPriceOpen: false,
       // 选项定义
-      valencyTypeOptions: undefined,
+      priceTypeOptions: undefined,
       areaOptions: undefined,
-      valencyOptions: undefined,
+      gwPriceOptions: undefined,
       // 查询参数
-      queryValencyParams: {
+      queryGwPriceParams: {
         pageNum: 1,
         pageSize: 10
       },
@@ -309,10 +303,10 @@ export default {
       },
       // 表单参数
       attrForm: {},
-      valencyFrom: {},
-      pvPriceFrom: {},
+      gwPriceForm: {},
+      pvPriceForm: {},
       // 表单校验
-      valencyRules: {
+      gwPriceRules: {
         cfgCode: [
           { required: true, message: "配置代码不为空", trigger: "blur" }
         ],
@@ -353,27 +347,27 @@ export default {
   },
   created() {
     this.getAttrList();
-    this.getValencyList();
+    this.getGwPriceList();
     this.getPvPriceList();
-    this.getValencyType();
+    this.getPriceType();
   },
   methods: {
-    getValencyList() {
+    getGwPriceList() {
       this.loading = true;
-      listValency(this.queryValencyParams).then(response => {
-        this.valencyList = response.rows;
+      listGwPriceConfig(this.queryGwPriceParams).then(response => {
+        this.gwPriceList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
     // 取消按钮
-    valencyCancel() {
-      this.valencyOpen = false;
-      this.valencyReset();
+    gwPriceCancel() {
+      this.gwPriceCfgOpen = false;
+      this.gwPriceReset();
     },
     // 表单重置
-    valencyReset() {
-      this.valencyFrom = {
+    gwPriceReset() {
+      this.gwPriceForm = {
         id: null,
         cfgCode: null,
         elecType: null,
@@ -386,51 +380,51 @@ export default {
         maxReqPrice: null,
         transCapacityPrice: null
       };
-      this.resetForm("valencyForm");
+      this.resetForm("gwPriceForm");
     },
     /** 新增按钮操作 */
-    handleValencyAdd() {
-      this.valencyReset();
-      this.valencyOpen = true;
+    handleGwPriceAdd() {
+      this.gwPriceReset();
+      this.gwPriceCfgOpen = true;
       this.title = "添加电价配置";
     },
     /** 修改按钮操作 */
-    handleValencyUpdate(row) {
-      this.valencyReset();
+    handleGwPriceUpdate(row) {
+      this.gwPriceReset();
       const id = row.id || this.ids
-      getValency(id).then(response => {
-        this.valencyFrom = response.data;
-        this.valencyOpen = true;
+      getGwPriceConfig(id).then(response => {
+        this.gwPriceForm = response.data;
+        this.gwPriceCfgOpen = true;
         this.title = "修改电价配置";
       });
     },
     /** 提交按钮 */
-    submitValencyForm() {
-      this.$refs["valencyForm"].validate(valid => {
+    submitGwPriceForm() {
+      this.$refs["gwPriceForm"].validate(valid => {
         if (valid) {
-          if (this.valencyFrom.id != null) {
-            updateValency(this.valencyFrom).then(response => {
+          if (this.gwPriceForm.id != null) {
+            updateGwPriceConfig(this.gwPriceForm).then(response => {
               this.$modal.msgSuccess("修改成功");
-              this.valencyOpen = false;
-              this.getValencyList();
+              this.gwPriceCfgOpen = false;
+              this.getGwPriceList();
             });
           } else {
-            addValency(this.valencyFrom).then(response => {
+            addGwPriceConfig(this.gwPriceForm).then(response => {
               this.$modal.msgSuccess("新增成功");
-              this.valencyOpen = false;
-              this.getValencyList();
+              this.gwPriceCfgOpen = false;
+              this.getGwPriceList();
             });
           }
         }
       });
     },
     /** 删除按钮操作 */
-    handleValencyDelete(row) {
+    handleGwPriceDelete(row) {
       const ids = row.id || this.ids;
       this.$modal.confirm('是否确认删除电价配置编号为"' + ids + '"的数据项？').then(function() {
-        return delValency(ids);
+        return delGwPriceConfig(ids);
       }).then(() => {
-        this.getValencyList();
+        this.getGwPriceList();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
@@ -468,20 +462,20 @@ export default {
       this.queryAttrParams.pageNum = 1;
       this.getAttrList();
     },
-    handleValencyQuery() {
-      this.queryValencyParams.pageNum = 1;
-      this.getValencyList();
+    handleGwPriceQuery() {
+      this.queryGwPriceParams.pageNum = 1;
+      this.getGwPriceList();
     },
     /** 重置按钮操作 */
     resetQuery() {
       this.handleAttrQuery();
-      this.handleValencyQuery();
+      this.handleGwPriceQuery();
     },
     /** 新增按钮操作 */
     handleAttrAdd() {
       this.attrReset();
       this.getAreaList("Area");
-      this.getValencyAll();
+      this.getGwPriceAll();
       this.attrOpen = true;
       this.title = "添加服务区用电属性";
     },
@@ -489,7 +483,7 @@ export default {
     handleAttrUpdate(row) {
       this.attrReset();
       this.getAreaList("Area");
-      this.getValencyAll();
+      this.getGwPriceAll();
       const id = row.id || this.ids
       getAttr(id).then(response => {
         this.attrForm = response.data;
@@ -542,7 +536,7 @@ export default {
     },
     // 表单重置
     pvPriceReset() {
-      this.pvPriceFrom = {
+      this.pvPriceForm = {
         id: null,
         cfgCode: null,
         priceName: null,
@@ -550,7 +544,7 @@ export default {
         stateSubsidy: null,
         localSubsidy: null
       };
-      this.resetForm("pvPriceFrom");
+      this.resetForm("pvPriceForm");
     },
     /** 新增按钮操作 */
     handlePvPriceAdd() {
@@ -563,23 +557,23 @@ export default {
       this.pvPriceReset();
       const id = row.id || this.ids
       getPvPriceConfig(id).then(response => {
-        this.pvPriceFrom = response.data;
+        this.pvPriceForm = response.data;
         this.pvPriceOpen = true;
         this.title = "修改光伏电价配置";
       });
     },
     /** 提交按钮 */
     submitPvPriceForm() {
-      this.$refs["pvPriceFrom"].validate(valid => {
+      this.$refs["pvPriceForm"].validate(valid => {
         if (valid) {
-          if (this.pvPriceFrom.id != null) {
-            updatePvPriceConfig(this.pvPriceFrom).then(response => {
+          if (this.pvPriceForm.id != null) {
+            updatePvPriceConfig(this.pvPriceForm).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.pvPriceOpen = false;
               this.getPvPriceList();
             });
           } else {
-            addPvPriceConfig(this.pvPriceFrom).then(response => {
+            addPvPriceConfig(this.pvPriceForm).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.pvPriceOpen = false;
               this.getPvPriceList();
@@ -606,9 +600,9 @@ export default {
       };
       return reqCapacityFlagMap[cellValue] || '未知';
     },
-    getValencyType() {
-      getElecValencyType().then(response => {
-        this.valencyTypeOptions = response.data;
+    getPriceType() {
+      getElecPriceType().then(response => {
+        this.priceTypeOptions = response.data;
       });
     },
     // 查询区域列表
@@ -617,9 +611,9 @@ export default {
         this.areaOptions = response.data;
       });
     },
-    getValencyAll() {
-      listValencyAll().then(response =>{
-        this.valencyOptions = response.data;
+    getGwPriceAll() {
+      listGwPriceConfigAll().then(response =>{
+        this.gwPriceOptions = response.data;
       })
     }
   }