From 5669c91b3f29848148077cbcd7516b92f243bc23 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 27 三月 2024 15:21:27 +0800
Subject: [PATCH] 添加左侧菜单接口-表格动态查询排列
---
Source/ProjectWeb/src/api/system/menu.js | 2
Source/ProjectWeb/src/router/axios.js | 50 ++++++++++++------------
Source/ProjectWeb/vue.config.js | 28 +++++++-------
Source/ProjectWeb/src/api/treeMyMenu.js | 12 ++++++
Source/ProjectWeb/src/page/login/userlogin.vue | 2
Source/ProjectWeb/src/views/base/uiDefineVO.js | 1
Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue | 7 +++
7 files changed, 61 insertions(+), 41 deletions(-)
diff --git a/Source/ProjectWeb/src/api/system/menu.js b/Source/ProjectWeb/src/api/system/menu.js
index 0b6382d..57160a3 100644
--- a/Source/ProjectWeb/src/api/system/menu.js
+++ b/Source/ProjectWeb/src/api/system/menu.js
@@ -98,7 +98,7 @@
});
export const getRoutes = (topMenuId) => request({
- url: '/api/blade-system/menu/routes',
+ url: 'api/smFunctionController/treeMyMenu',
method: 'get',
params: {
topMenuId,
diff --git a/Source/ProjectWeb/src/api/treeMyMenu.js b/Source/ProjectWeb/src/api/treeMyMenu.js
new file mode 100644
index 0000000..5cb9917
--- /dev/null
+++ b/Source/ProjectWeb/src/api/treeMyMenu.js
@@ -0,0 +1,12 @@
+import request from "@/router/axios";
+
+/**
+ * 棣栭〉宸︿晶鏍�
+ */
+export const treeMenu = (params) => {
+ return request({
+ url: 'api/smFunctionController/treeMyMenu',
+ method: 'get',
+ ...params
+ })
+}
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
index 774c6e4..7c7db7a 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
@@ -23,6 +23,7 @@
</template>
<script>
+import {treeMenu} from '@/api/treeMyMenu'
export default {
name: "dynamic-table",
props: {
@@ -483,6 +484,8 @@
calcHeight: 15,
indexFixed: false,
menuFixed: false,
+ searchMenuSpan:12,
+ searchShow:false,
column: [],
},
selectList: [],
@@ -490,8 +493,11 @@
},
computed: {
updatedColumns() {
+ const queryFields = this.componentVO.tableDefineVO.queryColumns.map(item => item.field);
+
return this.componentVO.tableDefineVO.cols[0].map(item => {
const typeValue = item.fieldType === 'text' || item.fieldType === 'combox' ? 'input' : item.fieldType; // 琛ㄥ崟Type绫诲瀷
+ const search = queryFields.includes(item.field);
return {
align: item.align,
@@ -501,6 +507,7 @@
hidden: item.hidden,
label: item.title,
width: item.width,
+ search: search
};
});
},
diff --git a/Source/ProjectWeb/src/page/login/userlogin.vue b/Source/ProjectWeb/src/page/login/userlogin.vue
index f1cbbd9..f753498 100644
--- a/Source/ProjectWeb/src/page/login/userlogin.vue
+++ b/Source/ProjectWeb/src/page/login/userlogin.vue
@@ -165,7 +165,7 @@
done();
},
handleLogin() {
- this.$router.push({path: this.tagWel.value});
+ // this.$router.push({path: this.tagWel.value});
// this.$refs.loginForm.validate(valid => {
// if (valid) {
// const loading = this.$loading({
diff --git a/Source/ProjectWeb/src/router/axios.js b/Source/ProjectWeb/src/router/axios.js
index 64b38fe..1e52529 100644
--- a/Source/ProjectWeb/src/router/axios.js
+++ b/Source/ProjectWeb/src/router/axios.js
@@ -55,30 +55,30 @@
}, error => {
return Promise.reject(error)
});
-//http response 鎷︽埅
-axios.interceptors.response.use(res => {
- //鍏抽棴 progress bar
- NProgress.done();
- //鑾峰彇鐘舵�佺爜
- const status = res.data.code || res.status;
- const statusWhiteList = website.statusWhiteList || [];
- const message = res.data.msg || res.data.error_description || '鏈煡閿欒';
- //濡傛灉鍦ㄧ櫧鍚嶅崟閲屽垯鑷catch閫昏緫澶勭悊
- if (statusWhiteList.includes(status)) return Promise.reject(res);
- //濡傛灉鏄�401鍒欒烦杞埌鐧诲綍椤甸潰
- if (status === 401) store.dispatch('FedLogOut').then(() => router.push({path: '/login'}));
- // 濡傛灉璇锋眰涓洪潪200鍚﹁�呴粯璁ょ粺涓�澶勭悊
- if (status !== 200) {
- Message({
- message: message,
- type: 'error'
- });
- return Promise.reject(new Error(message))
- }
- return res;
-}, error => {
- NProgress.done();
- return Promise.reject(new Error(error));
-});
+// //http response 鎷︽埅
+// axios.interceptors.response.use(res => {
+// //鍏抽棴 progress bar
+// NProgress.done();
+// //鑾峰彇鐘舵�佺爜
+// const status = res.data.code || res.status;
+// const statusWhiteList = website.statusWhiteList || [];
+// const message = res.data.msg || res.data.error_description || '鏈煡閿欒';
+// //濡傛灉鍦ㄧ櫧鍚嶅崟閲屽垯鑷catch閫昏緫澶勭悊
+// if (statusWhiteList.includes(status)) return Promise.reject(res);
+// //濡傛灉鏄�401鍒欒烦杞埌鐧诲綍椤甸潰
+// if (status === 401) store.dispatch('FedLogOut').then(() => router.push({path: '/login'}));
+// // 濡傛灉璇锋眰涓洪潪200鍚﹁�呴粯璁ょ粺涓�澶勭悊
+// if (status !== 200) {
+// Message({
+// message: message,
+// type: 'error'
+// });
+// return Promise.reject(new Error(message))
+// }
+// return res;
+// }, error => {
+// NProgress.done();
+// return Promise.reject(new Error(error));
+// });
export default axios;
diff --git a/Source/ProjectWeb/src/views/base/uiDefineVO.js b/Source/ProjectWeb/src/views/base/uiDefineVO.js
index 697d06d..05817a3 100644
--- a/Source/ProjectWeb/src/views/base/uiDefineVO.js
+++ b/Source/ProjectWeb/src/views/base/uiDefineVO.js
@@ -288,6 +288,7 @@
"templet": null,
"title": "缁撴灉",
"unresize": false,
+ 'search':true,
"width": 80
},
{
diff --git a/Source/ProjectWeb/vue.config.js b/Source/ProjectWeb/vue.config.js
index c5a5155..199d2f0 100644
--- a/Source/ProjectWeb/vue.config.js
+++ b/Source/ProjectWeb/vue.config.js
@@ -22,19 +22,19 @@
},
//寮�鍙戞ā寮忓弽鍚戜唬鐞嗛厤缃紝鐢熶骇妯″紡璇蜂娇鐢∟ginx閮ㄧ讲骞堕厤缃弽鍚戜唬鐞�
devServer: {
- port: 8080,
- // proxy: {
- // '/api': {
- // //鏈湴鏈嶅姟鎺ュ彛鍦板潃
- // target: 'http://192.168.0.106:37000',
- // // target: 'http://dev.vci-tech.com:37000',
- // //杩滅▼婕旂ず鏈嶅姟鍦板潃,鍙敤浜庣洿鎺ュ惎鍔ㄩ」鐩�
- // //target: 'https://saber.bladex.vip/api',
- // ws: true,
- // pathRewrite: {
- // '^/api': '/'
- // }
- // }
- // }
+ port: 12000,
+ proxy: {
+ '/api': {
+ //鏈湴鏈嶅姟鎺ュ彛鍦板潃
+ target: 'http://192.168.0.103:12000/web',
+ // target: 'http://dev.vci-tech.com:37000',
+ //杩滅▼婕旂ず鏈嶅姟鍦板潃,鍙敤浜庣洿鎺ュ惎鍔ㄩ」鐩�
+ //target: 'https://saber.bladex.vip/api',
+ ws: true,
+ pathRewrite: {
+ '^/api': '/'
+ }
+ }
+ }
}
};
--
Gitblit v1.9.3