Explorar el Código

feat: 添加集抄统计功能及接口

yusheng hace 5 meses
padre
commit
60d480751d

+ 57 - 2
src/api/centralizedMeterReading/index.js

@@ -37,7 +37,9 @@ export async function update(data) {
  * 删除
  */
 export async function deleteById(data) {
-  const res = await request.delete(`/ems/remote_meter_reading/delete`,{data} );
+  const res = await request.delete(`/ems/remote_meter_reading/delete`, {
+    data
+  });
   if (res.data.code == 0) {
     return res.data.data;
   }
@@ -48,7 +50,9 @@ export async function deleteById(data) {
  * 更新发布状态
  */
 export async function updatePublishStatus(id, publishStatus) {
-  const res = await request.put(`/ems/remote_meter_reading/updatePublishStatus/${id}/${publishStatus}`);
+  const res = await request.put(
+    `/ems/remote_meter_reading/updatePublishStatus/${id}/${publishStatus}`
+  );
   if (res.data.code == 0) {
     return res.data.data;
   }
@@ -65,3 +69,54 @@ export async function getById(id) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+//按日集抄统计-按小时展示
+export async function statByDay(params) {
+  const res = await request.get(`/ems/remote_meter_reading/statByDay`, {
+    params
+  });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+//按月集抄统计-按日展示
+export async function statByMonth(params) {
+  const res = await request.get(`/ems/remote_meter_reading/statByMonth`, {
+    params
+  });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+//按年集抄统计-按月展示
+export async function statByYear(params) {
+  const res = await request.get(`/ems/remote_meter_reading/statByYear`, {
+    params
+  });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+//整年度集抄统计-按年展示
+export async function statByYearRange(params) {
+  const res = await request.get(`/ems/remote_meter_reading/statByYearRange`, {
+    params
+  });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 更新
+ */
+export async function refreshData(data) {
+  const res = await request.post(`/ems/remote_meter_reading/refreshData`, data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

+ 21 - 0
src/views/centralizedMeterReading/automaticCentralizedMeterReading.vue

@@ -0,0 +1,21 @@
+<template>
+  <div>
+    <list pageName="automaticCentralizedMeterReading"></list>
+  </div>
+</template>
+
+<script>
+  import list from './list.vue';
+
+  export default {
+    components: {
+      list
+    },
+    data() {
+      return {};
+    },
+    methods: {}
+  };
+</script>
+
+<style scoped lang="scss"></style>

+ 613 - 0
src/views/centralizedMeterReading/collectionList.vue

@@ -0,0 +1,613 @@
+<template>
+  <div class="energy-monitoring">
+    <el-card shadow="never" class="monitoring-card">
+      <!-- 主内容区 -->
+      <ele-split-layout
+        width="220px"
+        allow-collapse
+        :right-style="{ overflow: 'hidden' }"
+      >
+        <!-- 左侧树形菜单 -->
+        <div class="left-sidebar">
+          <el-tabs
+            v-model="activeTab"
+            type="border-card"
+            @tab-click="activeTabChange"
+          >
+            <el-tab-pane label="设备类型" name="org">
+              <el-tree
+                :data="orgTreeData"
+                :props="treeProps"
+                node-key="id"
+                highlight-current
+                @node-click="handleNodeClick"
+                style="height: calc(100vh - 180px)"
+                ref="treeRef"
+              ></el-tree>
+            </el-tab-pane>
+            <el-tab-pane label="用能分区" name="energy">
+              <el-tree
+                :data="treeData"
+                :props="treeProps"
+                node-key="id"
+                default-expand-all
+                ref="treeRef1"
+                highlight-current
+                @node-click="handleNodeClick"
+              ></el-tree>
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+
+        <!-- 右侧内容区 -->
+        <template v-slot:content>
+          <div class="right-content">
+            <!-- 搜索区域 -->
+            <div class="search-area card-mode">
+              <!-- 搜索框 -->
+
+              <div class="search-input-wrapper">
+                <el-form label-width="90px" :inline="true">
+                  <el-form-item label="关键字:">
+                    <el-input
+                      v-model="where.keyWord"
+                      placeholder="关键字"
+                      prefix-icon="el-icon-search"
+                      clearable
+                      @keyup.enter.native="handleSearch"
+                      style="width: 250px"
+                    >
+                    </el-input>
+                  </el-form-item>
+
+                  <el-form-item label="用能分类:">
+                    <el-select
+                      clearable
+                      v-model="where.energyClassificationCode"
+                      style="width: 250px"
+                    >
+                      <el-option
+                        v-for="(op, i) in energyConsumingUnitList"
+                        :label="op.label"
+                        :value="op.value"
+                        :key="i"
+                      ></el-option>
+                    </el-select>
+                  </el-form-item>
+
+                  <el-form-item
+                    v-if="pageName != 'fullYearCollection'"
+                    :label="
+                      pageName == 'dailyCollection'
+                        ? '查询日期:'
+                        : pageName == 'monthlyCollection'
+                        ? '查询月份:'
+                        : pageName == 'yearlyCollection'
+                        ? '查询年度:'
+                        : ''
+                    "
+                  >
+                    <el-date-picker
+                      v-model="queryDate"
+                      @change="handleDateChange"
+                      :type="
+                        pageName == 'dailyCollection'
+                          ? 'date'
+                          : pageName == 'monthlyCollection'
+                          ? 'month'
+                          : pageName == 'yearlyCollection'
+                          ? 'year'
+                          : ''
+                      "
+                      :format="
+                        pageName == 'dailyCollection'
+                          ? 'yyyy-MM-dd'
+                          : pageName == 'monthlyCollection'
+                          ? 'yyyy-MM'
+                          : pageName == 'yearlyCollection'
+                          ? 'yyyy'
+                          : ''
+                      "
+                      :value-format="
+                        pageName == 'dailyCollection'
+                          ? 'yyyy-MM-dd'
+                          : pageName == 'monthlyCollection'
+                          ? 'yyyy-MM'
+                          : pageName == 'yearlyCollection'
+                          ? 'yyyy'
+                          : 'yyyy-MM-dd'
+                      "
+                      placeholder="选择"
+                      style="width: 200px"
+                    >
+                    </el-date-picker>
+                  </el-form-item>
+                  <el-form-item
+                    v-if="pageName == 'fullYearCollection'"
+                    label="查询年度:"
+                  >
+                    <el-date-picker
+                      v-model="where.startYear"
+                      @change="handleYearRangeChange"
+                      type="year"
+                      format="yyyy"
+                      value-format="yyyy"
+                      placeholder="选择"
+                      style="width: 200px"
+                    >
+                    </el-date-picker>
+                    至
+                    <el-date-picker
+                      v-model="where.endYear"
+                      @change="handleYearRangeChange"
+                      type="year"
+                      format="yyyy"
+                      value-format="yyyy"
+                      placeholder="选择"
+                      style="width: 200px"
+                    >
+                    </el-date-picker>
+                  </el-form-item>
+                </el-form>
+              </div>
+
+              <div>
+                <el-button type="primary" @click="handleSearch">搜索</el-button>
+                <el-button @click="handleReset">重置</el-button></div
+              >
+            </div>
+
+            <!-- 列表视图 -->
+            <div class="list-view">
+              <ele-pro-table
+                ref="table"
+                row-key="id"
+                :columns="columns"
+                :datasource="datasource"
+                :cache-key="cacheKeyUrl"
+                autoAmendPage
+                height="calc(100vh - 300px)"
+              >
+              </ele-pro-table>
+            </div>
+          </div>
+        </template>
+      </ele-split-layout>
+    </el-card>
+  </div>
+</template>
+
+<script>
+  import dictMixins from '@/mixins/dictMixins';
+  import tableColumnsMixin from '@/mixins/tableColumnsMixin';
+  import { getTreeByPid } from '@/api/classifyManage';
+  import { basicAreaPageAPI } from '@/api/factoryModel';
+  import {
+    statByDay,
+    statByMonth,
+    statByYear,
+    statByYearRange
+  } from '@/api/centralizedMeterReading/index.js';
+
+  import dayjs from 'dayjs';
+  import { energyConsumingUnitList } from '@/enum/dict.js';
+
+  export default {
+    mixins: [dictMixins, tableColumnsMixin],
+    components: {},
+    props: {
+      pageName: ''
+    },
+    data() {
+      return {
+        activeTab: 'org',
+        // 更新时间
+        updateTime: dayjs().format('YYYY-M-D HH:mm:ss'),
+        // 树形数据
+        treeData: [],
+        orgTreeData: [],
+        treeProps: {
+          children: 'children',
+          label: 'name'
+        },
+
+        areaId: '',
+        categoryLevelId: '',
+        // 表格列配置
+        cacheKeyUrl: ` ems-collectionList-${this.pageName}-list`,
+        energyConsumingUnitList,
+        queryDate: '',
+        where: {
+          keyWord: '',
+          energyClassificationCode: '',
+          queryDate: '',
+          queryMonth: '',
+          queryYear: '',
+          startYear: '',
+          endYear: ''
+        }
+      };
+    },
+    created() {
+      // 设置默认日期
+      this.initDefaultDate();
+      getTreeByPid('29').then((res) => {
+        this.orgTreeData = res.data;
+        if (this.orgTreeData.length) {
+          this.handleNodeClick(this.orgTreeData[0]);
+          this.$nextTick(() => {
+            this.$refs.treeRef.setCurrentKey(this.orgTreeData[0].id);
+          });
+        }
+      });
+      /* 获取区域集合 */
+      basicAreaPageAPI({
+        pageNum: 1,
+        size: 9999
+      }).then((res) => {
+        this.treeData = this.$util.toTreeData({
+          data: res,
+          idField: 'id',
+          parentIdField: 'parentId'
+        });
+      });
+    },
+    computed: {
+      columns() {
+        let arr = [
+          {
+            columnKey: 'index',
+            label: '序号',
+            type: 'index',
+            width: 55,
+            align: 'center',
+            fixed: 'left'
+          },
+          {
+            prop: 'substanceName',
+            label: '表计',
+            align: 'center',
+            minWidth: 130,
+            showOverflowTooltip: true
+          }
+        ];
+        // 日采集 - 1-24时
+        if (this.pageName == 'dailyCollection') {
+          for (let i = 1; i <= 24; i++) {
+            arr.push({
+              prop: 'hour0' + i,
+              label: i + '时',
+              align: 'center',
+              minWidth: 90,
+              showOverflowTooltip: true
+            });
+          }
+        }
+        // 月采集 - 1-31日(根据选择的月份天数)
+        if (this.pageName == 'monthlyCollection') {
+          // 获取选择月份的天数,默认为当前月
+          const queryMonth = this.where.queryMonth || dayjs().format('YYYY-MM');
+          const daysInMonth = dayjs(queryMonth).daysInMonth();
+          for (let i = 1; i <= daysInMonth; i++) {
+            arr.push({
+              prop: 'day0' + i,
+              label: i + '日',
+              align: 'center',
+              minWidth: 80,
+              showOverflowTooltip: true
+            });
+          }
+        }
+        // 年采集 - 1-12月
+        if (this.pageName == 'yearlyCollection') {
+          for (let i = 1; i <= 12; i++) {
+            arr.push({
+              prop: 'month0' + i,
+              label: i + '月',
+              align: 'center',
+              minWidth: 100,
+              showOverflowTooltip: true
+            });
+          }
+        }
+        // 全年采集 - 根据startYear和endYear生成年度列
+        if (this.pageName == 'fullYearCollection') {
+          const startYear = parseInt(this.where.startYear) || dayjs().year();
+          const endYear = parseInt(this.where.endYear) || dayjs().year();
+          for (let year = startYear; year <= endYear; year++) {
+            arr.push({
+              prop: year + '',
+              label: year + '年',
+              align: 'center',
+              minWidth: 100,
+              showOverflowTooltip: true
+            });
+          }
+        }
+        return arr;
+      }
+    },
+    methods: {
+      // 初始化默认日期
+      initDefaultDate() {
+        const today = dayjs();
+        if (this.pageName == 'dailyCollection') {
+          this.queryDate = today.format('YYYY-MM-DD');
+        } else if (this.pageName == 'monthlyCollection') {
+          this.queryDate = today.format('YYYY-MM');
+        } else if (this.pageName == 'yearlyCollection') {
+          this.queryDate = today.format('YYYY');
+        } else if (this.pageName == 'fullYearCollection') {
+          const currentYear = today.format('YYYY');
+          this.where.startYear = currentYear;
+          this.where.endYear = currentYear;
+        }
+      },
+      // 日期变化处理
+      handleDateChange(val) {
+        // 校验不能为空
+        if (!val) {
+          this.$message.warning('查询日期不能为空');
+          this.initDefaultDate();
+          return;
+        }
+        // 日期变化后重新加载表格
+        this.$nextTick(() => {
+          this.$refs.table.reload({ page: 1 });
+        });
+      },
+      // 年度范围变化处理
+      handleYearRangeChange() {
+        // 校验不能为空
+        if (!this.where.startYear || !this.where.endYear) {
+          this.$message.warning('开始年度和结束年度不能为空');
+          return;
+        }
+        // 校验 startYear 不能大于 endYear
+        if (parseInt(this.where.startYear) > parseInt(this.where.endYear)) {
+          this.$message.warning('开始年度不能大于结束年度');
+          // 交换两个值
+          const temp = this.where.startYear;
+          this.where.startYear = this.where.endYear;
+          this.where.endYear = temp;
+        }
+        this.where.startDate = this.where.startYear;
+        this.where.endDate = this.where.endYear;
+        // 年度范围变化后重新加载表格
+        this.$nextTick(() => {
+          this.$refs.table.reload({ page: 1 });
+        });
+      },
+      // Tab切换
+      activeTabChange() {
+        this.categoryLevelId = '';
+        this.areaId = '';
+        if (this.activeTab == 'org') {
+          this.categoryLevelId = this.orgTreeData[0].id;
+          this.$nextTick(() => {
+            this.$refs.treeRef &&
+              this.$refs.treeRef.setCurrentKey(this.orgTreeData[0].id);
+          });
+        } else {
+          this.areaId = this.treeData[0] ? this.treeData[0].id : '';
+          this.$nextTick(() => {
+            this.$refs.treeRef1 &&
+              this.$refs.treeRef1.setCurrentKey(this.treeData[0].id);
+          });
+        }
+        this.$refs.table.reload({ page: 1 });
+      },
+      // 搜索
+      handleSearch() {
+        // 校验日期不能为空
+        if (this.pageName == 'fullYearCollection') {
+          if (!this.where.startYear || !this.where.endYear) {
+            this.$message.warning('开始年度和结束年度不能为空');
+            return;
+          }
+          if (parseInt(this.where.startYear) > parseInt(this.where.endYear)) {
+            this.$message.warning('开始年度不能大于结束年度');
+            return;
+          }
+        } else {
+          if (!this.where.queryDate) {
+            this.$message.warning('查询日期不能为空');
+            return;
+          }
+        }
+        this.$refs.table.reload({ page: 1 });
+      },
+      // 重置
+      handleReset() {
+        this.where = {
+          keyWord: '',
+          energyClassificationCode: '',
+          startDate: '',
+          endDate: '',
+          queryDate: '',
+          queryMonth: '',
+          queryYear: '',
+          startYear: '',
+          endYear: ''
+        };
+        this.initDefaultDate();
+        this.$refs.table.reload({ page: 1 });
+      },
+      // 树节点点击
+      handleNodeClick(data) {
+        this.categoryLevelId = '';
+        this.areaId = '';
+        if (this.activeTab == 'org') {
+          this.categoryLevelId = data.id;
+        } else {
+          this.areaId = data.id;
+        }
+        this.$refs.table.reload({ page: 1 });
+      },
+      // 表格数据源
+      async datasource({ page, limit }) {
+        let api = statByYearRange;
+
+        if (this.pageName == 'dailyCollection') {
+          this.where.queryDate = this.queryDate;
+          api = statByDay;
+        } else if (this.pageName == 'monthlyCollection') {
+          this.where.queryMonth = this.queryDate;
+          api = statByMonth;
+        } else if (this.pageName == 'yearlyCollection') {
+          this.where.queryYear = this.queryDate;
+          api = statByYear;
+        }
+
+        let res = await api({
+          pageNum: page,
+          size: limit,
+          ...this.where,
+          areaId: this.areaId,
+          categoryLevelId: this.categoryLevelId
+        });
+        if (this.pageName == 'fullYearCollection') {
+          if (res.list.length) {
+            res.list = res.list[0].dataList.map((item) => {
+              let data = { substanceName: item.substanceName };
+              for (let key in item.yearDataMap) {
+                data[key] = item.yearDataMap[key] || '';
+              }
+              return data;
+            });
+          }
+        }
+        console.log(res, 'res');
+
+        return res;
+      },
+
+      // 刷新表格
+      reloadTable() {
+        this.$refs.table.reload();
+      }
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  .energy-monitoring {
+    .monitoring-card {
+      height: calc(100vh - 100px);
+
+      ::v-deep .el-card__body {
+        height: 100%;
+        padding: 15px;
+      }
+    }
+
+    ::v-deep .ele-split-layout {
+      .ele-split-layout-left {
+        padding: 0;
+        background: transparent;
+        border: none;
+      }
+
+      .ele-split-layout-right {
+        padding: 0;
+      }
+
+      .ele-split-layout-trigger {
+        width: 8px;
+        background: #f0f0f0;
+        border-left: 1px solid #e0e0e0;
+        border-right: 1px solid #e0e0e0;
+
+        &:hover {
+          background: #d0d0d0;
+        }
+
+        .ele-split-layout-trigger-icon {
+          color: #909399;
+        }
+      }
+    }
+
+    .left-sidebar {
+      height: 100%;
+
+      ::v-deep .el-tabs--border-card {
+        box-shadow: none;
+        border: 1px solid #ebeef5;
+        height: 100%;
+
+        .el-tabs__header {
+          background-color: #f5f7fa;
+          border-bottom: 1px solid #ebeef5;
+          margin: 0;
+
+          .el-tabs__nav {
+            width: 100%;
+            display: flex;
+          }
+
+          .el-tabs__item {
+            flex: 1;
+            height: 39px;
+            line-height: 39px;
+            font-size: 13px;
+            padding: 0;
+            text-align: center;
+
+            &.is-active {
+              background-color: #fff;
+              border-bottom-color: #fff;
+            }
+          }
+        }
+
+        .el-tabs__content {
+          padding: 10px;
+          height: calc(100% - 40px);
+          overflow-y: auto;
+        }
+      }
+
+      ::v-deep .el-tree {
+        padding: 0;
+      }
+    }
+
+    .right-content {
+      flex: 1;
+      min-width: 0;
+      padding-left: 15px;
+
+      .search-area {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: 10px;
+        padding-bottom: 10px;
+        border-bottom: 1px solid #ebeef5;
+
+        .view-switch {
+          margin-left: 20px;
+          flex-shrink: 0;
+        }
+      }
+
+      .update-time {
+        font-size: 12px;
+        color: #000000;
+        margin-bottom: 10px;
+      }
+
+      .list-view {
+        // height: calc(100vh - 260px);
+
+        ::v-deep .ele-pro-table {
+          .el-table {
+            border: 1px solid #ebeef5;
+            border-radius: 4px;
+          }
+        }
+      }
+    }
+  }
+</style>

+ 21 - 0
src/views/centralizedMeterReading/dailyCollection.vue

@@ -0,0 +1,21 @@
+<template>
+  <div>
+    <collectionList pageName="dailyCollection"></collectionList>
+  </div>
+</template>
+
+<script>
+  import collectionList from './collectionList.vue';
+
+  export default {
+    components: {
+      collectionList
+    },
+    data() {
+      return {};
+    },
+    methods: {}
+  };
+</script>
+
+<style scoped lang="scss"></style>

+ 21 - 0
src/views/centralizedMeterReading/fullYearCollection.vue

@@ -0,0 +1,21 @@
+<template>
+  <div>
+    <collectionList pageName="fullYearCollection"></collectionList>
+  </div>
+</template>
+
+<script>
+  import collectionList from './collectionList.vue';
+
+  export default {
+    components: {
+      collectionList
+    },
+    data() {
+      return {};
+    },
+    methods: {}
+  };
+</script>
+
+<style scoped lang="scss"></style>

+ 45 - 16
src/views/centralizedMeterReading/index.vue → src/views/centralizedMeterReading/list.vue

@@ -70,8 +70,18 @@
                     type="primary"
                     @click="handleAdd"
                     style="margin-left: 10px"
+                    v-if="pageName == 'manualcentralizedMeterReading'"
                     >新增</el-button
                   >
+                  <el-button
+                    type="primary"
+                    @click="handleAdd(1)"
+                    style="margin-left: 10px"
+                    v-if="
+                      pageName == 'realTimeAutomaticCentralizedMeterReading'
+                    "
+                    >更新</el-button
+                  >
                 </template>
                 <template v-slot:substanceCode="{ row }">
                   <el-link
@@ -165,7 +175,8 @@
   import {
     getPage,
     deleteById,
-    updatePublishStatus
+    updatePublishStatus,
+    refreshData
   } from '@/api/centralizedMeterReading/index.js';
   import MeterReadingDialog from './meterReadingDialog.vue';
   import processSubmitDialog from '@/BIZComponents/processSubmitDialog/processSubmitDialog.vue';
@@ -179,6 +190,9 @@
       MeterReadingDialog,
       processSubmitDialog
     },
+    props: {
+      pageName: ''
+    },
     data() {
       return {
         // 视图模式:card-缩略图,list-列表
@@ -313,6 +327,7 @@
             prop: 'approvalStatus',
             label: '审核状态',
             align: 'center',
+            isNone: this.pageName != 'manualcentralizedMeterReading',
             minWidth: 100,
             formatter: (_row, _column, cellValue) => {
               return reviewStatus[_row.approvalStatus] || '-';
@@ -322,6 +337,7 @@
             prop: 'publishStatus',
             label: '发布状态',
             align: 'center',
+            isNone: this.pageName != 'manualcentralizedMeterReading',
             minWidth: 100,
             formatter: (_row, _column, cellValue) => {
               return _row.publishStatus == 1
@@ -338,9 +354,10 @@
             width: 180,
             align: 'center',
             fixed: 'right',
-            slot: 'action'
+            slot: 'action',
+            isNone: this.pageName != 'manualcentralizedMeterReading'
           }
-        ],
+        ].filter((item) => !item.isNone),
         cacheKeyUrl: 'ems-energy-monitoring-list',
         // 提交审核弹窗
         processSubmitDialogFlag: false,
@@ -384,7 +401,7 @@
         return [
           {
             label: '关键词',
-            value: 'keyword',
+            value: 'keyWord',
             type: 'input',
             placeholder: '请输入'
           },
@@ -395,20 +412,21 @@
             placeholder: ' ',
             planList: energyConsumingUnitList
           },
-          {
-            label: '抄表方式',
-            value: 'status',
-            type: 'select',
-            placeholder: ' ',
-            planList: [
-              { value: 1, label: '人工录入' },
-              { value: 0, label: '自动采集' }
-            ]
-          },
+          // {
+          //   label: '抄表方式',
+          //   value: 'meterReadingMethod',
+          //   type: 'select',
+          //   placeholder: ' ',
+          //   planList: [
+          //     { value: 1, label: '人工录入' },
+          //     { value: 0, label: '自动采集' }
+          //   ]
+          // },
           {
             label: '创建时间',
             value: 'createTime',
             type: 'date',
+            width: 350,
             valueAr: [
               'currentMeterReadingTimeStart',
               'currentMeterReadingTimeEnd'
@@ -463,7 +481,13 @@
           size: limit,
           ...where,
           areaId: this.areaId,
-          categoryLevelId: this.categoryLevelId
+          categoryLevelId: this.categoryLevelId,
+          meterReadingMethod:
+            this.pageName == 'manualcentralizedMeterReading'
+              ? 1
+              : this.pageName == 'realTimeAutomaticCentralizedMeterReading'
+              ? 2
+              : 0
         });
       },
       // 查看详情
@@ -503,7 +527,12 @@
           .catch(() => {});
       },
       // 新增
-      handleAdd() {
+      async handleAdd(type) {
+        if (type == 1) {
+          await refreshData();
+          await this.reloadTable();
+          return;
+        }
         this.$refs.meterReadingDialogRef.open(null, 'add');
       },
       // 编辑

+ 21 - 0
src/views/centralizedMeterReading/manualcentralizedMeterReading.vue

@@ -0,0 +1,21 @@
+<template>
+  <div>
+    <list pageName="manualcentralizedMeterReading"></list>
+  </div>
+</template>
+
+<script>
+  import list from './list.vue';
+
+  export default {
+    components: {
+      list
+    },
+    data() {
+      return {};
+    },
+    methods: {}
+  };
+</script>
+
+<style scoped lang="scss"></style>

+ 21 - 0
src/views/centralizedMeterReading/monthlyCollection.vue

@@ -0,0 +1,21 @@
+<template>
+  <div>
+    <collectionList pageName="monthlyCollection"></collectionList>
+  </div>
+</template>
+
+<script>
+  import collectionList from './collectionList.vue';
+
+  export default {
+    components: {
+      collectionList
+    },
+    data() {
+      return {};
+    },
+    methods: {}
+  };
+</script>
+
+<style scoped lang="scss"></style>

+ 21 - 0
src/views/centralizedMeterReading/realTimeAutomaticCentralizedMeterReading.vue

@@ -0,0 +1,21 @@
+<template>
+  <div>
+    <list pageName="realTimeAutomaticCentralizedMeterReading"></list>
+  </div>
+</template>
+
+<script>
+  import list from './list.vue';
+
+  export default {
+    components: {
+      list
+    },
+    data() {
+      return {};
+    },
+    methods: {}
+  };
+</script>
+
+<style scoped lang="scss"></style>

+ 21 - 0
src/views/centralizedMeterReading/yearlyCollection.vue

@@ -0,0 +1,21 @@
+<template>
+  <div>
+    <collectionList pageName="yearlyCollection"></collectionList>
+  </div>
+</template>
+
+<script>
+  import collectionList from './collectionList.vue';
+
+  export default {
+    components: {
+      collectionList
+    },
+    data() {
+      return {};
+    },
+    methods: {}
+  };
+</script>
+
+<style scoped lang="scss"></style>