yaowang
/
vordm-admin
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
yyhouc 2023-06-12 15:04:45 +08:00
parent 22a3e03122 c67287b910
commit 608475eabe
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/remoteSensingSourceData/remoteSensingSourceData.js
View File

@ -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
});

8
src/views/dataService/remoteSensingData/components/retrievalCondition.vue
View File

@ -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 = {
@ -529,7 +530,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) {

12
yarn.lock
View File

@ -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"