diff --git a/config/dev.env.js b/config/dev.env.js index 9c73ec0..dadf0c5 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -8,5 +8,7 @@ NODE_ENV: '"development"', // BASE_API: '"http://192.168.8.102:20005"' // BASE_API: '"http://192.168.8.108:20005"' - BASE_API: '"http://111.198.10.15:11638"' + // BASE_API: '"http://111.198.10.15:11638"' + BASE_API: '"http://192.168.83.33:20005"' // 颖捷本地 + }) diff --git a/config/dev.env.js b/config/dev.env.js index 9c73ec0..dadf0c5 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -8,5 +8,7 @@ NODE_ENV: '"development"', // BASE_API: '"http://192.168.8.102:20005"' // BASE_API: '"http://192.168.8.108:20005"' - BASE_API: '"http://111.198.10.15:11638"' + // BASE_API: '"http://111.198.10.15:11638"' + BASE_API: '"http://192.168.83.33:20005"' // 颖捷本地 + }) diff --git a/config/prod.env.js b/config/prod.env.js index fb7eb59..cb589c4 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -3,5 +3,6 @@ NODE_ENV: '"production"', // BASE_API: '"http://111.198.10.15:11638"' // BASE_API: '"http://192.168.8.105:20005"' - BASE_API: '"http://127.0.0.1:20005"' + // BASE_API: '"http://127.0.0.1:20005"' + BASE_API: '"http://192.168.83.33:20005"' // 颖捷本地 } diff --git a/config/dev.env.js b/config/dev.env.js index 9c73ec0..dadf0c5 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -8,5 +8,7 @@ NODE_ENV: '"development"', // BASE_API: '"http://192.168.8.102:20005"' // BASE_API: '"http://192.168.8.108:20005"' - BASE_API: '"http://111.198.10.15:11638"' + // BASE_API: '"http://111.198.10.15:11638"' + BASE_API: '"http://192.168.83.33:20005"' // 颖捷本地 + }) diff --git a/config/prod.env.js b/config/prod.env.js index fb7eb59..cb589c4 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -3,5 +3,6 @@ NODE_ENV: '"production"', // BASE_API: '"http://111.198.10.15:11638"' // BASE_API: '"http://192.168.8.105:20005"' - BASE_API: '"http://127.0.0.1:20005"' + // BASE_API: '"http://127.0.0.1:20005"' + BASE_API: '"http://192.168.83.33:20005"' // 颖捷本地 } diff --git a/src/api/person.js b/src/api/person.js index 3dfb4fe..ba79b44 100644 --- a/src/api/person.js +++ b/src/api/person.js @@ -308,3 +308,18 @@ } }) } + +// 导入人员 +export function importPerson(file, groupId) { + console.log('ppppppppppp', file, groupId) + const param = new FormData() + param.append('file', file) + param.append('groupId', groupId) + return request({ + url: 'person/batchGroupImport', + method: 'post', + headers: { 'Content-Type': 'multipart/form-data' }, + data: param + }) +} + diff --git a/config/dev.env.js b/config/dev.env.js index 9c73ec0..dadf0c5 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -8,5 +8,7 @@ NODE_ENV: '"development"', // BASE_API: '"http://192.168.8.102:20005"' // BASE_API: '"http://192.168.8.108:20005"' - BASE_API: '"http://111.198.10.15:11638"' + // BASE_API: '"http://111.198.10.15:11638"' + BASE_API: '"http://192.168.83.33:20005"' // 颖捷本地 + }) diff --git a/config/prod.env.js b/config/prod.env.js index fb7eb59..cb589c4 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -3,5 +3,6 @@ NODE_ENV: '"production"', // BASE_API: '"http://111.198.10.15:11638"' // BASE_API: '"http://192.168.8.105:20005"' - BASE_API: '"http://127.0.0.1:20005"' + // BASE_API: '"http://127.0.0.1:20005"' + BASE_API: '"http://192.168.83.33:20005"' // 颖捷本地 } diff --git a/src/api/person.js b/src/api/person.js index 3dfb4fe..ba79b44 100644 --- a/src/api/person.js +++ b/src/api/person.js @@ -308,3 +308,18 @@ } }) } + +// 导入人员 +export function importPerson(file, groupId) { + console.log('ppppppppppp', file, groupId) + const param = new FormData() + param.append('file', file) + param.append('groupId', groupId) + return request({ + url: 'person/batchGroupImport', + method: 'post', + headers: { 'Content-Type': 'multipart/form-data' }, + data: param + }) +} + diff --git a/src/views/memberManage/listGroup.vue b/src/views/memberManage/listGroup.vue index a49dfdf..af05a83 100644 --- a/src/views/memberManage/listGroup.vue +++ b/src/views/memberManage/listGroup.vue @@ -31,10 +31,22 @@ {{ scope.row[column.value] }} - + @@ -58,7 +70,7 @@