From 8af9599937d281a4dffcc4ac7cda1b81b4b8d6a7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 04 九月 2023 16:22:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/loge.vue | 67 +++++++++++++++++++++------------
1 files changed, 43 insertions(+), 24 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index f4c2b24..d5ca13c 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -37,7 +37,8 @@
},
data:[],
option: {
- calcHeight: 30,
+ height:'auto',
+ calcHeight: 0,
tip: false,
searchShow: false,
searchMenuSpan: 6,
@@ -57,56 +58,55 @@
},
{
label: "鍥惧彿",
- prop: "uniquecode",
+ prop: "uniqueCode",
search: true,
+ hide:true,
sortable:true,
width:150
},
{
- label: '鍒嗙被id',
- prop: 'classifyid',
+ label: '鍒嗙被浠ｅ彿',
+ prop: 'classifyId',
search: true,
sortable:true,
width: 250
},
{
label: '鍒嗙被鍚嶇О',
- prop: 'classifyname',
+ prop: 'classifyName',
search: true,
sortable:true,
overHidden: true
},
{
- label: '绯荤粺缂栧彿',
- prop: 'systemcode',
+ label: '闆嗘垚绯荤粺缂栧彿',
+ prop: 'systemCode',
search: true,
sortable:true,
width: 150
},
{
- label: '绯荤粺鍚嶇О',
- prop: 'systemname',
+ label: '闆嗘垚绯荤粺鍚嶇О',
+ prop: 'systemName',
search: true,
sortable:true,
width: 150
},
{
- label: '鏄惁鎺ㄩ�佹垚鍔�',
- prop: 'interfacestatus',
+ label:'鎺ュ彛鍙傛暟',
+ prop:'paramString',
+ overHidden:true,
search: true,
sortable:true,
- width: 120,
- html:true,
- align:'center',
- type:'select',
- dicData: [{key:'true',value:'鏄�'},{key:'false',value:'鍚�'}],
- props: {
- label: "value",
- value: "key"
- },
- formatter : function (row, column) {
- return row.interfacestatus == 'true' || row.interfacestatus == '1' ? '<i class="el-icon-check"></i>' : '<i class="el-icon-close"></i>'
- }
+ width: 150
+ },
+ {
+ label:'杩斿洖鍙傛暟',
+ prop:'returnString',
+ overHidden:true,
+ search: true,
+ sortable:true,
+ width: 150
},
{
label: '杩斿洖msg',
@@ -118,7 +118,26 @@
prop: 'createTime',
sortable:true,
width: 160
- }
+ },
+ {
+ label: '鏄惁鎺ㄩ�佹垚鍔�',
+ prop: 'interFaceStatus',
+ search: true,
+ sortable:true,
+ width: 120,
+ html:true,
+ align:'center',
+ type:'select',
+ searchLabelWidth:130,
+ dicData: [{key:'true',value:'鏄�'},{key:'false',value:'鍚�'}],
+ props: {
+ label: "value",
+ value: "key"
+ },
+ formatter : function (row, column) {
+ return row.interFaceStatus == 'true' || row.interFaceStatus == '1' ? '<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>'
+ }
+ },
]
}
}
--
Gitblit v1.9.3