From d61deafbf82a2913669542c7d8c811fa6ce5130f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Fri, 30 Sep 2022 16:20:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=B1=E5=9F=BA=E5=9D=91(=E5=AE=9E=E6=97=B6?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE):=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deepFoundationPitManage/dataConfig.vue    | 51 ++++++++++++-------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/views/projectFront/deepFoundationPitManage/dataConfig.vue b/src/views/projectFront/deepFoundationPitManage/dataConfig.vue
index bc812fcd..1cf8fd1b 100644
--- a/src/views/projectFront/deepFoundationPitManage/dataConfig.vue
+++ b/src/views/projectFront/deepFoundationPitManage/dataConfig.vue
@@ -560,7 +560,7 @@
                 style="margin-right: 10px"
               >{{$t('message.deepFoundConfig.pointNo')}}</span>
               <el-input
-                v-model="devNum2"
+                v-model="exportData.measurePointNumber"
                 :placeholder="$t('message.deepFoundConfig.placeholderText')"
               ></el-input>
             </div>
@@ -571,7 +571,7 @@
                 style="margin-right: 10px"
               >{{$t('message.deepFoundConfig.alarmStatus')}}</span>
               <el-select
-                v-model="alarmStatus2"
+                v-model="exportData.alarmState"
                 clearable
                 :placeholder="$t('message.deepFoundConfig.placeholderText2')"
               >
@@ -617,6 +617,11 @@
               plain
               @click="selectDeepExcavationCurrentData"
             >{{$t('message.deepFoundConfig.search')}}</el-button>
+            <el-button
+              type="primary"
+              plain
+              @click="exportDataFn"
+            >导出</el-button>
           </div>
           <el-table :data="currentPointDetail" class="tables" height="560">
             <!-- 测点编号 -->
@@ -1430,9 +1435,13 @@ export default {
         }
       ],
       showActiveDetail: false,
-      devNum2: "",
-      alarmStatus2: "",
       acquisitionTime: [],
+      exportData:{
+        alarmState:"",
+        measurePointNumber:"",
+        startTime:"",
+        endTime: "",
+      },
       startX: "",
       startY: "",
       ratio: 1,
@@ -1538,8 +1547,8 @@ export default {
       this.deleteInfo = false;
     },
     closeActiveDetail() {
-      this.devNum2 = "";
-      this.alarmStatus2 = "";
+      this.exportData.measurePointNumber = "";
+      this.exportData.alarmState = "";
       this.showActiveDetail = false;
       this.selectDeepExcavationMonitorTypeList();
     },
@@ -1756,17 +1765,11 @@ export default {
       });
     },
     selectDeepExcavationCurrentData() {
-      let data = {
-        alarmState: this.alarmStatus2 ? this.alarmStatus2 : "",
-        measurePointNumber: this.devNum2,
-        relaId: this.relaId,
-        projectSn: this.projectSn,
-        startTime: this.acquisitionTime != null ? this.acquisitionTime[0] : "",
-        endTime: this.acquisitionTime != null ? this.acquisitionTime[1] : "",
-        pageNo: this.pagInfo2.pageNo,
-        pageSize: this.pagInfo2.pageSize
-      };
-      // selectDeepExcavationCurrentDataApi
+      let data = this.exportData
+      data.startTime = this.acquisitionTime != "" ? this.acquisitionTime[0] : "",
+      data.endTime = this.acquisitionTime != "" ? this.acquisitionTime[1] : "",
+      data.pageNo = this.pagInfo2.pageNo,
+      data.pageSize = this.pagInfo2.pageSize
       selectDeepExcavationCurrentDataListApi(data).then(res => {
         console.log(res);
         if (res.code == 200) {
@@ -1776,6 +1779,20 @@ export default {
         }
       });
     },
+    // 导出数据
+    exportDataFn(){
+      this.exportData.startTime = this.acquisitionTime != "" ? this.acquisitionTime[0] : "",
+      this.exportData.endTime = this.acquisitionTime != "" ? this.acquisitionTime[1] : "",
+      console.log('=======导出传进去的参数',this.exportData)
+      window.location.href =
+        this.$http.defaults.baseURL +
+        'xmgl/deepExcavationCurrentData/exportData?alarmState=' +  this.exportData.alarmState + 
+        '&measurePointNumber=' + this.exportData.measurePointNumber +
+        '&projectSn='  +  this.projectSn +
+        '&relaId=' + this.relaId +
+        '&startTime=' + this.exportData.startTime +
+        '&endTime=' + this.exportData.endTime
+    },
     // 获取当前时间 返回YYYY-MM-DD HH:mm:ss
     selectNowDate() {
       var date = new Date(),