diff --git a/src/components/illegalmining/PaginationComponent/index.vue b/src/components/illegalmining/PaginationComponent/index.vue
index be6d2361..f5eea08c 100644
--- a/src/components/illegalmining/PaginationComponent/index.vue
+++ b/src/components/illegalmining/PaginationComponent/index.vue
@@ -4,6 +4,7 @@
size="small"
v-model:pageSize="props.pageData.limit"
v-model:current="props.pageData.page"
+ :show-total="total => `共 ${total} 条数据`"
:total="props.total"
show-size-changer
show-quick-jumper
diff --git a/src/components/illegalmining/SearchComponent/index.vue b/src/components/illegalmining/SearchComponent/index.vue
index d7d9e468..899c437e 100644
--- a/src/components/illegalmining/SearchComponent/index.vue
+++ b/src/components/illegalmining/SearchComponent/index.vue
@@ -64,6 +64,16 @@
@change="(value) => emits('screenDataChange',value,'typename')"
/>
+
+
是否立案
+
emits('screenDataChange',value,'register')"
+ />
+
下发时间
emits('screenDataChange',value.target.value,'caseNo')"
- style="width:404px;"
+ :style="`width:${smallInput.includes(props.usePage)? '219': '404'}px;`"
/>
@@ -101,7 +111,7 @@ import { defineProps, defineEmits, ref, h } from "vue"
import { SearchOutlined } from "@ant-design/icons-vue"
import Icon from '@/components/Icon/Icon.vue';
import { yearOptions } from '@/utils/global'
-import { polygonSourceOptions, polygonTypeOptions, countiesOptions, statusOptions, usePageGetSearchItem } from '@/components/illegalmining/util'
+import { polygonSourceOptions, polygonTypeOptions, countiesOptions, statusOptions, usePageGetSearchItem, smallInput, registerOptions } from '@/components/illegalmining/util'
import { getChildrenTree } from '@/api/demo/system';
const props = defineProps(["screenData","usePage"])
diff --git a/src/components/illegalmining/ShowListComponent/index.vue b/src/components/illegalmining/ShowListComponent/index.vue
index e9b4d1f0..4fcea2cc 100644
--- a/src/components/illegalmining/ShowListComponent/index.vue
+++ b/src/components/illegalmining/ShowListComponent/index.vue
@@ -248,7 +248,7 @@ const getParams = (data) => {
}
break
default:
- if(props.screenData[key] && props.screenData[key] !== ''){
+ if(props.screenData[key] !== null && props.screenData[key] !== undefined && props.screenData[key] !== ''){
params[key] = props.screenData[key]
}
break
diff --git a/src/components/illegalmining/util.ts b/src/components/illegalmining/util.ts
index 95ff3475..c7561a50 100644
--- a/src/components/illegalmining/util.ts
+++ b/src/components/illegalmining/util.ts
@@ -7,6 +7,7 @@
* 处理状态 nowStatus
* 下发时间段 startTime-endTime
* 图斑号 caseNo
+ * 是否立案 register
*/
// 图斑来源
import { getChildrenTree } from '@/api/demo/system';
@@ -60,6 +61,11 @@ export const processIllegalTypeOptions = [
{ label: '购销非法开采矿产品', value: '购销非法开采矿产品'},
{ label: '其他', value: '其他'},
]
+// 是否立案
+export const registerOptions = [
+ { label: '是', value: 1},
+ { label: '否', value: 0},
+]
export const countiesOptions = counties.map(item => {
return {
label: item.name,
@@ -76,4 +82,5 @@ export const usePageRequestUrl = {
}
export const usePageGetSearchItem = {
'patternfilling': ["year", "tubanlaiyuan", "typename", "countyid", "streetid", "nowStatus", "time", "caseNo"],
-}
\ No newline at end of file
+}
+export const smallInput:any = []
\ No newline at end of file
diff --git a/src/views/demo/illegalmining/patternfilling/MapList/index.vue b/src/views/demo/illegalmining/patternfilling/MapList/index.vue
index 4b7ef173..6698161c 100644
--- a/src/views/demo/illegalmining/patternfilling/MapList/index.vue
+++ b/src/views/demo/illegalmining/patternfilling/MapList/index.vue
@@ -85,7 +85,7 @@ const query = () => {
}
break
default:
- if(screenData.value[key] && screenData.value[key] !== ''){
+ if(screenData.value[key] !== null && screenData.value[key] !== undefined && screenData.value[key] !== ''){
params[key] = screenData.value[key]
}
break