页面调整

src/pages/eq/hall/config.js

@@ -116,7 +116,7 @@
     {
       align: 'center',
       prop: 'electric_energy',
-      label: '今日用电量(kwh)'
+      label: '用电量(kwh)'
     },
     // {
     //   align: 'center',

src/pages/eq/office/page.vue

@@ -57,7 +57,7 @@
             <span v-if="data.scope.setting_mode == 0">无</span>
             <span v-if="data.scope.setting_mode == 2">制冷模式</span>
             <span v-if="data.scope.setting_mode == 4">除湿模式</span>
-            <span v-if="data.scope.setting_mode == 8">送分模式</span>
+            <span v-if="data.scope.setting_mode == 8">送风模式</span>
             <span v-if="data.scope.setting_mode == 16">制热模式</span>
           </template>
           <template #setting_wind_speed="data">

src/pages/sys/commandlog/index.vue

@@ -120,6 +120,8 @@ export default {
         url: this.$http.adornUrl('/sysCommandLog/pageList'),
         method: 'post',
         data: {
+          page: this.pageIndex,
+          rows: this.pageSize,
           comMark: this.dataForm.comMark,
           comType: this.dataForm.comType,
           startTime: this.dataForm.startTime,

src/pages/sys/points/index.vue

@@ -188,7 +188,7 @@ export default {
       checkList: [], //筛选数据
       tableHeader: [
         { label: '点位名称', prop: 'name' },
-        { label: '点位类型', prop: 'type', slot: true},
+        { label: '点位类型', prop: 'type', slot: true },
         { label: '网关IP', prop: 'addressIp' },
         { label: '从机ID', prop: 'slaveId' },
         { label: '功能码', prop: 'functionCodeType', slot: true },
@@ -286,17 +286,15 @@ export default {
         this.checkedData.resourceId = ''
       }
     },
-    getDataList(sort, order) {
+    getDataList(page, size) {
       this.dataListLoading = true
       this.$http({
         url: this.$http.adornUrl('/liResourcePoints/pageList'),
         method: 'post',
         data: {
-          page: this.pageIndex,
-          rows: this.pageSize,
+          page: page || this.pageIndex,
+          rows: size || this.pageSize,
           resourceId: this.checkedData.resourceId,
-          sort: sort || 'create_time',
-          order: order || 'asc',
           stationId: this.stationId
         }
       }).then((data) => {