电价&峰谷配置

ems-ui/.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 常泰大桥能源管理
+VUE_APP_TITLE = 常泰大桥服务区能源管理
 
 # 开发环境配置
 ENV = 'development'

ems-ui/.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 常泰大桥能源管理
+VUE_APP_TITLE = 常泰大桥服务区能源管理
 
 # 生产环境配置
 ENV = 'production'

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询电价配置列表
+export function listConfig(query) {
+  return request({
+    url: '/ems/basecfg/electrovalency/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询电价配置详细
+export function getConfig(id) {
+  return request({
+    url: '/ems/basecfg/electrovalency/' + id,
+    method: 'get'
+  })
+}
+
+// 新增电价配置
+export function addConfig(data) {
+  return request({
+    url: '/ems/basecfg/electrovalency',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改电价配置
+export function updateConfig(data) {
+  return request({
+    url: '/ems/basecfg/electrovalency',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除电价配置
+export function delConfig(id) {
+  return request({
+    url: '/ems/basecfg/electrovalency/' + id,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询电价峰谷列表
+export function listValley(query) {
+  return request({
+    url: '/ems/basecfg/peakvalley/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询电价峰谷详细
+export function getValley(id) {
+  return request({
+    url: '/ems/basecfg/peakvalley/' + id,
+    method: 'get'
+  })
+}
+
+// 新增电价峰谷
+export function addValley(data) {
+  return request({
+    url: '/ems/basecfg/peakvalley',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改电价峰谷
+export function updateValley(data) {
+  return request({
+    url: '/ems/basecfg/peakvalley',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除电价峰谷
+export function delValley(id) {
+  return request({
+    url: '/ems/basecfg/peakvalley/' + id,
+    method: 'delete'
+  })
+}

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

@@ -88,7 +88,6 @@
 
     <el-table v-loading="loading" :data="areaList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="id" />
       <el-table-column label="服务区代码" align="center" prop="areaCode" />
       <el-table-column label="服务区名称" align="center" prop="areaName" />
       <el-table-column label="服务星级" align="center" prop="serviceStar" />

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

@@ -63,7 +63,6 @@
 
     <el-table v-loading="loading" :data="premisesList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="id" />
       <el-table-column label="建筑编码" align="center" prop="bldgCode" />
       <el-table-column label="建筑名称" align="center" prop="bldgName" />
       <el-table-column label="归属园区" align="center" prop="areaName" />

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

@@ -87,7 +87,6 @@
 
     <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="id" />
       <el-table-column label="设备代码" align="center" prop="deviceCode" />
       <el-table-column label="设备名称" align="center" prop="deviceName" />
       <el-table-column label="设备类型" align="center" prop="deviceType" />

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

@@ -0,0 +1,326 @@
+<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="elecClass">
+        <el-input
+          v-model="queryParams.elecClass"
+          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="configList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="配置代码" align="center" prop="cfgCode" />
+      <el-table-column label="用电分类" align="center" prop="elecClass" :formatter="getElecClass"/>
+      <el-table-column label="价格类型" align="center" prop="priceType" />
+      <el-table-column label="年用电量下限\n(单位：KV)" align="center" prop="quantityLowerLimit" />
+      <el-table-column label="年用电量上限\n(单位：KV)" align="center" prop="quantityUpperLimit" />
+      <el-table-column label="不满1千伏" align="center" prop="priceLess1kv" />
+      <el-table-column label="不满10千伏" align="center" prop="price1kv10kv" />
+      <el-table-column label="20-30千伏" align="center" prop="price20kv35kv" />
+      <el-table-column label="35-110千伏" align="center" prop="price35kv110kv" />
+      <el-table-column label="110千伏" align="center" prop="price110kv" />
+      <el-table-column label="220千伏" align="center" prop="price220kv" />
+      <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="cfgCode">
+          <el-input v-model="form.cfgCode" placeholder="请输入配置代码" />
+        </el-form-item>
+        <el-form-item label="用电分类" prop="elecClass">
+          <el-input v-model="form.elecClass" placeholder="请输入用电分类" />
+        </el-form-item>
+        <el-form-item label="年用电量下限" prop="quantityLowerLimit">
+          <el-input v-model="form.quantityLowerLimit" placeholder="请输入年用电量下限" />
+        </el-form-item>
+        <el-form-item label="年用电量上限" prop="quantityUpperLimit">
+          <el-input v-model="form.quantityUpperLimit" placeholder="请输入年用电量上限" />
+        </el-form-item>
+        <el-form-item label="不满1千伏" prop="priceLess1kv">
+          <el-input v-model="form.priceLess1kv" placeholder="请输入不满1千伏" />
+        </el-form-item>
+        <el-form-item label="不满10千伏" prop="price1kv10kv">
+          <el-input v-model="form.price1kv10kv" placeholder="请输入不满10千伏" />
+        </el-form-item>
+        <el-form-item label="20-30千伏" prop="price20kv35kv">
+          <el-input v-model="form.price20kv35kv" placeholder="请输入20-30千伏" />
+        </el-form-item>
+        <el-form-item label="35-110千伏" prop="price35kv110kv">
+          <el-input v-model="form.price35kv110kv" placeholder="请输入35-110千伏" />
+        </el-form-item>
+        <el-form-item label="110千伏" prop="price110kv">
+          <el-input v-model="form.price110kv" placeholder="请输入110千伏" />
+        </el-form-item>
+        <el-form-item label="220千伏" prop="price220kv">
+          <el-input v-model="form.price220kv" placeholder="请输入220千伏" />
+        </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 { listConfig, getConfig, delConfig, addConfig, updateConfig } from "@/api/basecfg/electrovalency";
+
+export default {
+  name: "Config",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 电价配置表格数据
+      configList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        cfgCode: null,
+        elecClass: null,
+        priceType: null,
+        quantityLowerLimit: null,
+        quantityUpperLimit: null,
+        priceLess1kv: null,
+        price1kv10kv: null,
+        price20kv35kv: null,
+        price35kv110kv: null,
+        price110kv: null,
+        price220kv: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        cfgCode: [
+          { required: true, message: "配置代码不能为空", trigger: "blur" }
+        ],
+        elecClass: [
+          { required: true, message: "用电分类不能为空", trigger: "blur" }
+        ],
+        priceType: [
+          { required: true, message: "价格类型不能为空", trigger: "change" }
+        ],
+      },
+      elecClassData: [
+        {elecClass:1},
+        {elecClass:2},
+        {elecClass:3},
+        {elecClass:4}
+      ]
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询电价配置列表 */
+    getList() {
+      this.loading = true;
+      listConfig(this.queryParams).then(response => {
+        this.configList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        cfgCode: null,
+        elecClass: null,
+        priceType: null,
+        quantityLowerLimit: null,
+        quantityUpperLimit: null,
+        priceLess1kv: null,
+        price1kv10kv: null,
+        price20kv35kv: null,
+        price35kv110kv: null,
+        price110kv: null,
+        price220kv: 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
+      getConfig(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) {
+            updateConfig(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addConfig(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 delConfig(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ems/basecfg/electrovalency/export', {
+        ...this.queryParams
+      }, `config_${new Date().getTime()}.xlsx`)
+    },
+    getElecClass(row, column, cellValue, index){
+      const elecClassMap = {
+        1: '居民用电',
+        2: '一般工商业及其他用电',
+        3: '大工业用电',
+        4: '农业生产用电'
+      };
+      return elecClassMap[cellValue] || '未知';
+    }
+  }
+};
+</script>

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

@@ -31,7 +31,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['ems:factor:add']"
+          v-hasPermi="['basecfg:emissionFactor:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -42,7 +42,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['ems:factor:edit']"
+          v-hasPermi="['basecfg:emissionFactor:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -53,7 +53,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['ems:factor:remove']"
+          v-hasPermi="['basecfg:emissionFactor:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -63,7 +63,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['ems:factor:export']"
+          v-hasPermi="['basecfg:emissionFactor:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -71,7 +71,6 @@
 
     <el-table v-loading="loading" :data="factorList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="id" />
       <el-table-column label="地区码" align="center" prop="regionCode" />
       <el-table-column label="地区名称" align="center" prop="regionName" />
       <el-table-column label="地区类型" align="center" prop="regionType" />
@@ -85,14 +84,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['ems:factor:edit']"
+            v-hasPermi="['basecfg:emissionFactor:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['ems:factor:remove']"
+            v-hasPermi="['basecfg:emissionFactor:remove']"
           >删除</el-button>
         </template>
       </el-table-column>

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

@@ -87,7 +87,6 @@
 
     <el-table v-loading="loading" :data="facsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="id" />
       <el-table-column label="归属区域" align="center" prop="refAreaName" />
       <el-table-column label="设施代码" align="center" prop="facsCode" />
       <el-table-column label="设施名称" align="center" prop="facsName" />

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

@@ -69,7 +69,6 @@
 
     <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="id" />
       <el-table-column label="设施系统代码" align="center" prop="code" />
       <el-table-column label="设施系统名称" align="center" prop="name" />
       <el-table-column label="说明" align="center" prop="desc" />
@@ -81,14 +80,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['ems:type:edit']"
+            v-hasPermi="['basecfg:facstype:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['ems:type:remove']"
+            v-hasPermi="['basecfg:facstype:remove']"
           >删除</el-button>
         </template>
       </el-table-column>

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

@@ -77,11 +77,10 @@
 
     <el-table v-loading="loading" :data="relList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="id" />
       <el-table-column label="编码" align="center" prop="code" />
       <el-table-column label="输出设施" align="center" prop="exportFacsName" />
       <el-table-column label="流入设施" align="center" prop="inputFacsName" />
-      <el-table-column label="流动介质" align="center" prop="emsCls" />
+      <el-table-column label="流动介质" align="center" prop="emsClsName" />
       <el-table-column label="供能状态" align="center" prop="state" />
       <el-table-column label="能流动作" align="center" prop="actionType" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

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

@@ -0,0 +1,313 @@
+<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="timeKey">
+        <el-input
+          v-model="queryParams.timeKey"
+          placeholder="请输入时间标识"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="时间序列" prop="timeIndex">
+        <el-input
+          v-model="queryParams.timeIndex"
+          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:peakvalley: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:peakvalley: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:peakvalley: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:peakvalley:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="valleyList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" prop="id" />
+      <el-table-column label="时间标识" align="center" prop="timeKey" />
+      <el-table-column label="时间序列" align="center" prop="timeIndex" />
+      <el-table-column label="开始时间" align="center" prop="startTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ scope.row.startTime }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束时间" align="center" prop="endTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ scope.row.endTime }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="计量类型" align="center" prop="type" />
+      <el-table-column label="浮动值" align="center" prop="floatingValue" />
+      <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:peakvalley:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['basecfg:peakvalley: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="timeKey">
+          <el-input v-model="form.timeKey" placeholder="请输入时间标识" />
+        </el-form-item>
+        <el-form-item label="时间序列" prop="timeIndex">
+          <el-input v-model="form.timeIndex" placeholder="请输入时间序列" />
+        </el-form-item>
+        <el-form-item label="开始时间HH:mm:ss" prop="startTime">
+          <el-date-picker clearable
+            v-model="form.startTime"
+            type="date"
+            value-format="HH:mm:ss"
+            placeholder="请选择开始时间HH:mm:ss">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间HH:mm:ss" prop="endTime">
+          <el-date-picker clearable
+            v-model="form.endTime"
+            type="date"
+            value-format="HH:mm:ss"
+            placeholder="请选择结束时间HH:mm:ss">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="浮动值" prop="floatingValue">
+          <el-input v-model="form.floatingValue" 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 { listValley, getValley, delValley, addValley, updateValley } from "@/api/basecfg/peakvalley";
+
+export default {
+  name: "Valley",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 电价峰谷表格数据
+      valleyList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        timeKey: null,
+        timeIndex: null,
+        startTime: null,
+        endTime: null,
+        type: null,
+        floatingValue: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        timeKey: [
+          { required: true, message: "时间标识不能为空", trigger: "blur" }
+        ],
+        timeIndex: [
+          { required: true, message: "时间序列不能为空", trigger: "blur" }
+        ],
+        startTime: [
+          { required: true, message: "开始时间HH:mm:ss不能为空", trigger: "blur" }
+        ],
+        endTime: [
+          { required: true, message: "结束时间HH:mm:ss不能为空", trigger: "blur" }
+        ],
+        type: [
+          { required: true, message: "计量类型不能为空", trigger: "change" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询电价峰谷列表 */
+    getList() {
+      this.loading = true;
+      listValley(this.queryParams).then(response => {
+        this.valleyList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        timeKey: null,
+        timeIndex: null,
+        startTime: null,
+        endTime: null,
+        type: null,
+        floatingValue: 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
+      getValley(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) {
+            updateValley(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addValley(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 delValley(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ems/basecfg/peakvalley/export', {
+        ...this.queryParams
+      }, `valley_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

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

@@ -79,7 +79,6 @@
 
     <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="id" />
       <el-table-column label="分区编码" align="center" prop="zoningCode" />
       <el-table-column label="分区名称" align="center" prop="zoningName" />
       <el-table-column label="所在建筑" align="center" prop="bldgName" />