导出

src/pages/analysis/energy/page.vue

@@ -50,6 +50,14 @@
               @click="getDataList()"
               >查询</el-button
             >
+            <el-button
+              type="primary"
+              style="margin-left: 10px"
+              size="mini"
+              icon="el-icon-upload"
+              @click="excel()"
+              >导出</el-button
+            >
             <!-- <el-form-item label="时间范围：">
               <el-button
                 size="mini"
@@ -150,8 +158,8 @@ export default {
         method: 'get',
         params: this.$http.adornParams({
           resourceType: this.activetap, //资源点类型
-          startTime: this.startTime,
-          endTime: this.endTime
+          startTime: this.startTime==null?'':this.startTime,
+          endTime: this.endTime==null?'':this.endTime
         })
       }).then((data) => {
         if (data && data.code === 0) {
@@ -160,6 +168,12 @@ export default {
         }
       })
     },
+    excel() {
+      console.log('startTime:' , this.startTime)
+      let paramts = "resourceType=" + this.activetap + "&startTime=" + (this.startTime==null?'':this.startTime) + "&endTime=" + (this.endTime==null?'':this.endTime);
+      console.log('paramts:' , paramts)
+      window.location.href = window.CONFIG.requestPath + "/admin/analysis/export/toExcelFx?" + paramts;
+    },
     // 开始时间change事件
     startChangeHandle(val) {
       if (val) {

src/pages/analysis/fault/index.vue

@@ -73,8 +73,8 @@ export default {
         url: this.$http.adornUrl('/analysis/getFaultAlarmList'),
         method: 'get',
         params: this.$http.adornParams({
-          startTime: this.startTime,
-          endTime: this.endTime
+          startTime: this.startTime==null?'':this.startTime,
+          endTime: this.endTime==null?'':this.endTime
         })
       }).then((data) => {
         if (data && data.code === 0) {

src/pages/analysis/indoor/index.vue

@@ -86,8 +86,8 @@ export default {
         params: this.$http.adornParams({
           resourceId: '',
           region: Number(this.activeName), //区域类型
-          startTime: this.startTime,
-          endTime: this.endTime
+          startTime: this.startTime==null?'':this.startTime,
+          endTime: this.endTime==null?'':this.endTime
         })
       }).then((data) => {
         if (data && data.code === 0) {

src/pages/analysis/outdoor/index.vue

@@ -78,8 +78,8 @@ export default {
         url: this.$http.adornUrl('/analysis/getSwqxzInfoTj'),
         method: 'get',
         params: this.$http.adornParams({
-          startTime: this.startTime,
-          endTime: this.endTime
+          startTime: this.startTime==null?'':this.startTime,
+          endTime: this.endTime==null?'':this.endTime
         })
       }).then((data) => {
         if (data && data.code === 0) {

src/pages/kb/indoor/history.vue

@@ -31,6 +31,7 @@
             value-format="yyyy-MM-dd"
             placeholder="选择日期")
           el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search"  @click="getList()") 查询
+          el-button( type="primary" style="margin-left: 10px" size="mini" icon="el-icon-upload" @click="excel()") 导出
     span(v-if="type==1")
         el-table( :data='dataList'  size="mini" ,style='width: 100%;' :header-cell-style="{ background: '#EEF8FF', color: '#333333' }")
             el-table-column( :resizable="false" type='index', header-align='center', align='center', label='序号')
@@ -115,8 +116,8 @@ export default {
         params: this.$http.adornParams({
           resourceId: this.dataForm.id,
           resourceType: this.dataForm.type,
-          startTime: this.startTime,
-          endTime: this.endTime,
+          startTime: this.startTime==null?'':this.startTime,
+          endTime: this.endTime==null?'':this.endTime,
           page: page || this.pageIndex,
           rows: size || this.pageSize
         })
@@ -131,6 +132,10 @@ export default {
         }
       })
     },
+    excel() {
+      let paramts = "resourceId=" + this.dataForm.id + "&resourceType=" + this.dataForm.type + "&startTime=" + (this.startTime==null?'':this.startTime) + "&endTime=" + (this.endTime==null?'':this.endTime);
+      window.location.href = window.CONFIG.requestPath + "/admin/kanban/export/toExcel?" + paramts;
+    },
     getDataListTb() {
       this.$http({
         url: this.$http.adornUrl('/analysis/getSnqxzInfoTj'),

src/pages/kb/outdoor/history.vue

@@ -45,6 +45,11 @@ el-dialog(
             value-format="yyyy-MM-dd"
             placeholder="选择日期")
           el-button( type="primary" style='margin-left:10px;' size="mini" icon="el-icon-search" @click="getList()") 查询
+          el-button(type="primary"
+          style="margin-left: 10px"
+          size="mini"
+          icon="el-icon-upload"
+          @click="excel()") 导出
   span(v-if="type == 1")
     el-table(
       :data="dataList",
@@ -252,8 +257,8 @@ export default {
         params: this.$http.adornParams({
           resourceId: this.dataForm.id,
           resourceType: this.dataForm.type, //室外气象站
-          startTime: this.startTime,
-          endTime: this.endTime,
+          startTime: this.startTime==null?'':this.startTime,
+          endTime: this.endTime==null?'':this.endTime,
           page: page || this.pageIndex,
           rows: size || this.pageSize
         })
@@ -268,6 +273,10 @@ export default {
         }
       })
     },
+    excel() {
+      let paramts = "resourceId=" + this.dataForm.id + "&resourceType=" + this.dataForm.type + "&startTime=" + (this.startTime==null?'':this.startTime) + "&endTime=" + (this.endTime==null?'':this.endTime);
+      window.location.href = window.CONFIG.requestPath + "/admin/kanban/export/toExcel?" + paramts;
+    },
     getDataListTb() {
       this.$http({
         url: this.$http.adornUrl('/analysis/getSwqxzInfoTj'),

src/pages/kb/power/components/historyDataModal.vue

@@ -4,7 +4,7 @@
     :visible.sync="visible"
     :append-to-body="true"
     @close="cancelhandle"
-    width="1200px"
+    width="70%"
   >
     <el-form :inline="true" :model="dataForm">
       <el-form-item label="设备名称：" prop="name" style="margin-bottom: 0">
@@ -89,7 +89,7 @@ const tableColums = [
   {
     label: '用电量',
     prop: 'electric_energy',
-    width: 200,
+    width: 400,
     align: 'center'
   },
   // {
@@ -136,6 +136,10 @@ export default {
   methods: {
     init(data) {
       this.visible = true
+      this.startTime = ''
+      this.endTime = ''
+      this.startPickerOptions = {}
+      this.endPickerOptions = {}
       this.dataForm = data
       this.currentActive = 1
       this.getDataList() //获取历史数据列表
@@ -147,8 +151,8 @@ export default {
         params: this.$http.adornParams({
           resourceId: this.dataForm.id, //资源点id
           resourceType: this.dataForm.type, //资源点类型
-          startTime: this.startTime,
-          endTime: this.endTime,
+          startTime: this.startTime==null?'':this.startTime,
+          endTime: this.endTime==null?'':this.endTime,
           page: page || this.pageIndex,
           rows: size || this.pageSize
         })
@@ -162,15 +166,16 @@ export default {
         }
       })
     },
-    excel(){
-      let paramts="resourceId="+this.dataForm.id+"&resourceType=" + this.dataForm.type + "&startTime=" + this.startTime + "&endTime=" + this.endTime;
-      console.log("/kanban/excel?"+paramts);
-      window.open("/kanban/excel?"+paramts);
+    excel() {
+      let paramts = "resourceId=" + this.dataForm.id + "&resourceType=" + this.dataForm.type + "&startTime=" + (this.startTime==null?'':this.startTime) + "&endTime=" + (this.endTime==null?'':this.endTime);
+      window.location.href = window.CONFIG.requestPath + "/admin/kanban/export/toExcel?" + paramts;
     },
     cancelhandle() {
       this.visible = false
-      this.startTime=''
-      this.endTime=''
+      this.startTime = ''
+      this.endTime = ''
+      this.startPickerOptions = {}
+      this.endPickerOptions = {}
     },
     // 开始时间change事件
     startChangeHandle(val) {