From 7f39d6ba19fa2dbc1494f1b1e585b637356fa72f Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 28 八月 2023 10:14:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/info.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index 018416f..2d1cbee 100644
--- a/Source/UBCS-WEB/src/views/docking/info.vue
+++ b/Source/UBCS-WEB/src/views/docking/info.vue
@@ -112,7 +112,8 @@
prop: 'pushType',
sortable: true,
width: 150,
- formatter:function (d){
+ //pushTypeList浣滅敤鍩�
+ formatter:(d)=>{
return this.pushTypeList[d.pushType]
}
}, {
@@ -160,7 +161,7 @@
prop: 'paramType',
sortable: true,
width: 150,
- formatter:function (d){
+ formatter: (d)=>{
return this.paramTypeList[d.paramType]
}
}, {
@@ -168,7 +169,7 @@
prop: 'returnType',
sortable: true,
width: 150,
- formatter:function (d){
+ formatter: (d)=>{
return this.returnTypeList[d.returnType]
}
}, {
@@ -301,7 +302,7 @@
},
PUSH(){
if (this.selectionList.length != 1) {
- this.$message.error('璇烽�夋嫨鏁版嵁')
+ this.$message.warning('璇烽�夋嫨鏁版嵁')
return false;
}
this.$confirm("鏄惁瑕�"+ (this.selectionList[0].pushType == "1" ? "鎺ㄩ�佹暟鎹�" : "鎺ㄩ�佸垎绫�"), {
@@ -325,7 +326,6 @@
this.loading = true;
getList(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
- debugger;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
--
Gitblit v1.9.3