From 934e4fe65e724e38f62fca7e4f1ee66ec95d04ac Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期日, 04 二月 2024 12:27:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/info.vue | 35 +++++++++++------------------------
1 files changed, 11 insertions(+), 24 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index f7cbbc7..4cc1fb3 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>
@@ -60,7 +59,7 @@
<script>
import {
- getList, add, edit, del, push, updateStatus
+ getList, add, edit, del, push, updateStatus,HeaderRequest
} from "@/api/docking/info";
import {getDictionary} from "@/api/omd/enum";
import infoForm from "./infoForm.vue";
@@ -119,12 +118,14 @@
border: true,
index: true,
selection: true,
+ indexFixed: false,
+ selectionFixed:false,
searchShow: false,
+ refreshBtn:false,
searchMenuSpan: 6,
rowKey: "id",
tabs: true,
stripe: true,
- indexFixed: false,
menuWidth: 180,
highlightCurrentRow: true,
addBtn: false,
@@ -263,6 +264,9 @@
};
},
created() {
+ HeaderRequest().then(res => {
+ console.log(res)
+ })
},
computed: {
...mapGetters(["permission"]),
@@ -438,26 +442,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 +455,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