Merge branch 'projects/mesxc-test' into projects/mesxc-zhp

src/views/energy/base/energyPlcConnect/index.vue

@@ -36,7 +36,8 @@ const tableProps = [
   },
   {
     prop: 'objCode',
-    label: '对象编码'
+    label: '对象编码',
+    showOverflowtooltip: true
   },
   {
     prop: 'plcTableName',

src/views/energy/base/energyQuantityManual/index.vue

@@ -46,7 +46,8 @@ const tableProps = [
     prop: 'tableName',
     label: '能源表名',
     filter: publicFormatter('table_name'),
-    minWidth: 110
+    minWidth: 110,
+    showOverflowtooltip: true
   },
   {
     prop: 'recordTime',

src/views/energy/base/energyQuantityRealtime/index.vue

@@ -20,15 +20,18 @@ import * as XLSX from 'xlsx/xlsx.mjs'
 const tableProps = [
   {
     prop: 'objName',
-    label: '统计对象'
+    label: '统计对象',
+    showOverflowtooltip: true
   },
   {
     prop: 'objCode',
-    label: '对象编码'
+    label: '对象编码',
+    showOverflowtooltip: true
   },
   {
     prop: 'energyTypeName',
-    label: '能源类型'
+    label: '能源类型',
+    showOverflowtooltip: true
   },
   {
     prop: 'startValue',

src/views/energy/monitoring/energyStatistics/index.vue

@@ -2,46 +2,23 @@
   <div class="app-container">
 
     <!-- 搜索工作栏 -->
-    <search-bar
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-      :formConfigs="formConfig"
-      ref="searchBarForm"
-      @headBtnClick="buttonClick"
-    />
     <!-- 列表 -->
-    <base-table
+    <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
-      :page="queryParams.pageNo"
+      :max-height="tableH">
-      :limit="queryParams.pageSize"
+      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="160" label="操作" :method-list="tableBtn"
-      :table-props="tableProps"
+        @clickBtn="handleClick" />
-      :table-data="list"
-      :max-height="tableH"
-    >
-      <method-btn
-        v-if="tableBtn.length"
-        slot="handleBtn"
-        :width="160"
-        label="操作"
-        :method-list="tableBtn"
-        @clickBtn="handleClick"
-      />
     </base-table>
-    <pagination
+    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
-      :page.sync="queryParams.pageNo"
+      @pagination="getList" />
-      :limit.sync="queryParams.pageSize"
-      :total="total"
-      @pagination="getList"
-    />
     <!-- 新增 -->
-    <base-dialog
+    <base-dialog :dialogTitle="addOrEditTitle" :dialogVisible="centervisible" @cancel="handleCancel"
-      :dialogTitle="addOrEditTitle"
+      @confirm="handleConfirm" :before-close="handleCancel">
-      :dialogVisible="centervisible"
-      @cancel="handleCancel"
-      @confirm="handleConfirm"
-      :before-close="handleCancel"
-    >
       <energy-statistics-add ref="energyStatistics" @successSubmit="successSubmit" />
     </base-dialog>
     <!-- 参数绑定/查看 -->
-    <energy-statistics-det ref="plcParam" @closeDrawer="closeDrawer" :energyTypeList="energyTypeList"></energy-statistics-det>
+    <energy-statistics-det ref="plcParam" @closeDrawer="closeDrawer"
+      :energyTypeList="energyTypeList"></energy-statistics-det>
   </div>
 </template>
 
@@ -81,7 +58,7 @@ const tableProps = [
   }
 ]
 export default {
-  name: "energyStatistics",
+  name: "EnergyStatistics",
   components: { EnergyStatisticsAdd, EnergyStatisticsDet },
   data() {
     return {
@@ -224,13 +201,13 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm('是否确认删除方案名称为"' + row.name + '"的数据项?').then(function() {
+      this.$modal.confirm('是否确认删除方案名称为"' + row.name + '"的数据项?').then(function () {
         return deleteEnergyStatistics(row.id);
       }).then(() => {
         this.queryParams.pageNo = 1;
         this.getList();
         this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
+      }).catch(() => { });
     },
     closeDrawer() {
       this.getList()