.env.dev

@@ -18,9 +18,9 @@ VUE_APP_TITLE = MES系统
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.49:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.8:48082'
-# VUE_APP_BASE_API = 'http://192.168.4.173:48082'
+VUE_APP_BASE_API = 'http://192.168.4.173:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.104:48082'
-VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.62:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.47:48082'

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

@@ -1,77 +1,76 @@
 <template>
-	<div
+  <div class="app-container" id='energyReportBox'>
-		class="app-container"
+
-		id="energyReportBox">
     <!-- 搜索工作栏 -->
     <search-bar
       :formConfigs="formConfig"
       ref="searchBarForm"
       :isFold="isFold"
-			@headBtnClick="buttonClick" />
+      @headBtnClick="buttonClick"
+    />
     <!-- 列表 -->
     <base-table
       :page="queryParams.pageNo"
       :limit="queryParams.pageSize"
       :table-props="tableProps"
       :table-data="list"
-			:max-height="tableH" />
+      :max-height="tableH"
+    />
     <pagination
       :page.sync="queryParams.pageNo"
       :limit.sync="queryParams.pageSize"
       :total="total"
-			@pagination="getList" />
+      @pagination="getList"
+    />
   </div>
 </template>
 
 <script>
-import {
+import { energyReportPageAuto, energyReportPageExportAuto } from "@/api/monitoring/energyReport"
-	energyReportPageAuto,
+import { getEnergyTypeListAll } from "@/api/base/energyType";
-	energyReportPageExportAuto,
+import { publicFormatter } from '@/utils/dict'
-} from '@/api/monitoring/energyReport';
+import { parseTime } from '@/utils/ruoyi'
-import { getEnergyTypeListAll } from '@/api/base/energyType';
-import { publicFormatter } from '@/utils/dict';
-import { parseTime } from '@/utils/ruoyi';
 const tableProps = [
   {
     prop: 'statisticType',
     label: '统计类型',
-		filter: publicFormatter('statistic_type'),
+    filter: publicFormatter('statistic_type')
   },
   {
     prop: 'startTime',
     label: '开始时间',
     filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
   },
   {
     prop: 'endTime',
     label: '结束时间',
     filter: parseTime,
-		minWidth: 160,
+    minWidth: 160
   },
   {
     prop: 'statisticName',
-		label: '统计方案',
+    label: '统计方案'
   },
   {
     prop: 'energyType',
-		label: '能源类型',
+    label: '能源类型'
   },
   {
     prop: 'startNum',
-		label: '抄表数(起始)',
+    label: '抄表数(起始)'
   },
   {
     prop: 'endNum',
-		label: '抄表数(结束)',
+    label: '抄表数(结束)'
   },
   {
     prop: 'useNum',
-		label: '消耗量',
+    label: '消耗量'
-	},
+  }
-];
+]
 export default {
-	name: 'EnergyLimit',
+  name: "EnergyLimit",
   data() {
     return {
       isFold: false,
@@ -81,7 +80,7 @@ export default {
           label: '能源类型',
           selectOptions: [],
           param: 'energyTypeId',
-					filterable: true,
+          filterable: true
         },
         {
           type: 'select',
@@ -89,39 +88,37 @@ export default {
           selectOptions: this.getDictDatas(this.DICT_TYPE.STATISTIC_TYPE),
           labelField: 'label',
           valueField: 'value',
-					param: 'statisticType',
+          param: 'statisticType'
         },
         {
           type: 'datePicker',
           label: '时间',
           dateType: 'datetimerange',
           format: 'yyyy-MM-dd HH:mm:ss',
-					valueFormat: 'timestamp',
+          valueFormat: "timestamp",
           rangeSeparator: '-',
           startPlaceholder: '开始时间',
           endPlaceholder: '结束时间',
           param: 'timeVal',
           defaultSelect: [],
-					width: 350,
+          width: 350
         },
         {
           type: 'button',
           btnName: '查询',
           name: 'search',
-					color: 'primary',
+          color: 'primary'
         },
         {
-					type: 'separate',
+          type: 'separate'
         },
         {
-					type: this.$auth.hasPermi('monitoring:energy-report:export')
+          type: this.$auth.hasPermi('monitoring:energy-report:export') ? 'button' : '',
-						? 'button'
-						: '',
           btnName: '导出',
           name: 'add',
           color: 'primary',
-					plain: true,
+          plain: true
-				},
+        }
       ],
       tableProps,
       tableH: this.tableHeight(260),
@@ -136,61 +133,53 @@ export default {
         energyTypeId: null,
         statisticType: null,
         startTime: null,
-				endTime: null,
+        endTime: null
-			},
+      }
     };
   },
   created() {
-		window.addEventListener('resize', this._eventListeners);
+    window.addEventListener('resize', () => {
-		this.getList();
+      this.tableH = this.tableHeight(260)
-		this.getTypeList();
+      this.isFold = this.searchBarWidth('energyReportBox', 1198)
+    })
+    this.getList()
+    this.getTypeList()
   },
   mounted() {
-		this.isFold = this.searchBarWidth('energyReportBox', 1198);
+    this.isFold = this.searchBarWidth('energyReportBox', 1198)
-	},
-	destroyed() {
-		window.removeEventListener('resize', this._eventListeners);
   },
   methods: {
-		_eventListeners() {
-			this.tableH = this.tableHeight(260);
-			this.isFold = this.searchBarWidth('energyReportBox', 1198);
-		},
     getTypeList() {
       getEnergyTypeListAll().then((res) => {
-				this.formConfig[0].selectOptions = res.data || [];
+        this.formConfig[0].selectOptions = res.data || []
         // this.energyTypeList = res.data || []
-			});
+      })
     },
     buttonClick(val) {
       switch (val.btnName) {
         case 'search':
-					this.queryParams.pageNo = 1;
+          this.queryParams.pageNo = 1
-					this.queryParams.energyTypeId = val.energyTypeId;
+          this.queryParams.energyTypeId = val.energyTypeId
-					this.queryParams.statisticType = val.statisticType;
+          this.queryParams.statisticType = val.statisticType
-					this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null;
+          this.queryParams.startTime = val.timeVal ? val.timeVal[0] : null
-					this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null;
+          this.queryParams.endTime = val.timeVal ? val.timeVal[1] : null
-					this.getList();
+          this.getList()
-					break;
+          break
         default:
-					this.$modal
+          this.$modal.confirm('是否确认导出').then(() => {
-						.confirm('是否确认导出')
+              return energyReportPageExportAuto({...this.queryParams});
-						.then(() => {
+            }).then(response => {
-							return energyReportPageExportAuto({ ...this.queryParams });
-						})
-						.then((response) => {
               this.$download.excel(response, '能源统计报表.xls');
-						})
+            }).catch(() => {})
-						.catch(() => {});
       }
     },
     /** 查询列表 */
     getList() {
-			energyReportPageAuto(this.queryParams).then((response) => {
+      energyReportPageAuto(this.queryParams).then(response => {
         this.list = response.data.list || [];
         this.total = response.data.total;
       });
-		},
+    }
-	},
+  }
 };
 </script>