diff --git a/src/frontend/admin/src/components/naSearch/index.vue b/src/frontend/admin/src/components/naSearch/index.vue index a0d72428..5e7f0d32 100644 --- a/src/frontend/admin/src/components/naSearch/index.vue +++ b/src/frontend/admin/src/components/naSearch/index.vue @@ -119,7 +119,7 @@ 查询 - 重置 + 重置 @@ -137,6 +137,7 @@ export default { data() { return { casLoaded: false, + keepKeywords: null, form: { root: {}, filter: {}, @@ -188,7 +189,9 @@ export default { Object.keys(this.form.dy).forEach((x) => { delete this.form.dy[x] }) - + if (this.keepKeywords) { + this.form.root.keywords = this.keepKeywords + } this.search() }, }, diff --git a/src/frontend/admin/src/views/home/work/components/myapp.vue b/src/frontend/admin/src/views/home/work/components/myapp.vue index 70fd615a..f5f6d205 100644 --- a/src/frontend/admin/src/views/home/work/components/myapp.vue +++ b/src/frontend/admin/src/views/home/work/components/myapp.vue @@ -205,8 +205,7 @@ export default { margin: 5px; color: #fff; vertical-align: top; - padding: 4px; - padding-top: 1rem; + padding: 1rem 4px 4px; cursor: move; border-radius: 3px; } diff --git a/src/frontend/admin/src/views/sys/job/record/index.vue b/src/frontend/admin/src/views/sys/job/record/index.vue index d537daca..9d9d1d6c 100644 --- a/src/frontend/admin/src/views/sys/job/record/index.vue +++ b/src/frontend/admin/src/views/sys/job/record/index.vue @@ -111,6 +111,7 @@ export default { mounted() { if (this.keywords) { this.$refs.search.form.root.keywords = this.keywords + this.$refs.search.keepKeywords = this.keywords } }, created() {