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 | 155 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 136 insertions(+), 19 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index 64d7cce..6a2b9f7 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -3,10 +3,10 @@
<basic-container>
<avue-crud :option="option"
:table-loading="loading"
- :data="data"
+ :data="data || getList"
:page.sync="page"
- :permission="permissionList"
ref="crud"
+ @cell-dblclick="cellDbClick"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@@ -15,14 +15,27 @@
@refresh-change="refreshChange"
@on-load="onLoad">
<template slot-scope="scope" slot="menuLeft">
- <vci-docking-search :SearchObject="SearchObject" :page="page"></vci-docking-search>
+ <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 {getList} from "@/api/docking/loge";
+import {getLogoList,gridLogeDetail} from "@/api/docking/loge";
import {validatenull} from "@/util/validate";
import {mapGetters} from "vuex";
@@ -30,8 +43,24 @@
name: "loge",
data(){
return {
- SearchObject:{
+ value:'',
+ //鍚勪釜绫诲瀷鐘舵��
+ status:{
type:'loge',
+ typeFlag:false,
+ dateFlag:false,
+ stateFlag:false,
+ },
+ //model缁戝畾
+ formInline:{
+ type:'',
+ cut:'',
+ text:'',
+ Date:'',
+ state:''
+ },
+ //闆嗘垚绫诲瀷姝绘暟鎹�
+ SearchObject:{
searchData:[
{
label:'鏁版嵁缂栫爜',
@@ -73,6 +102,21 @@
prop: 'interfaceStatus',
value:7
},
+ {
+ label:'鎺ュ彛鍙傛暟',
+ prop:'paramString',
+ value:11
+ },
+ {
+ label:'杩斿洖鍙傛暟',
+ prop:'returnString',
+ value:12
+ },
+ {
+ label: '杩斿洖msg',
+ prop: 'msg',
+ value:13
+ },
],
},
loading: false,
@@ -86,16 +130,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: false,
+ stripe: true,
+ addBtn:false,
+ editBtn:false,
+ delBtn:false,
column: [
{
label: "鏁版嵁缂栫爜",
@@ -124,9 +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: 'systemCode',
+ labelWidth:150,
sortable:true,
width: 130
},
@@ -134,6 +203,7 @@
label: '闆嗘垚绯荤粺鍚嶇О',
prop: 'systemName',
sortable:true,
+ labelWidth:150,
width: 150
},
{
@@ -145,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',
@@ -165,7 +239,7 @@
label: '璁板綍鏃堕棿',
prop: 'createTime',
sortable:true,
- width: 160
+
},
{
label: '鏄惁鎴愬姛',
@@ -182,7 +256,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>'
}
},
]
@@ -201,6 +275,35 @@
}
},
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;
+ this.page.currentPage=val.current;
+ this.page.total=val.total;
+ },
+ async cellDbClick(row, column, cell, event) {
+ for (const key in row) {
+ if (key === column.property) {
+ this.value = row[key];
+ }
+ }
+ try {
+ await this.$copyText(this.value);
+ this.$message.success('澶嶅埗鎴愬姛');
+ } catch (error) {
+ this.$message.warning('澶嶅埗澶辫触');
+ }
+ },
searchReset() {
this.query = {};
this.onLoad(this.page);
@@ -229,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];
}
}
- getList(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;
@@ -251,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