1

src/views/EnergyPricingScheme/index.vue

@@ -175,7 +175,6 @@
             align: 'center',
             minWidth: 100,
             formatter: (_row, _column, cellValue) => {
-   
               return _row.schemeType == 1
                 ? '单一费率'
                 : _row.schemeType == 2
@@ -407,8 +406,8 @@
       // 表格数据源
       async datasource({ page, limit, where }) {
         return await getPage({
-          page,
-          limit,
+          pageNum: page,
+          size: limit,
           ...where
         });
       }

src/views/centralizedMeterReading/index.vue

@@ -409,7 +409,10 @@
             label: '创建时间',
             value: 'createTime',
             type: 'date',
-            valueAr: ['currentMeterReadingTimeStart', 'currentMeterReadingTimeEnd']
+            valueAr: [
+              'currentMeterReadingTimeStart',
+              'currentMeterReadingTimeEnd'
+            ]
           }
         ];
       }
@@ -456,8 +459,8 @@
       // 表格数据源
       datasource({ page, limit, where }) {
         return getPage({
-          page,
-          limit,
+          pageNum: page,
+          size: limit,
           ...where,
           areaId: this.areaId,
           categoryLevelId: this.categoryLevelId

src/views/centralizedMeterReading/meterReadingDialog.vue

@@ -112,6 +112,7 @@
   import MaterialAdd from '@/components/common/MaterialAdd.vue';
   import dayjs from 'dayjs';
   import bpmDetail from '@/views/bpm/processInstance/detail.vue';
+  import { energyConsumingUnitList } from '@/enum/dict.js';
 
   const defForm = {
     id: '',
@@ -233,7 +234,9 @@
         this.form.energyTypeId = row.energyTypeId || '';
         this.form.energyTypeCode = row.energyTypeCode || '';
 
-        this.form.unit = row.unit || row.category?.modelType || 'kWh';
+        this.form.unit = energyConsumingUnitList
+          .find((item) => item.value == row.energyClassificationCode)
+          ?.unit.find((item) => item.value == row.energyUnit)?.label;
       },
       // 提交
       handleSubmit() {

src/views/energyClassification/index.vue

@@ -204,7 +204,7 @@
             label: '创建时间',
             value: 'time',
             type: 'date',
-            width:'300px',
+            width: '300px',
             valueAr: ['createTimeStart', 'createTimeEnd']
           }
         ];
@@ -244,8 +244,8 @@
       // 表格数据源
       async datasource({ page, limit, where }) {
         return await getPage({
-          page,
-          limit,
+          pageNum: page,
+          size: limit,
           ...where
         });
       }

src/views/energyConsumptionStatistics/index.vue

@@ -372,8 +372,8 @@
       // 表格数据源
       async datasource({ page, limit, where }) {
         return await getPage({
-          page,
-          limit,
+          pageNum: page,
+          size: limit,
           ...where,
           ...this.searchForm,
           areaId: this.areaId,