From d8f51c40544ae278095e991ed00ec297842d4332 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期日, 29 九月 2024 11:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/loge.vue | 134 ++++++++++++++++++++++++++++++--------------
1 files changed, 92 insertions(+), 42 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index ff50556..6a2b9f7 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"
@@ -18,12 +17,25 @@
<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>
+ <template slot="menu" slot-scope="scope">
+ <el-button type="text" icon="el-icon-view" size="mini" @click="rowView(scope.row)">鏌ョ湅</el-button>
+ </template>
</avue-crud>
</basic-container>
</template>
<script>
-import {getLogoList} from "@/api/docking/loge";
+import {getLogoList,gridLogeDetail} from "@/api/docking/loge";
import {validatenull} from "@/util/validate";
import {mapGetters} from "vuex";
@@ -91,18 +103,19 @@
value:7
},
{
- label: '鏍囧噯鐢宠',
- prop: 'applyCodeForBZ',
- value:8 },
- {
- label: '閮ㄩ棬鐢宠',
- prop: 'syncDataForOrg',
- value:9
+ label:'鎺ュ彛鍙傛暟',
+ prop:'paramString',
+ value:11
},
{
- label: '浜哄憳鐢宠',
- prop: 'syncDataForPerson',
- value:10
+ label:'杩斿洖鍙傛暟',
+ prop:'returnString',
+ value:12
+ },
+ {
+ label: '杩斿洖msg',
+ prop: 'msg',
+ value:13
},
],
},
@@ -117,15 +130,22 @@
data:[],
option: {
height:'auto',
- calcHeight: 0,
+ calcHeight: 20,
+ menuWidth:120,
tip: false,
searchShow: false,
border: true,
index: true,
- viewBtn: true,
+ indexFixed:false,
selection: false,
dialogClickModal: false,
- menu:false,
+ menuFixed:'right',
+ dialogType: 'drawer',
+ viewBtn: false,
+ stripe: true,
+ addBtn:false,
+ editBtn:false,
+ delBtn:false,
column: [
{
label: "鏁版嵁缂栫爜",
@@ -154,27 +174,28 @@
overHidden: true,
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: '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
},
@@ -182,6 +203,7 @@
label: '闆嗘垚绯荤粺鍚嶇О',
prop: 'systemName',
sortable:true,
+ labelWidth:150,
width: 150
},
{
@@ -193,16 +215,20 @@
{
label:'鎺ュ彛鍙傛暟',
prop:'paramString',
- overHidden:true,
sortable:true,
- width: 150
+ minRows: 20,
+ type: "textarea",
+ slot: true,
+ hide:true,
},
{
label:'杩斿洖鍙傛暟',
prop:'returnString',
- overHidden:true,
sortable:true,
- width: 150
+ minRows: 20,
+ type: "textarea",
+ slot: true,
+ hide:true,
},
{
label: '杩斿洖msg',
@@ -213,7 +239,7 @@
label: '璁板綍鏃堕棿',
prop: 'createTime',
sortable:true,
- width: 160
+
},
{
label: '鏄惁鎴愬姛',
@@ -249,6 +275,16 @@
}
},
methods: {
+ rowView(row){
+ this.loading = true;
+ gridLogeDetail({oid:row.oid}).then(res =>{
+ console.log(res)
+ if(res.data.data){
+ this.loading = false
+ this.$refs.crud.rowView(res.data.data)
+ }
+ })
+ },
dockingGetList(val){
this.data=val.records;
this.page.pageSize=val.size;
@@ -296,13 +332,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;
@@ -318,6 +354,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