Merge branch 'main' of http://47.92.168.204:3000/VoRDM/vordm-admin into zqq

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',
+		method: 'get',
-		data: ids,
+		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
 	});

src/utils/storage.js

@@ -57,16 +57,15 @@ export const Session = {
 		window.sessionStorage.setItem(Local.setKey(key), JSON.stringify({data:val,time:curTime}));
 	},
 	//如果缓存过期则返回null
-	getEx(key,time = 6*60*1000) {
+	getEx(key,time = false) {
 		let data = window.sessionStorage.getItem(Local.setKey(key));
 		let dataObj = JSON.parse(data);
 		//如果dataObj为null，表示该数据从未设置过期时间
 		if (dataObj == null) {
 			return null;
 		}
-		if (new Date().getTime() - dataObj.time > time) {
+		if (time) {
-			window.sessionStorage.removeItem(Local.setKey(key));
+			return dataObj;
-			return null;
 		} else {
 			return dataObj.data;
 		}

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 = val;
-  state.tableData.param.pageNum = state.tableData.param.pageNum;
+  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) {

src/views/dataService/remoteSensingData/components/searchCondition.vue

@@ -201,7 +201,9 @@ const state = reactive({
   lon: '',
   disLat: '',
   disLon: '',
-  data: {}
+  data: {},
+  data2:[],
+  geometry: null,
 })
 //获取所有卫星类型
 onMounted(() => {
@@ -209,7 +211,17 @@ onMounted(() => {
     let data =  res.map(item=>{
       return {value:item.dictValue,label:item.dictValue}
     })
-    state.sensor = data;
+    state.data2=data;
+    //初始化加载根据state.switch判断，当时true的时候加载 landsat、Sentinel。否者加载出这两个以外所有内容
+    if(state.switch){
+      state.sensor=state.data2.filter(item=>{
+        return item.value=='landsat'||item.value=='sentinel'
+      })
+    }else{
+      state.sensor=state.data2.filter(item=>{
+        return item.value!='landsat'&&item.value!='sentinel'
+      })
+    }
     state.dictData = res;
   })
 })
@@ -282,9 +294,12 @@ const addCoordinate = () => {
       document.getElementsByClassName('coordinateBtn')[0].innerText = 'Add coordinates';
     }
   }else{
+      map.value.mapOperations.drawCreated()
+     
       map.value.mapOperations.off("click", onMapClick)
       map.value.mapOperations.drawPolygon()
-      map.value.mapOperations.drawCreated()
+      map.value.mapOperations.wktParseToMap(state.geometry)
+      
   }
 
 }
@@ -298,8 +313,8 @@ const clearCoordinate = () => {
     return;
   }
   state.coordinateList = [];
-  state.startTime = '';
+  // state.startTime = '';
-  state.endTime = '';
+  // state.endTime = '';
   state.addCoord = false
   map.value.mapOperations.deleteRectangle()
   map.value.mapOperations.off("click", onMapClick)
@@ -308,7 +323,6 @@ const clearCoordinate = () => {
 // 编辑坐标点
 const editCoordinate = () => {
 }
-
 // 开始爬虫
 const startCrawl = () => {
   if (!state.startTime) {
@@ -371,10 +385,16 @@ const startCrawl = () => {
       var typeStr=typeArr.join('、')
 
         // getData();
-        ElMessage({
+        //使用英语询问是否停留在当前页，还是返回到列表页
-          message: 'Successfully launched '+typeStr+' crawler',
+        ElMessageBox.confirm('The '+typeStr+' data has been crawled, do you want to stay on this page?', 'Prompt', {
-          type: 'success',
+          confirmButtonText: 'Stay',
-        })
+          cancelButtonText: 'Return to the list',
+          type: 'warning'
+        }).then(() => {
+        }).catch(() => {
+          emit('response')
+        });
+        
     })
   })
 }
@@ -400,10 +420,27 @@ watch(
   },
   { immediate: true }
 )
+//监听state.switch
+watch(
+  () => state.switch,
+  (newValue, oldValue) => {
+    if(newValue){
+      state.sensor=state.data2.filter(item=>{
+        return item.value=='landsat'||item.value=='sentinel'
+      })
+    }else{
+      state.sensor=state.data2.filter(item=>{
+        return item.value!='landsat'&&item.value!='sentinel'
+      })
+    }
+  },
+  { immediate: true }
+)
 const setData = (row) => {
   state.data = row;
   state.selectID = row.disasterId
   map.value.mapOperations.wktParseToMap(row.geometry)
+  state.geometry = row.geometry;
 }
 defineExpose({
   setData

src/views/dataService/visualData/index.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="system-role-container layout-padding">
-    <el-config-provider :locale="en">
       <el-row :gutter="22">
         <el-col :span="10">
           <div class="system-role-padding layout-padding-auto layout-padding-view" style="height: 85vh;">
@@ -81,7 +80,6 @@
           </div>
         </el-col>
       </el-row>
-    </el-config-provider>
     <RoleDialog ref="roleDialogRef" @refresh="getTableData()" />
     <HotspotForm ref="hotspotRef" @callback="getTableData" />
     <WordClouds ref="wordCloudsRef" @callback="getTableData" />
@@ -91,13 +89,11 @@
 </template>
 
 <script lang="ts" setup name="systemRole">
-import type { TabsPaneContext } from 'element-plus';
 import HotspotForm from './component/hotspotForm.vue';
 import WordClouds from './component/wordCloudForm.vue';
 import EditHotspotForm from './component/editHotspotForm.vue';
 import EditWordCloudsForm from './component/editWordCloudForm.vue';
 import { getWordClouds, getHotspot, getDisasterPage, delData } from '/@/api/data/visualData.js';
-import en from 'element-plus/dist/locale/en.mjs'
 const activeName = ref('first');
 const hotspotRef = ref();
 const wordCloudsRef = ref();
@@ -108,7 +104,6 @@ const editWordCloudsRef = ref();
 import { defineAsyncComponent, reactive, onMounted, ref } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import disasterTable from "/@/components/table/DisasterTable.vue";
-import { ta } from 'element-plus/es/locale';
 import { landsat, submit } from '/@/api/crawl/index.js'
 import { useUserInfo } from '/@/stores/userInfo';
 

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"