瀏覽代碼

+ 汇报缺失页面

chen.cheng 3 月之前
父節點
當前提交
c5b5e73c16

+ 44 - 0
ems-ui-cloud/src/api/ems/EmsEcoD.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询节能计量日列表
+export function listEmsEcoD(query) {
+  return request({
+    url: '/ems/EmsEcoD/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询节能计量日详细
+export function getEmsEcoD(id) {
+  return request({
+    url: '/ems/EmsEcoD/' + id,
+    method: 'get'
+  })
+}
+
+// 新增节能计量日
+export function addEmsEcoD(data) {
+  return request({
+    url: '/ems/EmsEcoD',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改节能计量日
+export function updateEmsEcoD(data) {
+  return request({
+    url: '/ems/EmsEcoD',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除节能计量日
+export function delEmsEcoD(id) {
+  return request({
+    url: '/ems/EmsEcoD/' + id,
+    method: 'delete'
+  })
+}

+ 81 - 96
ems-ui-cloud/src/views/ca/emission.vue

@@ -1,38 +1,22 @@
 <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-form-item label="园区名称" prop="areaNamez">
         <el-input
-          v-model="queryParams.areaCode"
-          placeholder="请输入园区代码"
+          v-model="queryParams.areaName"
+          placeholder="请输入园区名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="日期" prop="date">
         <el-date-picker clearable
-          v-model="queryParams.date"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择日期">
+                        v-model="queryParams.date"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="碳排放量" prop="caEmissionQuantity">
-        <el-input
-          v-model="queryParams.caEmissionQuantity"
-          placeholder="请输入碳排放量 "
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="碳汇量" prop="caSinkQuantity">
-        <el-input
-          v-model="queryParams.caSinkQuantity"
-          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>
@@ -40,76 +24,76 @@
     </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="['ems:caMeterD: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="['ems:caMeterD: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="['ems:caMeterD: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="['ems:caMeterD:export']"
-        >导出</el-button>
-      </el-col>
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="primary"-->
+      <!--          plain-->
+      <!--          icon="el-icon-plus"-->
+      <!--          size="mini"-->
+      <!--          @click="handleAdd"-->
+      <!--          v-hasPermi="['ems:caMeterD: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="['ems:caMeterD: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="['ems:caMeterD: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="['ems:caMeterD:export']"-->
+      <!--        >导出</el-button>-->
+      <!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="caMeterDList" @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 type="selection" width="55" align="center"/>
+      <el-table-column label="序号" align="center" prop="id"/>
+      <el-table-column label="园区名称" align="center" prop="areaName"/>
       <el-table-column label="日期" align="center" prop="date" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.date, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="碳排放量(kg)" align="center" prop="caEmissionQuantity" />
-      <el-table-column label="碳汇量(kg)" align="center" prop="caSinkQuantity" />
-      <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="['ems:caMeterD:edit']"
-          >修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['ems:caMeterD:remove']">
-            删除</el-button>
+      <el-table-column label="碳排放量(kg)" align="center" prop="caEmissionQuantity"/>
+      <el-table-column label="碳汇量(kg)" align="center" prop="caSinkQuantity"/>
+      <!--      <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="['ems:caMeterD:edit']"-->
+      <!--          >修改</el-button>-->
+      <!--          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['ems:caMeterD:remove']">-->
+      <!--            删除</el-button>-->
 
-        </template>
-      </el-table-column>
+      <!--        </template>-->
+      <!--      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -124,21 +108,21 @@
     <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-input v-model="form.areaCode" placeholder="请输入园区代码"/>
         </el-form-item>
         <el-form-item label="日期" prop="date">
           <el-date-picker clearable
-            v-model="form.date"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择日期">
+                          v-model="form.date"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="碳排放量 " prop="caEmissionQuantity">
-          <el-input v-model="form.caEmissionQuantity" placeholder="请输入碳排放量 " />
+          <el-input v-model="form.caEmissionQuantity" placeholder="请输入碳排放量 "/>
         </el-form-item>
         <el-form-item label="碳汇量" prop="caSinkQuantity">
-          <el-input v-model="form.caSinkQuantity" placeholder="请输入碳汇量" />
+          <el-input v-model="form.caSinkQuantity" placeholder="请输入碳汇量"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -150,7 +134,7 @@
 </template>
 
 <script>
-import { listCaMeterD, getCaMeterD, delCaMeterD, addCaMeterD, updateCaMeterD } from "@/api/ca/caMeterD";
+import {addCaMeterD, delCaMeterD, getCaMeterD, listCaMeterD, updateCaMeterD} from "@/api/ca/caMeterD";
 
 export default {
   name: "CaMeterD",
@@ -188,10 +172,10 @@ export default {
       // 表单校验
       rules: {
         areaCode: [
-          { required: true, message: "园区代码不能为空", trigger: "blur" }
+          {required: true, message: "园区代码不能为空", trigger: "blur"}
         ],
         date: [
-          { required: true, message: "日期不能为空", trigger: "blur" }
+          {required: true, message: "日期不能为空", trigger: "blur"}
         ],
       }
     };
@@ -238,7 +222,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -280,12 +264,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除碳计量日编号为"' + ids + '"的数据项?').then(function() {
+      this.$modal.confirm('是否确认删除碳计量日编号为"' + ids + '"的数据项?').then(function () {
         return delCaMeterD(ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导出按钮操作 */
     handleExport() {

+ 279 - 0
ems-ui-cloud/src/views/ca/emissionCalc.vue

@@ -0,0 +1,279 @@
+<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="areaNamez">
+        <el-input
+          v-model="queryParams.areaName"
+          placeholder="请输入园区名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="日期" prop="date">
+        <el-date-picker clearable
+                        v-model="queryParams.date"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="请选择日期">
+        </el-date-picker>
+      </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="['ems:caMeterD: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="['ems:caMeterD: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="['ems:caMeterD: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="['ems:caMeterD:export']"-->
+      <!--        >导出</el-button>-->
+      <!--      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="caMeterDList" @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="areaName"/>
+      <el-table-column label="日期" align="center" prop="date" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.date, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="碳汇量(kg)" align="center" prop="caSinkQuantity"/>
+      <!--      <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="['ems:caMeterD:edit']"-->
+      <!--          >修改</el-button>-->
+      <!--          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['ems:caMeterD: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="date">
+          <el-date-picker clearable
+                          v-model="form.date"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="碳汇量" prop="caSinkQuantity">
+          <el-input v-model="form.caSinkQuantity" 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 {addCaMeterD, delCaMeterD, getCaMeterD, listCaMeterD, updateCaMeterD} from "@/api/ca/caMeterD";
+
+export default {
+  name: "CaMeterD",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 碳计量日表格数据
+      caMeterDList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        areaCode: null,
+        date: null,
+        caEmissionQuantity: null,
+        caSinkQuantity: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        areaCode: [
+          {required: true, message: "园区代码不能为空", trigger: "blur"}
+        ],
+        date: [
+          {required: true, message: "日期不能为空", trigger: "blur"}
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询碳计量日列表 */
+    getList() {
+      this.loading = true;
+      listCaMeterD(this.queryParams).then(response => {
+        this.caMeterDList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        areaCode: null,
+        date: null,
+        caEmissionQuantity: null,
+        caSinkQuantity: 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
+      getCaMeterD(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) {
+            updateCaMeterD(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCaMeterD(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 delCaMeterD(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ems/caMeterD/export', {
+        ...this.queryParams
+      }, `caMeterD_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

+ 294 - 0
ems-ui-cloud/src/views/ems/EmsEcoD/index.vue

@@ -0,0 +1,294 @@
+<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.areaName"
+          placeholder="请输入园区名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="日期" prop="date">
+        <el-date-picker clearable
+          v-model="queryParams.date"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择日期">
+        </el-date-picker>
+      </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="['ems:EmsEcoD: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="['ems:EmsEcoD: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="['ems:EmsEcoD: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="['ems:EmsEcoD:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="EmsEcoDList" @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="areaName" />
+      <el-table-column label="日期" align="center" prop="date" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.date, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="节电(千瓦时)" align="center" prop="elecEcoQuantity" />
+      <el-table-column label="节电金额(元)" align="center" prop="elecEcoCost" />
+      <el-table-column label="节水量 (吨)" align="center" prop="waterEcoQuantity" />
+      <el-table-column label="节水金额(元)" align="center" prop="waterEcoCost" />
+<!--      <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="['ems:EmsEcoD:edit']"-->
+<!--          >修改</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['ems:EmsEcoD: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="date">
+          <el-date-picker clearable
+            v-model="form.date"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="节电(千瓦时)" prop="elecEcoQuantity">
+          <el-input v-model="form.elecEcoQuantity" placeholder="请输入节电" />
+        </el-form-item>
+        <el-form-item label="节电金额(元)" prop="elecEcoCost">
+          <el-input v-model="form.elecEcoCost" placeholder="请输入节电金额" />
+        </el-form-item>
+        <el-form-item label="节水量 (吨)" prop="waterEcoQuantity">
+          <el-input v-model="form.waterEcoQuantity" placeholder="请输入节水量 " />
+        </el-form-item>
+        <el-form-item label="节水金额(元)" prop="waterEcoCost">
+          <el-input v-model="form.waterEcoCost" 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 { listEmsEcoD, getEmsEcoD, delEmsEcoD, addEmsEcoD, updateEmsEcoD } from "@/api/ems/EmsEcoD";
+
+export default {
+  name: "EmsEcoD",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 节能计量日表格数据
+      EmsEcoDList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        areaCode: null,
+        date: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        areaCode: [
+          { required: true, message: "园区代码不能为空", trigger: "blur" }
+        ],
+        date: [
+          { required: true, message: "日期不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询节能计量日列表 */
+    getList() {
+      this.loading = true;
+      listEmsEcoD(this.queryParams).then(response => {
+        this.EmsEcoDList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        areaCode: null,
+        date: null,
+        elecEcoQuantity: null,
+        elecEcoCost: null,
+        waterEcoQuantity: null,
+        waterEcoCost: 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
+      getEmsEcoD(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) {
+            updateEmsEcoD(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addEmsEcoD(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 delEmsEcoD(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ems/EmsEcoD/export', {
+        ...this.queryParams
+      }, `EmsEcoD_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

+ 1 - 1
ems-ui-cloud/vue.config.js

@@ -37,7 +37,7 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
          //target: 'http://172.192.13.95:9091/',
          //target: 'http://172.192.13.80:9100/',
-         target: 'http://127.0.0.1:9100/',
+         target: 'http://172.192.13.80:9100/',
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API + '/ems']: process.env.EMS_REWRITE_URL,