diff --git a/dangan-ui/src/api/dangan/catalog.js b/dangan-ui/src/api/dangan/catalog.js index d3c35df..4206b70 100644 --- a/dangan-ui/src/api/dangan/catalog.js +++ b/dangan-ui/src/api/dangan/catalog.js @@ -15,6 +15,7 @@ export function countCatalog(query) { return request({ url: '/dangan/catalog/count', method: 'get', + timeout: 300000, params: query }) } diff --git a/dangan-ui/src/api/dangan/retrieval.js b/dangan-ui/src/api/dangan/retrieval.js index 6f89ff6..4ec547e 100644 --- a/dangan-ui/src/api/dangan/retrieval.js +++ b/dangan-ui/src/api/dangan/retrieval.js @@ -8,7 +8,7 @@ import request from '@/utils/request' export function listCzrkdj(query) { return request({ url: '/dangan/search/czrk', - timeout: 120000, + timeout: 300000, method: 'get', params: query }) @@ -18,7 +18,7 @@ export function listCzrkdj(query) { export function listBirthDJ(query) { return request({ url: '/dangan/search/cszm', - timeout: 120000, + timeout: 300000, method: 'get', params: query }) @@ -28,7 +28,7 @@ export function listBirthDJ(query) { export function listQyz(query) { return request({ url: '/dangan/search/qyz', - timeout: 120000, + timeout: 300000, method: 'get', params: query }) @@ -38,7 +38,7 @@ export function listQyz(query) { export function listYtzm(query) { return request({ url: '/dangan/search/ytzm', - timeout: 120000, + timeout: 300000, method: 'get', params: query }) @@ -48,7 +48,7 @@ export function listYtzm(query) { export function listZfnyhkcg(query) { return request({ url: '/dangan/search/zfny', - timeout: 120000, + timeout: 300000, method: 'get', params: query }) @@ -58,7 +58,7 @@ export function listZfnyhkcg(query) { export function listZqz(query) { return request({ url: '/dangan/search/zqz', - timeout: 120000, + timeout: 300000, method: 'get', params: query }) @@ -71,7 +71,7 @@ export function listZqz(query) { export function listCzrkdj1(query) { return request({ url: '/dangan/search/czrk1', - timeout: 120000, + timeout: 300000, method: 'get', params: query }) @@ -81,7 +81,7 @@ export function listCzrkdj1(query) { export function listBirthDJ1(query) { return request({ url: '/dangan/search/cszm1', - timeout: 120000, + timeout: 300000, method: 'get', params: query }) @@ -91,7 +91,7 @@ export function listBirthDJ1(query) { export function listQyz1(query) { return request({ url: '/dangan/search/qyz1', - timeout: 120000, + timeout: 300000, method: 'get', params: query }) @@ -101,7 +101,7 @@ export function listQyz1(query) { export function listYtzm1(query) { return request({ url: '/dangan/search/ytzm1', - timeout: 120000, + timeout: 300000, method: 'get', params: query }) @@ -111,7 +111,7 @@ export function listYtzm1(query) { export function listZfnyhkcg1(query) { return request({ url: '/dangan/search/zfny1', - timeout: 120000, + timeout: 300000, method: 'get', params: query }) @@ -121,7 +121,7 @@ export function listZfnyhkcg1(query) { export function listZqz1(query) { return request({ url: '/dangan/search/zqz1', - timeout: 120000, + timeout: 300000, method: 'get', params: query }) diff --git a/dangan-ui/src/views/dangan/collection/index.vue b/dangan-ui/src/views/dangan/collection/index.vue index 52aec98..235e63f 100644 --- a/dangan-ui/src/views/dangan/collection/index.vue +++ b/dangan-ui/src/views/dangan/collection/index.vue @@ -391,6 +391,8 @@ export default { watch: { // 根据名称筛选档案目录树 muName(val) { + console.log(val); + this.$refs.tree.filter(val); } }, @@ -535,8 +537,9 @@ export default { }, // 筛选节点 filterNode(value, data) { + console.log(value, data); if (!value) return true; - return data.label.indexOf(value) !== -1; + return data.muName.indexOf(value) !== -1; }, // 节点单击事件 handleNodeClick(data, Node) {