diff --git a/ui/src/components/user/history.vue b/ui/src/components/user/history.vue index 79276c0..5721ebd 100644 --- a/ui/src/components/user/history.vue +++ b/ui/src/components/user/history.vue @@ -10,10 +10,11 @@ const props = defineProps({ }) let disableConditionInput1 = true -if (props.disableConditionInput) { - disableConditionInput1 = props.disableConditionInput +if (props.disableConditionInput === false) { + disableConditionInput1 = false } -console.log("禁止搜索框:", disableConditionInput1) +// console.log("禁止搜索框:", disableConditionInput1) +// console.log("禁止搜索框:", props.disableConditionInput) const isAdminCharacter = userStore().userInfo.character === 'admin' const hasListPermit = ref(isAdminCharacter) @@ -171,14 +172,13 @@ const handlePaginationCurChange = (val) => { .app-content1 { - height: calc(100vh - 500px); + height: calc(100vh - 300px); display: flex; .table-content { display: flex; flex-direction: column; justify-content: space-between; - height: 100%; overflow: auto; .table { diff --git a/ui/src/views/user/history.vue b/ui/src/views/user/history.vue index 2899ff4..386db04 100644 --- a/ui/src/views/user/history.vue +++ b/ui/src/views/user/history.vue @@ -2,10 +2,12 @@ import tableHistory from "@/components/user/history.vue"; +const flag = false +