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 | 97 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 83 insertions(+), 14 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index 91a235b..ffbb8c7 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -5,7 +5,6 @@
:table-loading="loading"
:data="data || getList"
:page.sync="page"
- :permission="permissionList"
ref="crud"
@cell-dblclick="cellDbClick"
@search-change="searchChange"
@@ -17,6 +16,16 @@
@on-load="onLoad">
<template slot-scope="scope" slot="menuLeft">
<vci-docking-search :SearchObject="SearchObject" :page="page" :formInline="formInline" :status="status" @getList="dockingGetList"></vci-docking-search>
+ </template>
+ <template slot="paramString" slot-scope="scope">
+ <avue-text-ellipsis :text="scope.row.paramString" :height="50">
+ <small slot="more">...</small>
+ </avue-text-ellipsis>
+ </template>
+ <template slot="returnString" slot-scope="scope">
+ <avue-text-ellipsis :text="scope.row.returnString" :height="50">
+ <small slot="more">...</small>
+ </avue-text-ellipsis>
</template>
</avue-crud>
</basic-container>
@@ -90,6 +99,20 @@
prop: 'interfaceStatus',
value:7
},
+ {
+ label: '鏍囧噯鐢宠',
+ prop: 'applyCodeForBZ',
+ value:8 },
+ {
+ label: '閮ㄩ棬鐢宠',
+ prop: 'syncDataForOrg',
+ value:9
+ },
+ {
+ label: '浜哄憳鐢宠',
+ prop: 'syncDataForPerson',
+ value:10
+ },
],
},
loading: false,
@@ -103,16 +126,22 @@
data:[],
option: {
height:'auto',
- calcHeight: 0,
+ calcHeight: 20,
+ menuWidth:120,
tip: false,
searchShow: false,
- // searchMenuSpan: 12,
border: true,
index: true,
- viewBtn: true,
+ indexFixed:false,
selection: false,
dialogClickModal: false,
- menu:false,
+ menuFixed:'right',
+ dialogType: 'drawer',
+ viewBtn: true,
+ stripe: true,
+ addBtn:false,
+ editBtn:false,
+ delBtn:false,
column: [
{
label: "鏁版嵁缂栫爜",
@@ -142,8 +171,27 @@
width: 140
},
{
+ label: '鏍囧噯鐢宠',
+ prop: 'applyCodeForBZ',
+ sortable:true,
+ width: 130
+ },
+ {
+ label: '閮ㄩ棬鐢宠',
+ prop: 'syncDataForOrg',
+ sortable:true,
+ width: 130
+ },
+ {
+ label: '浜哄憳鐢宠',
+ prop: 'syncDataForPerson',
+ sortable:true,
+ width: 130
+ },
+ {
label: '闆嗘垚绯荤粺缂栧彿',
prop: 'systemCode',
+ labelWidth:150,
sortable:true,
width: 130
},
@@ -151,6 +199,7 @@
label: '闆嗘垚绯荤粺鍚嶇О',
prop: 'systemName',
sortable:true,
+ labelWidth:150,
width: 150
},
{
@@ -162,20 +211,26 @@
{
label:'鎺ュ彛鍙傛暟',
prop:'paramString',
- overHidden:true,
sortable:true,
- width: 150
+ minRows: 20,
+ width: 150,
+ type: "textarea",
+ slot: true,
+ hide:true,
},
{
label:'杩斿洖鍙傛暟',
prop:'returnString',
- overHidden:true,
sortable:true,
- width: 150
+ minRows: 20,
+ width: 150,
+ type: "textarea",
+ slot: true,
},
{
label: '杩斿洖msg',
prop: 'msg',
+ width: 150,
overHidden: true
},
{
@@ -199,7 +254,7 @@
value: "key"
},
formatter : function (row, column) {
- return row.interfaceStatus == 'true' || row.interfaceStatus == '' ? '<i class="el-icon-check" style="color: limegreen;font-size: 20px;font-weight: 800"></i>' : '<i class="el-icon-close" style="color: red;font-size: 20px;font-weight: 800"></i>'
+ return row.interfaceStatus == 'true' || row.interfaceStatus == '' ? '<i class="el-icon-check" style="color: #32cd32;font-size: 20px;font-weight: 800"></i>' : '<i class="el-icon-close" style="color: #ff0000;font-size: 20px;font-weight: 800"></i>'
}
},
]
@@ -265,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, 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;
@@ -287,6 +342,20 @@
}
</script>
-<style scoped>
+<style lang="scss" scoped>
+// 婊氬姩鏉℃牱寮忎慨鏀�
+// 婊氬姩鏉＄殑瀹藉害
+ /deep/ .el-table__body-wrapper::-webkit-scrollbar {
+ height: 15px; // 绾靛悜婊氬姩鏉� 蹇呭啓
+ background: white;
+ border: white;
+ width: 10px;
+ }
+// 婊氬姩鏉＄殑婊戝潡
+ /deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
+ background-color: #ececec;
+ border-radius: 20px;
+ border: #ececec;
+ }
</style>
--
Gitblit v1.9.3