From 119b55b59e4d6af0e8881fae671eaa3a1c9fd6ac Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 10 一月 2024 10:26:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/info.vue | 44 +++++++++++++-------------------------------
1 files changed, 13 insertions(+), 31 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index 973fcd7..1c28481 100644
--- a/Source/UBCS-WEB/src/views/docking/info.vue
+++ b/Source/UBCS-WEB/src/views/docking/info.vue
@@ -40,8 +40,7 @@
<el-button v-if="permissionList.sync" icon="el-icon-share" size="small" @click="PUSH">鍚� 姝�
</el-button>
<el-button v-if="permissionList.query" icon="el-icon-search" size="small"
- @click="openAdvancedQuery">鏌�
- 璇�
+ @click="openAdvancedQuery">鏌� 璇�
</el-button>
</template>
</avue-crud>
@@ -266,15 +265,15 @@
},
computed: {
...mapGetters(["permission"]),
- permissionList(){
- return{
- sync:this.vaildData(this.permission.info.info_sync,false),
- add:this.vaildData(this.permission.info.info_add,false),
- query:this.vaildData(this.permission.info.info_query,false),
- edit:this.vaildData(this.permission.info.info_edit,false),
- delete:this.vaildData(this.permission.info.info_delete,false),
- enable:this.vaildData(this.permission.info.info_enable,false),
- stop:this.vaildData(this.permission.info.info_stop,false),
+ permissionList() {
+ return {
+ sync: this.vaildData(this.permission.info.info_sync, false),
+ add: this.vaildData(this.permission.info.info_add, false),
+ query: this.vaildData(this.permission.info.info_query, false),
+ edit: this.vaildData(this.permission.info.info_edit, false),
+ delete: this.vaildData(this.permission.info.info_delete, false),
+ enable: this.vaildData(this.permission.info.info_enable, false),
+ stop: this.vaildData(this.permission.info.info_stop, false),
}
},
oids() {
@@ -438,26 +437,6 @@
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
- // const Props = {
- // paramType: '',
- // returnType: '',
- // dataFlowType: '',
- // pushType: '',
- // classifyName: '',
- // sourceSystemName: '',
- // targetSystemName: '',
- // classPath:'',
- // requestMethod:'',
- // requestUrl:'',
- // interfaceFunction:'',
- // nameSpace:'',
- // soapAction:'',
- // targetName:'',
- // cxfaxis:''
- // };
- // this.pushTypeList.forEach(item => {
- // Object.assign(item, Props);
- // });
this.loading = false;
});
},
@@ -471,6 +450,9 @@
if (JSON.stringify(conditionMaps) != '{}') {
this.query = conditionMaps;
this.onLoad(this.page);
+ }else {
+ this.query = {};
+ this.onLoad(this.page, this.query);
}
},
openAdvancedQuery() {
--
Gitblit v1.9.3