电价配置修改

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

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

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

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

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

@@ -139,9 +139,9 @@
 
     <!-- 添加或修改服务区对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="180px">
         <el-form-item label="服务区代码" prop="areaCode">
-          <el-input v-model="form.areaCode" placeholder="请输入服务区代码" />
+          <el-input v-model="form.areaCode" placeholder="请输入服务区代码" :readonly="isReadOnly"/>
         </el-form-item>
         <el-form-item label="服务区名称" prop="areaName">
           <el-input v-model="form.areaName" placeholder="请输入服务区名称" />
@@ -221,6 +221,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      isReadOnly: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -312,11 +313,13 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
+      this.isReadOnly = false;
       this.title = "添加服务区";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.isReadOnly = true;
       const id = row.id || this.ids
       getArea(id).then(response => {
         this.form = response.data;

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

@@ -130,7 +130,7 @@
         <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
           <el-form ref="form" :model="form" :rules="rules" label-width="80px">
             <el-form-item label="建筑编码" prop="bldgCode">
-              <el-input v-model="form.bldgCode" placeholder="请输入建筑编码" />
+              <el-input v-model="form.bldgCode" placeholder="请输入建筑编码" :readonly="isReadOnly"/>
             </el-form-item>
             <el-form-item label="建筑名称" prop="bldgName">
               <el-input v-model="form.bldgName" placeholder="请输入建筑名称" />
@@ -204,6 +204,7 @@ export default {
         children: "children",
         label: "label"
       },
+      isReadOnly: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -308,11 +309,13 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
+      this.isReadOnly = false;
       this.title = "添加建筑基本信息";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.isReadOnly = false;
       const id = row.id || this.ids
       getPremises(id).then(response => {
         this.form = response.data;

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

@@ -0,0 +1,469 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">国网电价</el-col>
+    </el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleValencyAdd"
+          v-hasPermi="['basecfg:electricity:add']"
+        >新增</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getValencyList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="valencyList">
+      <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>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleValencyUpdate(scope.row)"
+            v-hasPermi="['basecfg:electricity:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleValencyDelete(scope.row)"
+            v-hasPermi="['basecfg:electricity:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getValencyList"
+    />
+
+    <!-- 添加或修改电价配置对话框 -->
+    <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-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>
+        <el-form-item label="低谷时段价格" prop="fsLowDegreePrice">
+          <el-input v-model="valencyFrom.fsLowDegreePrice" placeholder="请输入分时低谷时段价格" />
+        </el-form-item>
+        <el-form-item label="最大需量用电价格" prop="maxReqPrice">
+          <el-input v-model="valencyFrom.maxReqPrice" placeholder="请输入最大需量用电价格" />
+        </el-form-item>
+        <el-form-item label="变压器容量用电价格" prop="transCapacityPrice">
+          <el-input v-model="valencyFrom.transCapacityPrice" 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>
+      </div>
+    </el-dialog>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">价格策略</el-col>
+    </el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAttrAdd"
+          v-hasPermi="['basecfg:electricity:add']"
+        >新增</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getAttrList"></right-toolbar>
+    </el-row>
+
+    <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="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" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleAttrUpdate(scope.row)"
+            v-hasPermi="['basecfg:electricity:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleAttrDelete(scope.row)"
+            v-hasPermi="['basecfg:electricity:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getAttrList"
+    />
+    <!-- 添加或修改服务区用电属性对话框 -->
+    <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="priceCode" >
+          <el-select v-model="attrForm.priceCode">
+            <el-option v-for="item in valencyOptions" :label="`${item.elecTypeName} - ${item.voltageLevel}`" :value="item.cfgCode" :key="item.cfgCode" />
+          </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>
+        <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="最大需量(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="submitAttrForm">确 定</el-button>
+        <el-button @click="attrCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listAttr, getAttr, delAttr, addAttr, updateAttr } from "@/api/basecfg/electricity";
+import { listValency, listValencyAll, getValency, addValency, delValency, updateValency, getElecValencyType } from '@/api/basecfg/elecvalency'
+import { areaTreeSelect } from "@/api/basecfg/area"
+
+export default {
+  name: "Attr",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 服务区用电属性表格数据
+      attrList: [],
+      // 电价表格
+      valencyList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      attrOpen: false,
+      valencyOpen: false,
+      // 选项定义
+      valencyTypeOptions: undefined,
+      areaOptions: undefined,
+      valencyOptions: undefined,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        areaCode: null,
+        elecType: null,
+        priceCode: null,
+        reqCapacityFlag: null,
+        transCapacity: null,
+        reqQuantity: null,
+      },
+      // 表单参数
+      attrForm: {},
+      valencyFrom:{},
+      // 表单校验
+      valencyRules: {
+        cfgCode: [
+          { required: true, message: "配置代码不为空", trigger: "blur" }
+        ],
+        elecType: [
+          { required: true, message: "请选择用电分类", trigger: "change" }
+        ],
+        voltageLevel: [
+          { required: true, message: "电压等级不为空", trigger: "blur" }
+        ]
+      },
+
+      // 表单校验
+      attrRules: {
+        areaCode: [
+          { required: true, message: "园区代码不能为空", trigger: "blur" }
+        ],
+        elecType: [
+          { required: true, message: "请选择用电分类", trigger: "change" }
+        ],
+        priceCode: [
+          { required: true, message: "价格编码不能为空", trigger: "blur" }
+        ],
+      },
+      reqCapacityOptions: [
+        { code: 0, name: "不涉及"},
+        { code: 1, name: "容量电价"},
+        { code: 2, name: "需量电价"}
+      ]
+    };
+  },
+  created() {
+    this.getAttrList();
+    this.getValencyList();
+    this.getValencyType();
+  },
+  methods: {
+    getValencyList() {
+      this.loading = true;
+      listValency(this.queryParams).then(response => {
+        this.valencyList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    valencyCancel() {
+      this.valencyOpen = false;
+      this.valencyReset();
+    },
+    // 表单重置
+    valencyReset() {
+      this.valencyFrom = {
+        id: null,
+        cfgCode: null,
+        elecType: null,
+        voltageLevel: null,
+        degreePrice: null,
+        fsPeakDegreePrice: null,
+        fsHighDegreePrice: null,
+        fsFlatDegreePrice: null,
+        fsLowDegreePrice: null,
+        maxReqPrice: null,
+        transCapacityPrice: null
+      };
+      this.resetForm("valencyForm");
+    },
+    /** 新增按钮操作 */
+    handleValencyAdd() {
+      this.valencyReset();
+      this.valencyOpen = true;
+      this.title = "添加电价配置";
+    },
+    /** 修改按钮操作 */
+    handleValencyUpdate(row) {
+      this.valencyReset();
+      const id = row.id || this.ids
+      getValency(id).then(response => {
+        this.valencyFrom = response.data;
+        this.valencyOpen = true;
+        this.title = "修改电价配置";
+      });
+    },
+    /** 提交按钮 */
+    submitValencyForm() {
+      this.$refs["valencyForm"].validate(valid => {
+        if (valid) {
+          if (this.valencyFrom.id != null) {
+            updateValency(this.valencyFrom).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.valencyOpen = false;
+              this.getValencyList();
+            });
+          } else {
+            addValency(this.valencyFrom).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.valencyOpen = false;
+              this.getValencyList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleValencyDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除电价配置编号为"' + ids + '"的数据项？').then(function() {
+        return delValency(ids);
+      }).then(() => {
+        this.getValencyList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 查询服务区用电属性列表 */
+    getAttrList() {
+      this.loading = true;
+      listAttr(this.queryParams).then(response => {
+        this.attrList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    attrCancel() {
+      this.attrOpen = false;
+      this.attrReset();
+    },
+    // 表单重置
+    attrReset() {
+      this.attrForm = {
+        id: null,
+        areaCode: null,
+        elecType: null,
+        priceCode: null,
+        reqCapacityFlag: 0,
+        transCapacity: null,
+        reqQuantity: null,
+        createTime: null,
+        updateTime: null
+      };
+      this.resetForm("attrForm");
+    },
+    /** 搜索按钮操作 */
+    handleAttrQuery() {
+      this.queryParams.pageNum = 1;
+      this.getAttrList();
+    },
+    handleValencyQuery() {
+      this.queryParams.pageNum = 1;
+      this.getValencyList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.handleAttrQuery();
+      this.handleValencyQuery();
+    },
+    /** 新增按钮操作 */
+    handleAttrAdd() {
+      this.attrReset();
+      this.getAreaList("Area");
+      this.getValencyAll();
+      this.attrOpen = true;
+      this.title = "添加服务区用电属性";
+    },
+    /** 修改按钮操作 */
+    handleAttrUpdate(row) {
+      this.attrReset();
+      this.getAreaList("Area");
+      this.getValencyAll();
+      const id = row.id || this.ids
+      getAttr(id).then(response => {
+        this.attrForm = response.data;
+        this.attrOpen = true;
+        this.title = "修改服务区用电属性";
+      });
+    },
+    /** 提交按钮 */
+    submitAttrForm() {
+      this.$refs["attrForm"].validate(valid => {
+        if (valid) {
+          if (this.attrForm.id != null) {
+            updateAttr(this.attrForm).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.attrOpen = false;
+              this.getAttrList();
+            });
+          } else {
+            addAttr(this.attrForm).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.attrOpen = false;
+              this.getAttrList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleAttrDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除服务区用电属性编号为"' + ids + '"的数据项？').then(function() {
+        return delAttr(ids);
+      }).then(() => {
+        this.getAttrList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    matchReqCapacityFlag(row, column, cellValue, index) {
+      const reqCapacityFlagMap = {
+        0: '不涉及',
+        1: '容量电价',
+        2: '需量电价'
+      };
+      return reqCapacityFlagMap[cellValue] || '未知';
+    },
+    getValencyType() {
+      getElecValencyType().then(response => {
+        this.valencyTypeOptions = response.data;
+      });
+    },
+    // 查询区域列表
+    getAreaList(tier) {
+      areaTreeSelect(tier).then(response => {
+        this.areaOptions = response.data;
+      });
+    },
+    getValencyAll() {
+      listValencyAll().then(response =>{
+        this.valencyOptions = response.data;
+      })
+    }
+  }
+};
+</script>

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

@@ -1,295 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="园区代码" prop="areaCode">
-        <el-input
-          v-model="queryParams.areaCode"
-          placeholder="请输入园区代码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['basecfg:electrovalency:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['basecfg:electrovalency:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['basecfg:electrovalency:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['basecfg:electrovalency:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="attrList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <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="reqCapacityFlag" :formatter="getReqCapacityFlag" />
-      <el-table-column label="变压器容量（千伏·安）" align="center" prop="transCapacity" />
-      <el-table-column label="最大需量（千瓦）" align="center" prop="reqQuantity" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['basecfg:electrovalency:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['basecfg:electrovalency:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改服务区用电属性对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="园区代码" prop="areaCode">
-          <el-input v-model="form.areaCode" placeholder="请输入园区代码" />
-        </el-form-item>
-        <el-form-item label="价格编码" prop="priceCode">
-          <el-input v-model="form.priceCode" placeholder="请输入价格编码" />
-        </el-form-item>
-        <el-form-item label="计量类型" prop="reqCapacityFlag">
-          <el-input v-model="form.reqCapacityFlag" placeholder="请选择计量类型" />
-        </el-form-item>
-        <el-form-item label="变压器容量" prop="transCapacity">
-          <el-input v-model="form.transCapacity" placeholder="请输入变压器容量" />
-        </el-form-item>
-        <el-form-item label="最大需量" prop="reqQuantity">
-          <el-input v-model="form.reqQuantity" placeholder="请输入最大需量" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listAttr, getAttr, delAttr, addAttr, updateAttr } from "@/api/basecfg/electrovalency";
-
-export default {
-  name: "Attr",
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 服务区用电属性表格数据
-      attrList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        areaCode: null,
-        elecType: null,
-        priceCode: null,
-        reqCapacityFlag: null,
-        transCapacity: null,
-        reqQuantity: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        areaCode: [
-          { required: true, message: "园区代码不能为空", trigger: "blur" }
-        ],
-        elecType: [
-          { required: true, message: "用电分类 1：单一制 2：两部制不能为空", trigger: "change" }
-        ],
-        priceCode: [
-          { required: true, message: "价格编码不能为空", trigger: "blur" }
-        ],
-      },
-      reqCapacityFlagData: [
-        { reqCapacityFlag : 0 },
-        { reqCapacityFlag : 1 },
-        { reqCapacityFlag : 2 }
-      ]
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询服务区用电属性列表 */
-    getList() {
-      this.loading = true;
-      listAttr(this.queryParams).then(response => {
-        this.attrList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        areaCode: null,
-        elecType: null,
-        priceCode: null,
-        reqCapacityFlag: null,
-        transCapacity: null,
-        reqQuantity: null,
-        createTime: null,
-        updateTime: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加服务区用电属性";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getAttr(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改服务区用电属性";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateAttr(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addAttr(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除服务区用电属性编号为"' + ids + '"的数据项？').then(function() {
-        return delAttr(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('ems/attr/export', {
-        ...this.queryParams
-      }, `attr_${new Date().getTime()}.xlsx`)
-    },
-    getReqCapacityFlag(row, column, cellValue, index) {
-      const reqCapacityFlagMap = {
-        0: '未知',
-        1: '容量电价',
-        2: '需量电价'
-      };
-      return reqCapacityFlagMap[cellValue] || '未知';
-    }
-  }
-};
-</script>

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

@@ -103,7 +103,7 @@
 
     <!-- 添加或修改能源设施/系统分类对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="设施系统代码" prop="code">
           <el-input v-model="form.code" placeholder="请输入设施系统代码" />
         </el-form-item>

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

@@ -28,10 +28,10 @@
       </el-col>
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="分区名称" prop="zoningName">
+          <el-form-item label="区块名称" prop="zoningName">
             <el-input
               v-model="queryParams.zoningName"
-              placeholder="请输入分区名称"
+              placeholder="请输入区块名称"
               clearable
               @keyup.enter.native="handleQuery"
             />
@@ -99,8 +99,8 @@
 
         <el-table v-loading="loading" :data="zoningList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="分区编码" align="center" prop="zoningCode" />
-          <el-table-column label="分区名称" align="center" prop="zoningName" />
+          <el-table-column label="区块编码" align="center" prop="zoningCode" />
+          <el-table-column label="区块名称" align="center" prop="zoningName" />
           <el-table-column label="所在建筑" align="center" prop="bldgName" />
           <el-table-column label="楼层" align="center" prop="floor" />
           <el-table-column label="房间号" align="center" prop="roomNo" />
@@ -137,13 +137,13 @@
         <!-- 添加或修改建筑区域划分对话框 -->
         <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
           <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-            <el-form-item label="分区编码" prop="zoningCode">
+            <el-form-item label="区块编码" prop="zoningCode">
               <el-input v-model="form.zoningCode" placeholder="请输入分区编码" />
             </el-form-item>
-            <el-form-item label="分区名称" prop="zoningName">
+            <el-form-item label="区块名称" prop="zoningName">
               <el-input v-model="form.zoningName" placeholder="请输入分区名称" />
             </el-form-item>
-            <el-form-item label="所属园区" prop="bldgCode">
+            <el-form-item label="所属建筑" prop="bldgCode">
               <treeselect v-model="form.bldgCode" :options="areaOptions" :show-count="true" placeholder="请选择所属建筑" />
             </el-form-item>
             <el-form-item label="楼层" prop="floor">