From 369a80288f89d770bbc0a02d02fe6c03a105c424 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 01 九月 2023 09:25:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/loge.vue | 59 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index bcca2fb..f806110 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -58,42 +58,70 @@
},
{
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:'paramString',
+ overHidden:true,
+ search: true,
+ sortable:true,
+ width: 150
+ },
+ {
+ label:'杩斿洖鍙傛暟',
+ prop:'returnString',
+ overHidden:true,
+ search: true,
+ sortable:true,
+ width: 150
+ },
+ {
+ label: '杩斿洖msg',
+ prop: 'msg',
+ overHidden: true
+ },
+ {
+ label: '璁板綍鏃堕棿',
+ prop: 'createTime',
+ sortable:true,
+ width: 160
},
{
label: '鏄惁鎺ㄩ�佹垚鍔�',
- prop: 'interfacestatus',
+ prop: 'interFaceStatus',
search: true,
sortable:true,
width: 120,
@@ -107,20 +135,9 @@
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>'
+ return row.interFaceStatus == 'true' || row.interFaceStatus == '1' ? '<i class="el-icon-check" style="color: limegreen"></i>' : '<i class="el-icon-close" style="color: red"></i>'
}
},
- {
- label: '杩斿洖msg',
- prop: 'msg',
- overHidden: true
- },
- {
- label: '璁板綍鏃堕棿',
- prop: 'createTime',
- sortable:true,
- width: 160
- }
]
}
}
--
Gitblit v1.9.3