From b079e2a5eb8edede085fb5601f04dfca7502d01e Mon Sep 17 00:00:00 2001
From: Zhufu <1176354795@qq.com>
Date: Sat, 24 Aug 2024 10:01:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A1=AB=E6=8A=A5=E5=AE=A1=E6=A0=B8,=E6=95=B4?=
=?UTF-8?q?=E6=94=B9=E5=AE=A1=E6=A0=B8=20=E6=B7=BB=E5=8A=A0=E5=B8=82?=
=?UTF-8?q?=E7=BA=A7=E9=A9=B3=E5=9B=9E=E5=92=8C=E5=8E=BF=E7=BA=A7=E9=A9=B3?=
=?UTF-8?q?=E5=9B=9E=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../degraining/auditinfo/MapList/index.vue | 25 +++++++++++++++++--
.../illegaltreatment/MapList/index.vue | 25 +++++++++++++++++--
.../illegalmining/auditinfo/MapList/index.vue | 25 +++++++++++++++++--
.../illegaltreatment/MapList/index.vue | 25 +++++++++++++++++--
.../illegaltreatment/MapList/index.vue | 25 +++++++++++++++++--
.../tiankongdi/auditinfo/MapList/index.vue | 25 +++++++++++++++++--
6 files changed, 138 insertions(+), 12 deletions(-)
diff --git a/src/views/demo/degraining/auditinfo/MapList/index.vue b/src/views/demo/degraining/auditinfo/MapList/index.vue
index 418f0363..e8386206 100644
--- a/src/views/demo/degraining/auditinfo/MapList/index.vue
+++ b/src/views/demo/degraining/auditinfo/MapList/index.vue
@@ -79,6 +79,20 @@
@@ -200,7 +214,7 @@
import { message } from 'ant-design-vue';
import { useUserStore } from '@/store/modules/user.ts'
import { SearchOutlined, RollbackOutlined } from '@ant-design/icons-vue';
- import { patchSourceOptions } from '@/utils/global'
+ import { patchSourceOptions, auditMapStatusOptions } from '@/utils/global'
import { dataProcessing } from '@/views/demo/tiankongdi/util.ts'
import {showDrawBack, drawBackSpan} from '@/views/demo/util'
@@ -252,6 +266,7 @@
type: null,
sort: null,
order: null,
+ nowStatus: [],
});
const markTypeOptions = ref([
{ label: '合法', value: '合法' },
@@ -269,8 +284,14 @@
}
async function getTaskList() {
console.log(params.value);
+ let requestData = {...params.value}
+ if(requestData.nowStatus.length > 0){
+ requestData.nowStatus = requestData.nowStatus.join(',')
+ }else{
+ requestData.nowStatus = null
+ }
emits('openLoading')
- const data = await LoadTaskDetailList(params.value);
+ const data = await LoadTaskDetailList(requestData);
emits('closeLoading')
dataList.value = data.items;
total.value = data.total;
diff --git a/src/views/demo/degraining/illegaltreatment/MapList/index.vue b/src/views/demo/degraining/illegaltreatment/MapList/index.vue
index a2d661b1..ba9802d2 100644
--- a/src/views/demo/degraining/illegaltreatment/MapList/index.vue
+++ b/src/views/demo/degraining/illegaltreatment/MapList/index.vue
@@ -79,6 +79,20 @@
@@ -201,7 +215,7 @@
import { message } from 'ant-design-vue';
import { useUserStore } from '@/store/modules/user.ts'
import { SearchOutlined, RollbackOutlined } from '@ant-design/icons-vue';
- import { patchSourceOptions } from '@/utils/global'
+ import { patchSourceOptions, auditMapStatusOptions } from '@/utils/global'
import { dataProcessing } from '@/views/demo/tiankongdi/util.ts'
import {showDrawBack, drawBackSpan} from '@/views/demo/util'
@@ -253,6 +267,7 @@
type: null,
sort: null,
order: null,
+ nowStatus: [],
});
const markTypeOptions = ref([
{ label: '拆除复耕', value: '拆除复耕' },
@@ -269,8 +284,14 @@
}
async function getTaskList() {
console.log(params.value);
+ let requestData = {...params.value}
+ if(requestData.nowStatus.length > 0){
+ requestData.nowStatus = requestData.nowStatus.join(',')
+ }else{
+ requestData.nowStatus = null
+ }
emits('openLoading')
- const data = await LoadTaskIllegalDetailList(params.value);
+ const data = await LoadTaskIllegalDetailList(requestData);
emits('closeLoading')
dataList.value = data.items;
total.value = data.total;
diff --git a/src/views/demo/illegalmining/auditinfo/MapList/index.vue b/src/views/demo/illegalmining/auditinfo/MapList/index.vue
index 1bb29461..44fb3fe7 100644
--- a/src/views/demo/illegalmining/auditinfo/MapList/index.vue
+++ b/src/views/demo/illegalmining/auditinfo/MapList/index.vue
@@ -79,6 +79,20 @@
@@ -200,7 +214,7 @@
import { message } from 'ant-design-vue';
import { useUserStore } from '@/store/modules/user.ts'
import { SearchOutlined, RollbackOutlined } from '@ant-design/icons-vue';
- import { patchSourceOptions } from '@/utils/global'
+ import { patchSourceOptions, auditMapStatusOptions } from '@/utils/global'
import { dataProcessing } from '@/views/demo/tiankongdi/util.ts'
import {showDrawBack, drawBackSpan} from '@/views/demo/util'
@@ -252,6 +266,7 @@
type: null,
sort: null,
order: null,
+ nowStatus: [],
});
const markTypeOptions = ref([
{ label: '合法', value: '合法' },
@@ -269,8 +284,14 @@
}
async function getTaskList() {
console.log(params.value);
+ let requestData = {...params.value}
+ if(requestData.nowStatus.length > 0){
+ requestData.nowStatus = requestData.nowStatus.join(',')
+ }else{
+ requestData.nowStatus = null
+ }
emits('openLoading')
- const data = await LoadTaskDetailList(params.value);
+ const data = await LoadTaskDetailList(requestData);
emits('closeLoading')
dataList.value = data.items;
total.value = data.total;
diff --git a/src/views/demo/illegalmining/illegaltreatment/MapList/index.vue b/src/views/demo/illegalmining/illegaltreatment/MapList/index.vue
index d58ae6e0..7c1829db 100644
--- a/src/views/demo/illegalmining/illegaltreatment/MapList/index.vue
+++ b/src/views/demo/illegalmining/illegaltreatment/MapList/index.vue
@@ -79,6 +79,20 @@
@@ -201,7 +215,7 @@
import { message } from 'ant-design-vue';
import { useUserStore } from '@/store/modules/user.ts'
import { SearchOutlined, RollbackOutlined } from '@ant-design/icons-vue';
- import { patchSourceOptions } from '@/utils/global'
+ import { patchSourceOptions, auditMapStatusOptions } from '@/utils/global'
import { dataProcessing } from '@/views/demo/tiankongdi/util.ts'
import {showDrawBack, drawBackSpan} from '@/views/demo/util'
@@ -253,6 +267,7 @@
type: null,
sort: null,
order: null,
+ nowStatus: [],
});
const markTypeOptions = ref([
{ label: '拆除复耕', value: '拆除复耕' },
@@ -269,8 +284,14 @@
}
async function getTaskList() {
console.log(params.value);
+ let requestData = {...params.value}
+ if(requestData.nowStatus.length > 0){
+ requestData.nowStatus = requestData.nowStatus.join(',')
+ }else{
+ requestData.nowStatus = null
+ }
emits('openLoading')
- const data = await LoadTaskIllegalDetailList(params.value);
+ const data = await LoadTaskIllegalDetailList(requestData);
emits('closeLoading')
dataList.value = data.items;
total.value = data.total;
diff --git a/src/views/demo/statistical/illegaltreatment/MapList/index.vue b/src/views/demo/statistical/illegaltreatment/MapList/index.vue
index db8c8d18..c27d778a 100644
--- a/src/views/demo/statistical/illegaltreatment/MapList/index.vue
+++ b/src/views/demo/statistical/illegaltreatment/MapList/index.vue
@@ -79,6 +79,20 @@
@@ -201,7 +215,7 @@
import { message } from 'ant-design-vue';
import { useUserStore } from '@/store/modules/user.ts'
import { SearchOutlined, RollbackOutlined } from '@ant-design/icons-vue';
- import { patchSourceOptions } from '@/utils/global'
+ import { patchSourceOptions, auditMapStatusOptions } from '@/utils/global'
import { dataProcessing } from '@/views/demo/tiankongdi/util.ts'
import {showDrawBack, drawBackSpan} from '@/views/demo/util'
@@ -253,6 +267,7 @@
type: null,
sort: null,
order: null,
+ nowStatus: [],
});
const markTypeOptions = ref([
{ label: '拆除复耕', value: '拆除复耕' },
@@ -269,8 +284,14 @@
}
async function getTaskList() {
console.log(params.value);
+ let requestData = {...params.value}
+ if(requestData.nowStatus.length > 0){
+ requestData.nowStatus = requestData.nowStatus.join(',')
+ }else{
+ requestData.nowStatus = null
+ }
emits('openLoading')
- const data = await getLoadTaskIllegalDetailList(params.value);
+ const data = await getLoadTaskIllegalDetailList(requestData);
emits('closeLoading')
dataList.value = data.items;
total.value = data.total;
diff --git a/src/views/demo/tiankongdi/auditinfo/MapList/index.vue b/src/views/demo/tiankongdi/auditinfo/MapList/index.vue
index 625f9668..d0a92c02 100644
--- a/src/views/demo/tiankongdi/auditinfo/MapList/index.vue
+++ b/src/views/demo/tiankongdi/auditinfo/MapList/index.vue
@@ -79,6 +79,20 @@
@@ -200,7 +214,7 @@
import { message } from 'ant-design-vue';
import { useUserStore } from '@/store/modules/user.ts'
import { SearchOutlined, RollbackOutlined } from '@ant-design/icons-vue';
- import { patchSourceOptions } from '@/utils/global'
+ import { patchSourceOptions, auditMapStatusOptions } from '@/utils/global'
import { dataProcessing } from '@/views/demo/tiankongdi/util.ts'
import {showDrawBack, drawBackSpan} from '@/views/demo/util'
@@ -252,6 +266,7 @@
type: null,
sort: null,
order: null,
+ nowStatus: [],
});
const markTypeOptions = ref([
{ label: '合法', value: '合法' },
@@ -269,8 +284,14 @@
}
async function getTaskList() {
console.log(params.value);
+ let requestData = {...params.value}
+ if(requestData.nowStatus.length > 0){
+ requestData.nowStatus = requestData.nowStatus.join(',')
+ }else{
+ requestData.nowStatus = null
+ }
emits('openLoading')
- const data = await getLoadTaskDetailList(params.value);
+ const data = await getLoadTaskDetailList(requestData);
emits('closeLoading')
dataList.value = data.items;
total.value = data.total;