From 238121be19655f63a45fc9c9c3d864801eb4471b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 24 四月 2024 12:44:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/loge.vue | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index 2ae4333..ffbb8c7 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -126,16 +126,19 @@
data:[],
option: {
height:'auto',
- calcHeight: 0,
+ calcHeight: 20,
+ menuWidth:120,
tip: false,
searchShow: false,
border: true,
index: true,
+ indexFixed:false,
selection: false,
dialogClickModal: false,
- menuFixed:false,
+ menuFixed:'right',
dialogType: 'drawer',
viewBtn: true,
+ stripe: true,
addBtn:false,
editBtn:false,
delBtn:false,
@@ -213,6 +216,7 @@
width: 150,
type: "textarea",
slot: true,
+ hide:true,
},
{
label:'杩斿洖鍙傛暟',
@@ -226,6 +230,7 @@
{
label: '杩斿洖msg',
prop: 'msg',
+ width: 150,
overHidden: true
},
{
@@ -315,13 +320,13 @@
},
onLoad(page, params={}) {
this.loading = true;
- 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,'createTime','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