fix: merge recolve

src/views/bmlq/xdsj/index.vue

@@ -91,6 +91,7 @@
 			type="date"
 			value-format="yyyy-MM-dd"
 			placeholder="选择日期"
+			style="margin-left: 40px;"
 			></el-date-picker>
 			<span slot="footer">
 			<el-button @click="exportDialogVisible = false">取消</el-button>
@@ -112,7 +113,8 @@ export default {
 		return {
 			exportDialogVisible: false,
         	exportDate: "",
-
+			// 根路径
+			baseURL: process.env.VUE_APP_BASE_API,
 		  // 总条数
 		  total: 0,
 		  dmList: [],
@@ -193,8 +195,14 @@ export default {
 			this.queryParams.deviceName ="";
 			this.queryParams.createTime ="";
 			this.allData()
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download('business/tun/data/exportData', {
+				...this.queryParams,
+				day: this.exportDate,
+			}, `断面收敛_${new Date().getTime()}.xlsx`)
 		}
-		
   } 
 };
 </script>

src/views/environmentMonitor/historyData/index.vue

@@ -237,6 +237,7 @@
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="选择日期"
+          style="margin-left: 40px;"
         ></el-date-picker>
         <span slot="footer">
           <el-button @click="exportDialogVisible = false">取消</el-button>
@@ -436,7 +437,7 @@
             day: this.exportDate,
             ...this.queryParams,
           },
-          `szData_${new Date().getTime()}.xlsx`
+          `环境监测_${new Date().getTime()}.xlsx`
         );
          this.exportDialogVisible = false
       }