From 7aa9a5df273e2df95a7005a8a78004b684a53287 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期五, 12 一月 2024 09:26:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/loge.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index 7b9ad91..c20a3f9 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -126,11 +126,12 @@
data:[],
option: {
height:'auto',
- calcHeight: 0,
+ calcHeight: 20,
tip: false,
searchShow: false,
border: true,
index: true,
+ indexFixed:false,
selection: false,
dialogClickModal: false,
menuFixed:false,
@@ -315,14 +316,13 @@
},
onLoad(page, params={}) {
this.loading = true;
- let createTime = 'desc'
- var query={}
+ var queryCondition={}
if (this.query) {
for (var key in this.query) {
- query['conditionMap["' + key + '"]'] = this.query[key];
+ queryCondition['conditionMap["' + key + '"]'] = this.query[key];
}
}
- getLogoList(page.currentPage, page.pageSize,'desc',Object.assign(params,this.params, query,this.query),).then(res => {
+ getLogoList(page.currentPage, page.pageSize,'createTime','desc',Object.assign(params,this.params, queryCondition,this.query),).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
--
Gitblit v1.9.3