From 8c2bc4c9cfac26210dd9018482586112469c44c8 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 11 九月 2023 17:54:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/loge.vue | 138 +++++++++++++++++++++++++++++++++------------
1 files changed, 101 insertions(+), 37 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index a0fc186..64d7cce 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -14,6 +14,9 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad">
+ <template slot-scope="scope" slot="menuLeft">
+ <vci-docking-search :SearchObject="SearchObject" :page="page"></vci-docking-search>
+ </template>
</avue-crud>
</basic-container>
</template>
@@ -27,6 +30,51 @@
name: "loge",
data(){
return {
+ SearchObject:{
+ type:'loge',
+ searchData:[
+ {
+ label:'鏁版嵁缂栫爜',
+ prop: "id",
+ value:0
+ },
+ {
+ label:'鍒嗙被浠ｅ彿',
+ prop: 'classifyId',
+ value:1
+ },
+ {
+ label:'鍒嗙被鍚嶇О',
+ prop: 'classifyName',
+ value:2
+ },
+ {
+ label:'闆嗘垚绯荤粺缂栧彿',
+ prop: 'systemCode',
+ value:3
+ },
+ {
+ label:'闆嗘垚绯荤粺鍚嶇О',
+ prop: 'systemName',
+ value:4
+ },
+ {
+ label:'绫诲瀷',
+ prop: 'typeText',
+ value:5
+ },
+ {
+ label:'璁板綍鏃堕棿',
+ value:6,
+ prop: 'createTime',
+ },
+ {
+ label:'鏄惁鎴愬姛',
+ prop: 'interfaceStatus',
+ value:7
+ },
+ ],
+ },
loading: false,
query: {},
selectionList: [],
@@ -41,7 +89,7 @@
calcHeight: 0,
tip: false,
searchShow: false,
- searchMenuSpan: 6,
+ // searchMenuSpan: 12,
border: true,
index: true,
viewBtn: true,
@@ -52,49 +100,76 @@
{
label: "鏁版嵁缂栫爜",
prop: "id",
- search: true,
sortable:true,
- width:150
+ width:130
},
{
label: "鍥惧彿",
- prop: "uniquecode",
- search: true,
+ prop: "uniqueCode",
+ hide:true,
sortable:true,
width:150
},
{
- label: '鍒嗙被id',
- prop: 'classifyid',
- search: true,
+ label: '鍒嗙被浠ｅ彿',
+ prop: 'classifyId',
sortable:true,
- width: 250
+ overHidden:true,
+ width: 150
},
{
label: '鍒嗙被鍚嶇О',
- prop: 'classifyname',
- search: true,
+ prop: 'classifyName',
sortable:true,
+ overHidden: true,
+ width: 140
+ },
+ {
+ label: '闆嗘垚绯荤粺缂栧彿',
+ prop: 'systemCode',
+ sortable:true,
+ width: 130
+ },
+ {
+ label: '闆嗘垚绯荤粺鍚嶇О',
+ prop: 'systemName',
+ sortable:true,
+ width: 150
+ },
+ {
+ label: '绫诲瀷',
+ prop: 'typeText',
+ sortable:true,
+ width: 150
+ },
+ {
+ label:'鎺ュ彛鍙傛暟',
+ prop:'paramString',
+ overHidden:true,
+ sortable:true,
+ width: 150
+ },
+ {
+ label:'杩斿洖鍙傛暟',
+ prop:'returnString',
+ overHidden:true,
+ sortable:true,
+ width: 150
+ },
+ {
+ label: '杩斿洖msg',
+ prop: 'msg',
overHidden: true
},
{
- label: '绯荤粺缂栧彿',
- prop: 'systemcode',
- search: true,
+ label: '璁板綍鏃堕棿',
+ prop: 'createTime',
sortable:true,
- width: 150
+ width: 160
},
{
- label: '绯荤粺鍚嶇О',
- prop: 'systemname',
- search: true,
- sortable:true,
- width: 150
- },
- {
- label: '鏄惁鎺ㄩ�佹垚鍔�',
- prop: 'interfacestatus',
- search: true,
+ label: '鏄惁鎴愬姛',
+ prop: 'interfaceStatus',
sortable:true,
width: 120,
html:true,
@@ -107,20 +182,9 @@
value: "key"
},
formatter : function (row, column) {
- 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>'
+ 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>'
}
},
- {
- label: '杩斿洖msg',
- prop: 'msg',
- overHidden: true
- },
- {
- label: '璁板綍鏃堕棿',
- prop: 'createTime',
- sortable:true,
- width: 160
- }
]
}
}
--
Gitblit v1.9.3