Browse Source

节能分析

learshaw 1 month ago
parent
commit
6afdfd8fea

+ 8 - 0
ems-ui-cloud/src/api/device/elecMeterH.js

@@ -47,6 +47,14 @@ export function delElecMeterH(date) {
     })
 }
 
+export function getElecDayAvg(param) {
+  return request({
+    url: '/ems/elecMeterH/day/avg',
+    method: 'get',
+    params: param
+  })
+}
+
 // 查询用水计量-小时列表
 export function listWaterMeterH(query) {
     return request({

+ 9 - 0
ems-ui-cloud/src/api/device/waterMeterH.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function getWaterDayAvg(param) {
+  return request({
+    url: '/ems/waterMeterH/day/avg',
+    method: 'get',
+    params: param
+  })
+}

+ 198 - 195
ems-ui-cloud/src/views/ems/EmsEcoD/index.vue

@@ -1,152 +1,98 @@
 <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="20">
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-input v-model="areaName" placeholder="请输入区域名称" clearable size="small" prefix-icon="el-icon-search"
+                    style="margin-bottom: 20px" />
+        </div>
+        <div class="head-container" style="height: 100vh; overflow: hidden; position: relative;">
+          <el-tree :data="areaOptions" :props="defaultProps" :expand-on-click-node="false"
+                   :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
+                   @node-click="handleNodeClick" style="height: calc(100vh - 50px); overflow-y: auto;" />
+        </div>
+      </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="date">
+            <el-date-picker clearable
+                            v-model="queryParams.startRecTime"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="请选择日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="结束日期" prop="date">
+            <el-date-picker clearable
+                            v-model="queryParams.endRecTime"
+                            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>
+        <div class="statistic-container" style="display: flex; align-items: center; margin-bottom: 16px;">
+          <span style="margin-right: 20px;">上月平均日用电量: {{ lastMonthAvgElec }} (kW·h)</span>
+          <span style="margin-right: 20px;">上月平均日用电花费: {{ lastMonthAvgElecCost }} (元)</span>
+          <span>上月平均日用水量: {{ lastMonthAvgWater }}(t)</span>
+          <span>上月平均日用水花费: {{ lastMonthAvgWaterCost }}(元)</span>
+        </div>
 
-    <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>
+        <el-row :gutter="10" class="mb8">
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+        <el-table v-loading="loading" :data="EmsEcoDList" >
+          <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">
+            <template slot-scope="scope">
+              <span>{{ formatValue(scope.row.elecEcoQuantity) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="节电金额(元)" align="center">
+            <template slot-scope="scope">
+              <span>{{ formatValue(scope.row.elecEcoCost) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="节水量 (吨)" align="center">
+            <template slot-scope="scope">
+              <span>{{ formatValue(scope.row.waterEcoQuantity) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="节水金额(元)" align="center">
+            <template slot-scope="scope">
+              <span>{{ formatValue(scope.row.waterEcoCost) }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
 
-    <!-- 添加或修改节能计量日对话框 -->
-    <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>
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
   </div>
 </template>
 
 <script>
-import { listEmsEcoD, getEmsEcoD, delEmsEcoD, addEmsEcoD, updateEmsEcoD } from "@/api/ems/EmsEcoD";
+import { listEmsEcoD } from "@/api/ems/EmsEcoD";
+import { getElecDayAvg } from '@/api/device/elecMeterH'
+import { getWaterDayAvg } from '@/api/device/waterMeterH'
+import { areaTreeByFacsCategory } from '@/api/basecfg/area'
 
 export default {
   name: "EmsEcoD",
@@ -170,12 +116,32 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 表单参数
+      areaOptions: [],
+      areaName: undefined,
+      facsCategory: 'Z',
+      facsSubCategory: '',
+      lastMonthAvgElec: 0,
+      lastMonthAvgElecCost:0,
+      lastMonthAvgWater: 0,
+      lastMonthAvgWaterCost: 0,
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         areaCode: null,
-        date: null,
+        startRecTime: null,
+        endRecTime: null,
+      },
+      queryDayAvgParams:{
+        areaCode: null,
+        deviceCode: null,
+        startRecTime: null,
+        endRecTime: null,
       },
       // 表单参数
       form: {},
@@ -191,9 +157,71 @@ export default {
     };
   },
   created() {
+    this.getAreaList();
+    this.initDateRange();
+    this.initDayAvg();
     this.getList();
   },
   methods: {
+    initDateRange() {
+      const today = new Date();
+
+      // 计算前一天
+      const yesterday = new Date(today);
+      yesterday.setDate(today.getDate() - 1);
+
+      // 计算前7天
+      const sevenDaysAgo = new Date(today);
+      sevenDaysAgo.setDate(today.getDate() - 7);
+
+      // 设置日期格式并赋值
+      this.queryParams.startRecTime = this.formatDate(sevenDaysAgo);
+      this.queryParams.endRecTime = this.formatDate(yesterday);
+    },
+    async initDayAvg() {
+      const today = new Date();
+
+      // 获取上个月的年份和月份
+      const lastMonth = new Date(today);
+      lastMonth.setMonth(today.getMonth() - 1);
+
+      // 获取上个月的第一天
+      const firstDayOfLastMonth = new Date(lastMonth.getFullYear(), lastMonth.getMonth(), 1);
+
+      // 获取上个月的最后一天
+      const lastDayOfLastMonth = new Date(lastMonth.getFullYear(), lastMonth.getMonth() + 1, 0);
+
+      // 设置日期格式并赋值
+      this.queryDayAvgParams.startRecTime = this.formatDate(firstDayOfLastMonth);
+      this.queryDayAvgParams.endRecTime = this.formatDate(lastDayOfLastMonth);
+
+      getElecDayAvg(this.queryDayAvgParams).then(response => {
+        this.lastMonthAvgElec = parseFloat(response.data.quantity.toFixed(2));
+        this.lastMonthAvgElecCost = parseFloat(response.data.useCost.toFixed(2));
+      });
+      getWaterDayAvg(this.queryDayAvgParams).then(response => {
+        this.lastMonthAvgWater = parseFloat(response.data.quantity.toFixed(2));
+        this.lastMonthAvgWaterCost = parseFloat(response.data.useCost.toFixed(2));
+      });
+    },
+    formatDate(date) {
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, '0');
+      const day = String(date.getDate()).padStart(2, '0');
+      return `${year}-${month}-${day}`;
+    },
+    // 查询区域列表
+    async getAreaList () {
+      await areaTreeByFacsCategory(this.facsCategory, this.facsSubCategory, false).then(response => {
+        this.areaOptions = [{
+          id: '-1',
+          label: '全部',
+          children: []
+        }].concat(response.data)
+        this.selectedLabel = '全部'
+        this.queryParams.areaCode = '-1'
+      })
+    },
     /** 查询节能计量日列表 */
     getList() {
       this.loading = true;
@@ -231,63 +259,38 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+    // 筛选节点
+    filterNode (value, data) {
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
     },
-    /** 新增按钮操作 */
-    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 = "修改节能计量日";
-      });
+    // 节点单击事件
+    handleNodeClick (data) {
+      this.queryParams.areaCode = data.id
+      this.queryDayAvgParams.areaCode = data.id
+      this.selectedLabel = data.label
+      this.initDayAvg()
+      this.getList()
     },
-    /** 提交按钮 */
-    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`)
+    formatValue(value) {
+      // 如果值为空或不是数字,直接返回原值
+      if (value === null || value === undefined || isNaN(value)) {
+        return value;
+      }
+
+      // 转换为数字并取绝对值
+      const numValue = Number(value);
+      const absValue = Math.abs(numValue);
+
+      // 根据正负值返回不同的格式化结果
+      return numValue >= 0 ? `降低 ↓ ${absValue}` : `增长 ↑ ${absValue}`;
+
+      // 根据正负值返回不同的格式化结果
+      if (numValue >= 0) {
+        return `<span style="color: #67c23a;">降低 ↓ </span>${absValue}`;
+      } else {
+        return `<span style="color: #f56c6c;">增长 ↑ </span>${absValue}`;
+      }
     }
   }
 };

+ 7 - 7
ems-ui-cloud/src/views/index.vue

@@ -19,11 +19,11 @@
               <div class="summary-title">
                 <div>电消耗</div>
                 <div class="summary-value">
-                  <span class="value">{{ numToStr(decimalFormat(elecMeter.elecQuantity)) }}</span>
+                  <span class="value">{{ numToStr(decimalFormat(elecMeter.quantity)) }}</span>
                   <span class="unit">kW·h</span>
                 </div>
                 <div class="summary-value">
-                  <span class="value">{{ numToStr(decimalFormat(elecMeter.useElecCost)) }}</span>
+                  <span class="value">{{ numToStr(decimalFormat(elecMeter.useCost)) }}</span>
                   <span class="unit">元</span>
                 </div>
               </div>
@@ -35,11 +35,11 @@
               <div class="summary-title">
                 <div>水消耗</div>
                 <div class="summary-value">
-                  <span class="value">{{ numToStr(decimalFormat(waterMeter.waterQuantity)) }}</span>
+                  <span class="value">{{ numToStr(decimalFormat(waterMeter.quantity)) }}</span>
                   <span class="unit">吨</span>
                 </div>
                 <div class="summary-value">
-                  <span class="value">{{ numToStr(decimalFormat(waterMeter.useWaterCost)) }}</span>
+                  <span class="value">{{ numToStr(decimalFormat(waterMeter.useCost)) }}</span>
                   <span class="unit">元</span>
                 </div>
               </div>
@@ -49,7 +49,7 @@
             <SubTitle title="费用【单位:元】" style="padding-left: 30px;"/>
             <div class="cost">
               <span>总费用</span>
-              <span>{{ numToStr(decimalFormat(waterMeter.useWaterCost + elecMeter.useElecCost)) }}元</span>
+              <span>{{ numToStr(decimalFormat(waterMeter.useCost + elecMeter.useCost)) }}元</span>
             </div>
             <BaseChart width="100%" height="250px" :option="sumCost"/>
           </div>
@@ -392,7 +392,7 @@ export default {
       copy.series[0].data = [
         {
           name: '水费',
-          value: this.decimalFormat(waterMeter.useWaterCost),
+          value: this.decimalFormat(waterMeter.useCost),
           itemStyle: {
             normal: {
               color: '#1396DB'
@@ -401,7 +401,7 @@ export default {
         },
         {
           name: '电费',
-          value: this.decimalFormat(elecMeter.useElecCost),
+          value: this.decimalFormat(elecMeter.useCost),
           itemStyle: {
             normal: {
               color: '#F4EA29'

+ 2 - 2
ems-ui-cloud/src/views/largeScreen/soc/right.vue

@@ -199,8 +199,8 @@ export default {
       const {data: elecMeter} = await qryElecMeterByDate(DateTool.now(), this.areaType)
       const {data: waterMeter} = await qryWaterMeterByDate(DateTool.now(), this.areaType)
       const [elec, water] = this.socList
-      elec.value = numToStr(elecMeter.elecQuantity)
-      water.value = numToStr(waterMeter.waterQuantity)
+      elec.value = numToStr(elecMeter.quantity)
+      water.value = numToStr(waterMeter.quantity)
       this.socList = [elec, water]
     },