소스 검색

报表调整

learshaw 1 개월 전
부모
커밋
42378dca9c

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

@@ -117,6 +117,14 @@ export function listFacsMeter(queryMeter) {
     })
 }
 
+export function listAreaMeter(queryMeter) {
+  return request({
+    url: '/ems/elecMeterH/hour/listAreaMeter',
+    method: 'get',
+    params: queryMeter
+  })
+}
+
 export function qryElecMeterByDate(date, areaCode) {
     return request({
         url: `/ems/elecMeterH/sum/byDate/${date}`,

+ 337 - 195
ems-ui-cloud/src/views/analysis/report/statement-consume.vue

@@ -1,132 +1,133 @@
 <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="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-tabs v-model="queryParams.objType" @tab-click="objTypeChange">
+          <el-tab-pane label="区域用能" name="1">
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+              <!-- 开始时间选择器 -->
+              <el-form-item label="开始时间" prop="startRecTime">
+                <el-date-picker
+                    v-model="queryParams.startRecTime"
+                    type="datetime"
+                    value-format="yyyy-MM-dd HH:00:00"
+                    :picker-options="startPickerOptions"
+                    placeholder="请选择开始时间"
+                    @change="handleTimeChange('startRecTime')">
+                </el-date-picker>
+              </el-form-item>
 
-    <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-form-item label="结束时间" prop="endRecTime">
+                <el-date-picker
+                    v-model="queryParams.endRecTime"
+                    type="datetime"
+                    value-format="yyyy-MM-dd HH:00:00"
+                    :picker-options="endPickerOptions"
+                    placeholder="请选择结束时间"
+                    @change="handleTimeChange('endRecTime')">
+                </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-button type="warning" plain icon="el-icon-download" size="mini" v-hasPermi="['ems:EmsEcoD:export']" @click="handleExport">导出</el-button>
+              </el-form-item>
+            </el-form>
+          </el-tab-pane>
+          <el-tab-pane label="设施用能" name="2">
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+              <el-form-item label="选择对象" prop="objCode">
+                <treeselect
+                    v-model="queryParams.objCode"
+                    :options="objOptions"
+                    :show-count="true"
+                    placeholder="请选择对象"
+                    class="fixed-width-treeselect"
+                />
+              </el-form-item>
+              <!-- 开始时间选择器 -->
+              <el-form-item label="开始时间" prop="startRecTime">
+                <el-date-picker
+                    v-model="queryParams.startRecTime"
+                    type="datetime"
+                    value-format="yyyy-MM-dd HH:00:00"
+                    :picker-options="startPickerOptions"
+                    placeholder="请选择开始时间"
+                    @change="handleTimeChange('startRecTime')">
+                </el-date-picker>
+              </el-form-item>
+
+              <!-- 结束时间选择器 -->
+              <el-form-item label="结束时间" prop="endRecTime">
+                <el-date-picker
+                    v-model="queryParams.endRecTime"
+                    type="datetime"
+                    value-format="yyyy-MM-dd HH:00:00"
+                    :picker-options="endPickerOptions"
+                    placeholder="请选择结束时间"
+                    @change="handleTimeChange('endRecTime')">
+                </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-button type="warning" plain icon="el-icon-download" size="mini" v-hasPermi="['ems:EmsEcoD:export']" @click="handleExport">导出</el-button>
+              </el-form-item>
+            </el-form>
+          </el-tab-pane>
+        </el-tabs>
 
-    <el-table v-loading="loading" :data="pvConsumeHList">
-      <el-table-column label="对象名称" align="center" prop="objName"/>
-      <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="time">
-        <template slot-scope="scope">
-          <span>{{ scope.row.time }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="视在功率(kW)" align="center" prop="s"/>
-      <el-table-column label="有功功率(kW)" align="center" prop="p"/>
-      <el-table-column label="无功功率(kW)" align="center" prop="q"/>
-    </el-table>
-    <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-    />
+        <el-table v-loading="loading" :data="forecastConsumeList" @selection-change="handleSelectionChange">
+          <el-table-column label="对象名称" align="center" prop="deviceName" />
+          <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="time">
+            <template slot-scope="scope">
+              <span>{{ scope.row.time }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="用电量(kW·h)" align="center" prop="elecQuantity" />
+          <el-table-column label="用电花费(元)" align="center" prop="useElecCost" />
+        </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 {addEmsEcoD, delEmsEcoD, getEmsEcoD, updateEmsEcoD} from "@/api/ems/EmsEcoD";
-import {getPowerData} from "@/api/mgr/elecUseH";
-import {parseTime} from "@/utils/ruoyi";
+
+import { listFacsMeter, listAreaMeter } from '@/api/device/elecMeterH';
+import { areaTreeByFacsCategory, areaTreeSelect } from '@/api/basecfg/area'
+import { getFacsCategoryTree } from '@/api/basecfg/emsfacs'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
 export default {
-  name: "EmsEcoD",
+  name: 'ForecastConsume',
+  components: { Treeselect },
   data() {
     return {
       // 遮罩层
@@ -141,47 +142,228 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 节能计量日表格数据
-      EmsEcoDList: [],
-      pvConsumeHList: [],
+      // 电力消耗预测表格数据
+      forecastConsumeList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
+      // 表单参数
+      areaOptions: [],
+      objOptions: [],
+      areaName: undefined,
+      facsCategory: 'Z',
+      facsSubCategory: '',
+      // 设施选项
+      facsOptions: undefined,
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      dictObjType: [
+        { value: '1', label: '区域' },
+        { value: '2', label: '设施' }
+      ],
+      treeProps: {
+        label: 'name',
+        value: 'code',
+        children: 'children'
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        areaCode: null,
-        date: parseTime(new Date(), '{y}-{m}-{d}'),
+        areaCode: -1,
+        objCode: null,
+        objType: '1', // 修正:初始值应该是字符串类型
+        facsCategory: 'Z',
+        startRecTime: null,
+        endRecTime: null,
+        elecUseQuantity: null,
       },
       // 表单参数
-      form: {},
+      form: {
+        id: null,
+        areaCode: null,
+        objCode: null,
+        objType: null,
+        date: null,
+        elecUseQuantity: null,
+      },
       // 表单校验
       rules: {
         areaCode: [
-          {required: true, message: "园区代码不能为空", trigger: "blur"}
+          {
+            required: true,
+            message: '园区代码不能为空',
+            trigger: 'blur',
+          },
         ],
-        date: [
-          {required: true, message: "日期不能为空", trigger: "blur"}
+        objCode: [
+          {
+            required: true,
+            message: '对象代码不能为空',
+            trigger: 'blur',
+          },
         ],
-      }
+        objType: [
+          {
+            required: true,
+            message: '对象类型不能为空',
+            trigger: 'change',
+          },
+        ],
+      },
+      // 时间选择器配置
+      startPickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        }
+      },
+      endPickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < this.queryParams.startRecTime || time.getTime() > Date.now();
+        }
+      },
     };
   },
   created() {
-    this.getList();
+    this.getAreaList();
+    this.loadAreaData();
+    // 根据初始objType决定执行哪个查询
+    this.initQuery();
+  },
+  watch: {
+    'queryParams.objType': {
+      handler(newVal) {
+        // 标签页切换时执行对应查询
+        this.executeQueryByObjType(newVal);
+      },
+      immediate: true // 立即执行一次handler,处理初始化时的objType
+    }
   },
   methods: {
-    /** 查询节能计量日列表 */
-    getList() {
+    // 加载设施数据
+    loadFacilityData() {
+      getFacsCategoryTree(0, "Z").then(response => {
+        // 获取原始数据
+        const originalData = response.data;
+
+        // 根据 areaCode 进行过滤
+        if (this.queryParams.areaCode === '-1') {
+          // areaCode=-1 时,展示全部数据
+          this.objOptions = originalData;
+        } else {
+          // 否则,只展示匹配 areaCode 的数据
+          const filteredData = originalData.filter(item =>
+              item.id === this.queryParams.areaCode
+          );
+          // 如果找到匹配项,则使用过滤后的数据;否则使用空数组
+          this.objOptions = filteredData.length > 0 ? filteredData : [];
+        }
+      }).catch(error => {
+        console.error('加载设施数据失败:', error);
+        this.$message.error('加载设施数据失败');
+      });
+    },
+    /** 初始化查询 */
+    initQuery() {
+      this.executeQueryByObjType(this.queryParams.objType);
+    },
+
+    /** 根据对象类型执行对应查询 */
+    executeQueryByObjType(objType) {
       this.loading = true;
+      switch (objType) {
+        case '1': // 区域用能
+          listAreaMeter(this.queryParams).then(response => {
+            this.forecastConsumeList = response.rows;
+            this.total = response.total;
+            this.loading = false;
+          }).catch(error => {
+            console.error('区域用能查询失败:', error);
+            this.loading = false;
+            this.$message.error('区域用能查询失败');
+          });
+          break;
+        case '2': // 设施用能
+          listFacsMeter(this.queryParams).then(response => {
+            this.forecastConsumeList = response.rows;
+            this.total = response.total;
+            this.loading = false;
+          }).catch(error => {
+            console.error('设施用能查询失败:', error);
+            this.loading = false;
+            this.$message.error('设施用能查询失败');
+          });
+          break;
+        default:
+          this.loading = false;
+          this.$message.warning('未知的对象类型');
+      }
+    },
 
-      getPowerData(this.queryParams).then(response => {
-        this.pvConsumeHList = response.rows
-        this.total = response.total
-        this.loading = false
-      })
+    /** 原getList方法修改为根据objType执行查询 */
+    getList() {
+      this.executeQueryByObjType(this.queryParams.objType);
+    },
+    // 查询区域列表
+    async getAreaList () {
+      try {
+        const response = await areaTreeByFacsCategory(this.facsCategory, this.facsSubCategory, false);
+        this.areaOptions = [{
+          id: '-1',
+          label: '全部',
+          children: []
+        }].concat(response.data);
+        this.selectedLabel = '全部';
+        this.queryParams.areaCode = '-1';
+      } catch (error) {
+        console.error('获取区域列表失败:', error);
+        this.$message.error('获取区域列表失败');
+      }
+    },
+    objTypeChange() {
+      switch (this.queryParams.objType) {
+        case '1': // 区域
+          break;
+        case '2': // 设施
+          this.loadFacilityData();
+          break;
+      }
     },
+    // 生成整点时间范围
+    generateHourRanges() {
+      const ranges = []
+      for (let i = 0; i < 24; i++) {
+        const start = `${i.toString().padStart(2, '0')}:00:00`
+        const end = `${i.toString().padStart(2, '0')}:59:59`
+        ranges.push(`${start} - ${end}`)
+      }
+      return ranges
+    },
+
+    // 时间选择处理
+    handleTimeChange(field) {
+      if (this.queryParams[field]) {
+        const date = new Date(this.queryParams[field])
+        // 手动格式化日期(替代moment.js)
+        const formatDate = (d) => {
+          const pad = (n) => String(n).padStart(2, '0')
+          return `${d.getFullYear()}-${pad(d.getMonth()+1)}-${pad(d.getDate())} ${pad(d.getHours())}:00:00`
+        }
+        this.queryParams[field] = formatDate(date)
+      }
+
+      // 自动同步结束时间范围
+      if (field === 'startRecTime' && this.queryParams.endRecTime) {
+        this.$nextTick(() => {
+          this.$refs.queryForm.validateField('endRecTime')
+        })
+      }
+    },
+
+
     // 取消按钮
     cancel() {
       this.open = false;
@@ -192,9 +374,12 @@ export default {
       this.form = {
         id: null,
         areaCode: null,
-        date: null
+        objCode: null,
+        objType: null,
+        date: null,
+        elecUseQuantity: null,
       };
-      this.resetForm("form");
+      this.resetForm('form');
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -203,68 +388,25 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm('queryForm');
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
+      this.ids = selection.map(item => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加节能计量日";
+    // 筛选节点
+    filterNode (value, data) {
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
     },
-    /** 修改按钮操作 */
-    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.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`)
-    }
-  }
+  },
 };
 </script>

+ 155 - 183
ems-ui-cloud/src/views/analysis/report/statement-prod.vue

@@ -1,138 +1,79 @@
 <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-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="startRecTime">
+            <el-date-picker
+              v-model="queryParams.startRecTime"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:00:00"
+              :picker-options="startPickerOptions"
+              placeholder="请选择开始时间"
+              @change="handleTimeChange('startRecTime')">
+            </el-date-picker>
+          </el-form-item>
 
-    <el-table v-loading="loading" :data="pvSupplyHList" @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="time">
-        <template slot-scope="scope">
-          <span>{{ scope.row.time }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="总发电量(kW·h)" align="center" prop="genElecQuantity"/>
-      <el-table-column label="自用电量(kW·h)" align="center" prop="useElecQuantity"/>
-      <el-table-column label="上网电量(kW·h)" align="center" prop="upElecQuantity"/>
-      <el-table-column label="上网收益(¥)" align="center" prop="upElecEarn"/>
-    </el-table>
-    <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-    />
+          <!-- 结束时间选择器 -->
+          <el-form-item label="结束时间" prop="endRecTime">
+            <el-date-picker
+              v-model="queryParams.endRecTime"
+              type="datetime"
+              value-format="yyyy-MM-dd HH:00:00"
+              :picker-options="endPickerOptions"
+              placeholder="请选择结束时间"
+              @change="handleTimeChange('endRecTime')">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button type="warning" plain icon="el-icon-download" size="mini" v-hasPermi="['ems:EmsEcoD:export']" @click="handleExport">导出</el-button>
+          </el-form-item>
+        </el-form>
 
-    <!-- 添加或修改节能计量日对话框 -->
-    <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>
+        <el-table v-loading="loading" :data="pvSupplyHList" @selection-change="handleSelectionChange">
+          <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="time">
+            <template slot-scope="scope">
+              <span>{{ scope.row.time }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="总发电量(kW·h)" align="center" prop="genElecQuantity"/>
+          <el-table-column label="自用电量(kW·h)" align="center" prop="useElecQuantity"/>
+          <el-table-column label="上网电量(kW·h)" align="center" prop="upElecQuantity"/>
+          <el-table-column label="上网收益(¥)" align="center" prop="upElecEarn"/>
+        </el-table>
+        <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 {addEmsEcoD, delEmsEcoD, getEmsEcoD, updateEmsEcoD} from "@/api/ems/EmsEcoD";
+import { areaTreeByFacsCategory } from '@/api/basecfg/area'
 import {listPvSupplyH} from "@/api/mgr/pgSupplyH";
 
 export default {
@@ -158,12 +99,24 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 表单参数
+      areaOptions: [],
+      areaName: undefined,
+      facsCategory: 'E',
+      facsSubCategory: 'E5',
+      // 设施选项
+      facsOptions: undefined,
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         areaCode: null,
-        date: null,
+        startRecTime: null,
+        endRecTime: null,
       },
       // 表单参数
       form: {},
@@ -175,10 +128,28 @@ export default {
         date: [
           {required: true, message: "日期不能为空", trigger: "blur"}
         ],
+      },
+      // 时间选择器配置
+      startPickerOptions: {
+        disabledDate: (time) => {
+          return time.getTime() > Date.now() - 8.64e7 // 禁用未来时间
+        },
+        selectableRange: this.generateHourRanges()
+      },
+      endPickerOptions: {
+        disabledDate: (time) => {
+          if (this.queryParams.startRecTime) {
+            return time.getTime() < new Date(this.queryParams.startRecTime).getTime() ||
+              time.getTime() > Date.now() - 8.64e7
+          }
+          return time.getTime() > Date.now() - 8.64e7
+        },
+        selectableRange: this.generateHourRanges()
       }
     };
   },
   created() {
+    this.getAreaList();
     this.getList();
   },
   methods: {
@@ -191,6 +162,48 @@ export default {
         this.loading = false
       })
     },
+    // 查询区域列表
+    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'
+      })
+    },
+    // 生成整点时间范围
+    generateHourRanges() {
+      const ranges = []
+      for (let i = 0; i < 24; i++) {
+        const start = `${i.toString().padStart(2, '0')}:00:00`
+        const end = `${i.toString().padStart(2, '0')}:59:59`
+        ranges.push(`${start} - ${end}`)
+      }
+      return ranges
+    },
+
+    // 时间选择处理
+    handleTimeChange(field) {
+      if (this.queryParams[field]) {
+        const date = new Date(this.queryParams[field])
+        // 手动格式化日期(替代moment.js)
+        const formatDate = (d) => {
+          const pad = (n) => String(n).padStart(2, '0')
+          return `${d.getFullYear()}-${pad(d.getMonth()+1)}-${pad(d.getDate())} ${pad(d.getHours())}:00:00`
+        }
+        this.queryParams[field] = formatDate(date)
+      }
+
+      // 自动同步结束时间范围
+      if (field === 'startRecTime' && this.queryParams.endRecTime) {
+        this.$nextTick(() => {
+          this.$refs.queryForm.validateField('endRecTime')
+        })
+      }
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -215,64 +228,23 @@ 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
-    },
-    /** 新增按钮操作 */
-    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.download('ems/prod/pv/hour/export', {
         ...this.queryParams
-      }, `EmsEcoD_${new Date().getTime()}.xlsx`)
+      }, `产能报表_${new Date().getTime()}.xlsx`)
+    },
+    // 筛选节点
+    filterNode (value, data) {
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
+    },
+    // 节点单击事件
+    handleNodeClick (data) {
+      this.queryParams.areaCode = data.id
+      this.selectedLabel = data.label
+      this.getList()
     }
   }
 };

+ 1 - 5
ems-ui-cloud/src/views/ca/emission.vue

@@ -36,12 +36,8 @@
           </el-form-item>
         </el-form>
 
-        <el-row :gutter="10" class="mb8">
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-
         <el-table v-loading="loading" :data="caMeterDList">
-          <el-table-column label="园区名称" align="center" prop="areaName"/>
+          <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>

+ 1 - 5
ems-ui-cloud/src/views/ca/emissionCalc.vue

@@ -36,12 +36,8 @@
           </el-form-item>
         </el-form>
 
-        <el-row :gutter="10" class="mb8">
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-
         <el-table v-loading="loading" :data="caMeterDList">
-          <el-table-column label="园区名称" align="center" prop="areaName"/>
+          <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>

+ 1 - 5
ems-ui-cloud/src/views/ems/EmsEcoD/index.vue

@@ -43,12 +43,8 @@
           <span>上月平均日用水花费: {{ lastMonthAvgWaterCost }}(元)</span>
         </div>
 
-        <el-row :gutter="10" class="mb8">
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-
         <el-table v-loading="loading" :data="EmsEcoDList" >
-          <el-table-column label="园区" align="center" prop="areaName" />
+          <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>

+ 1 - 5
ems-ui-cloud/src/views/prediction/ca.vue

@@ -28,11 +28,7 @@
           </el-form-item>
         </el-form>
 
-        <el-row :gutter="10" class="mb8">
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-
-        <el-table v-loading="loading" :data="forecastCaList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="forecastCaList" >
           <el-table-column label="园区名称" align="center" prop="areaName" />
           <el-table-column label="月份" align="center" prop="month" width="180"/>
           <el-table-column label="碳排量(kg)" align="center" prop="caEmission" />

+ 1 - 3
ems-ui-cloud/src/views/prediction/consume.vue

@@ -47,9 +47,7 @@
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
-        <el-row :gutter="10" class="mb8">
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
+
         <el-table v-loading="loading" :data="forecastConsumeList" @selection-change="handleSelectionChange">
           <el-table-column label="对象名称" align="center" prop="objName" />
           <el-table-column label="对象类型" align="center" prop="objType">

+ 0 - 4
ems-ui-cloud/src/views/prediction/prod.vue

@@ -37,10 +37,6 @@
           </el-form-item>
         </el-form>
 
-        <el-row :gutter="10" class="mb8">
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-
         <el-table v-loading="loading" :data="predictionProdList" >
           <el-table-column label="位置名称" align="center" prop="areaName"/>
           <el-table-column label="设施名称" align="center" prop="facsName"/>