From b524370bc666d429a9fe8fae1c4401ba4d59873f Mon Sep 17 00:00:00 2001
From: glj <glj>
Date: Fri, 9 Jun 2023 17:58:49 +0800
Subject: [PATCH] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../remoteSensingSourceData.js                       | 10 ++++++----
 .../components/retrievalCondition.vue                |  8 ++++----
 yarn.lock                                            | 12 ++++++++++++
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/api/remoteSensingSourceData/remoteSensingSourceData.js b/src/api/remoteSensingSourceData/remoteSensingSourceData.js
index 8ca21bc..fee2a17 100644
--- a/src/api/remoteSensingSourceData/remoteSensingSourceData.js
+++ b/src/api/remoteSensingSourceData/remoteSensingSourceData.js
@@ -41,7 +41,7 @@ export const approval = (data) => {
 export const importTemplate = (data) => {
 	return request({
 		url: '/api/' + moduleName + '/ui/remoteSensing/importTemplate',
-		headers:{'Content-Type': 'multipart/form-data'},
+		headers: { 'Content-Type': 'multipart/form-data' },
 		method: 'post',
 		data: data
 	});
@@ -49,15 +49,17 @@ export const importTemplate = (data) => {
 export const removeList = (ids) => {
 	return request({
 		url: '/api/' + moduleName + '/ui/remoteSensing/remove',
-		method: 'delte',
-		data: ids,
+		method: 'get',
+		params:{
+            ids
+        }
 	});
 }
 
 export const importTemplateImgList = (data) => {
 	return request({
 		url: '/api/' + moduleName + '/ui/remoteSensing/importTemplateImgList',
-		headers:{'Content-Type': 'multipart/form-data'},
+		headers: { 'Content-Type': 'multipart/form-data' },
 		method: 'post',
 		data: data
 	});
diff --git a/src/views/dataService/remoteSensingData/components/retrievalCondition.vue b/src/views/dataService/remoteSensingData/components/retrievalCondition.vue
index e88f27e..ecb0628 100644
--- a/src/views/dataService/remoteSensingData/components/retrievalCondition.vue
+++ b/src/views/dataService/remoteSensingData/components/retrievalCondition.vue
@@ -151,7 +151,7 @@ const removeThis = ()=>{
     type: 'warning',
   }).then(() => {
     //删除数据
-    removeList(ids,(state.searchName=='1'?"News":null)).then((res) => {
+    removeList(ids.join(','),(state.searchName=='1'?"News":null)).then((res) => {
         ElMessage.success("Delete successfully");
         getTableData();
     });
@@ -397,6 +397,7 @@ const searchRemoteSensingSourceData = () => {
 
 // 根据检索条件检索遥感元数据
 const getDataByCondition = (current, size, dataNew) => {
+  dataNew.beforeOrAfter = 3;
   getRemoteSensingSourceDataByCondition(current, size, JSON.stringify(dataNew)).then(
     (res) => {
       state.requestData = res.records;
@@ -496,8 +497,8 @@ const onHandleDisasterCurrentChange = (val) => {
 
 // 遥感元数据表size改变
 const onHandleSizeChange = (val) => {
-  state.tableData.param.pageSize = val;
-  state.tableData.param.pageNum = state.tableData.param.pageNum;
+  state.tableData.param.pageNum = val;
+  state.tableData.param.pageSize = state.tableData.param.pageSize;
   let dataNew = {};
   if (state.satelliteCodeList.length != 0) {
     dataNew = {
@@ -527,7 +528,6 @@ const onHandleSizeChange = (val) => {
 
 // 遥感元数据表current改变
 const onHandleCurrentChange = (val) => {
-  state.tableData.param.pageSize = state.tableData.param.pageSize;
   state.tableData.param.pageNum = val;
   let dataNew = {};
   if (state.satelliteCodeList.length != 0) {
diff --git a/yarn.lock b/yarn.lock
index 37547f7..a883688 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2629,6 +2629,18 @@ leaflet-imageoverlay-rotated@^0.2.1:
   dependencies:
     leaflet "^1.0.0"
 
+leaflet-search@^2.9.6:
+  version "2.9.11"
+  resolved "https://registry.npmmirror.com/leaflet-search/-/leaflet-search-2.9.11.tgz#9ceff372efdabbdfb71f1f3ac7c1f8e7d2fdc267"
+  integrity sha512-Tsp2rbd4SyBTaSJ2hGk/hdSzTLWlaehVDx0nQta4Ih9MjajxAWoizGB9RTMSFNnXYvqSRwWL8udLZXc83j5ivA==
+  dependencies:
+    leaflet "*"
+
+leaflet@*:
+  version "1.9.4"
+  resolved "https://registry.npmmirror.com/leaflet/-/leaflet-1.9.4.tgz#23fae724e282fa25745aff82ca4d394748db7d8d"
+  integrity sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==
+
 leaflet@^1.0.0, leaflet@^1.9.3:
   version "1.9.3"
   resolved "https://registry.npmmirror.com/leaflet/-/leaflet-1.9.3.tgz"