diff --git a/src/components/ChooseList/ChooseMarks/index.vue b/src/components/ChooseList/ChooseMarks/index.vue index 520d33e..4ce9b4d 100644 --- a/src/components/ChooseList/ChooseMarks/index.vue +++ b/src/components/ChooseList/ChooseMarks/index.vue @@ -58,11 +58,11 @@
@@ -108,8 +108,8 @@ const props = defineProps({ const loading = ref(false); const total = ref(0); const listQuery = ref({ - pages: 1, - size: 20 + pageCurrent: 1, + pageSize: 20 }); const keyVal = ref(); @@ -125,7 +125,7 @@ const closed = () => { emits("update:modelValue", false); }; const reset = () => { - listQuery.value = { pages: 1, size: 20 }; + listQuery.value = { pageCurrent: 1, pageSize: 20 }; getListData(); }; @@ -144,17 +144,17 @@ const onComfirm = () => { closed(); }; /** - * size 改变触发 + * pageSize 改变触发 */ const handleSizeChange = (currentSize) => { - listQuery.value.size = currentSize; + listQuery.value.pageSize = currentSize; getListData(); }; /** * 页码改变触发 */ const handleCurrentChange = (currentPage) => { - listQuery.value.pages = currentPage; + listQuery.value.pageCurrent = currentPage; getListData(); }; const getListData = () => { @@ -184,7 +184,7 @@ function multipleUser() { } const handleFilter = () => { - listQuery.value.pages = 1; + listQuery.value.pageCurrent = 1; getListData(); }; diff --git a/src/components/ExtractionImg/index.vue b/src/components/ExtractionImg/index.vue deleted file mode 100644 index 0e4da8a..0000000 --- a/src/components/ExtractionImg/index.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/components/ExtractionText/index copy.vue b/src/components/ExtractionText/index copy.vue new file mode 100644 index 0000000..730d19a --- /dev/null +++ b/src/components/ExtractionText/index copy.vue @@ -0,0 +1,227 @@ + + + + + \ No newline at end of file diff --git a/src/components/ExtractionText/index.vue b/src/components/ExtractionText/index.vue index 92b8bde..715eff5 100644 --- a/src/components/ExtractionText/index.vue +++ b/src/components/ExtractionText/index.vue @@ -1,31 +1,65 @@