diff --git a/config/dev.env.js b/config/dev.env.js index 3a3a84a..a59f46e 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,8 +7,11 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://139.198.18.188:8083"' // 线上 - // BASE_API: '"https://logapi.smartlog.work/"' // 小程序 + // BASE_API: '"https://logapi.smartlog.work"' // 小程序 // BASE_API: '"http://192.168.43.84:8083"' - BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地 + // BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地 + // BASE_API: '"http://192.168.83.40:8083"' // 柴壮本地ip + BASE_API: '"http://192.168.8.110:8083"' // 柴壮本地 // BASE_API: '"http://111.198.10.15:21405"' + // BASE_API: '"https://gas.task.smartlog.work"' //测试域名 }) diff --git a/config/dev.env.js b/config/dev.env.js index 3a3a84a..a59f46e 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,8 +7,11 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://139.198.18.188:8083"' // 线上 - // BASE_API: '"https://logapi.smartlog.work/"' // 小程序 + // BASE_API: '"https://logapi.smartlog.work"' // 小程序 // BASE_API: '"http://192.168.43.84:8083"' - BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地 + // BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地 + // BASE_API: '"http://192.168.83.40:8083"' // 柴壮本地ip + BASE_API: '"http://192.168.8.110:8083"' // 柴壮本地 // BASE_API: '"http://111.198.10.15:21405"' + // BASE_API: '"https://gas.task.smartlog.work"' //测试域名 }) diff --git a/config/index.js b/config/index.js index fac42c8..9378ef1 100644 --- a/config/index.js +++ b/config/index.js @@ -14,7 +14,7 @@ proxyTable: {}, // Various Dev Server settings - // host: '0.0.0.0', // can be overwritten by process.env.HOST + host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined //是否自动打开浏览器 autoOpenBrowser: true, diff --git a/config/dev.env.js b/config/dev.env.js index 3a3a84a..a59f46e 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,8 +7,11 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://139.198.18.188:8083"' // 线上 - // BASE_API: '"https://logapi.smartlog.work/"' // 小程序 + // BASE_API: '"https://logapi.smartlog.work"' // 小程序 // BASE_API: '"http://192.168.43.84:8083"' - BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地 + // BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地 + // BASE_API: '"http://192.168.83.40:8083"' // 柴壮本地ip + BASE_API: '"http://192.168.8.110:8083"' // 柴壮本地 // BASE_API: '"http://111.198.10.15:21405"' + // BASE_API: '"https://gas.task.smartlog.work"' //测试域名 }) diff --git a/config/index.js b/config/index.js index fac42c8..9378ef1 100644 --- a/config/index.js +++ b/config/index.js @@ -14,7 +14,7 @@ proxyTable: {}, // Various Dev Server settings - // host: '0.0.0.0', // can be overwritten by process.env.HOST + host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined //是否自动打开浏览器 autoOpenBrowser: true, diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..513bbd8 --- /dev/null +++ b/dist.zip Binary files differ diff --git a/config/dev.env.js b/config/dev.env.js index 3a3a84a..a59f46e 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,8 +7,11 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://139.198.18.188:8083"' // 线上 - // BASE_API: '"https://logapi.smartlog.work/"' // 小程序 + // BASE_API: '"https://logapi.smartlog.work"' // 小程序 // BASE_API: '"http://192.168.43.84:8083"' - BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地 + // BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地 + // BASE_API: '"http://192.168.83.40:8083"' // 柴壮本地ip + BASE_API: '"http://192.168.8.110:8083"' // 柴壮本地 // BASE_API: '"http://111.198.10.15:21405"' + // BASE_API: '"https://gas.task.smartlog.work"' //测试域名 }) diff --git a/config/index.js b/config/index.js index fac42c8..9378ef1 100644 --- a/config/index.js +++ b/config/index.js @@ -14,7 +14,7 @@ proxyTable: {}, // Various Dev Server settings - // host: '0.0.0.0', // can be overwritten by process.env.HOST + host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined //是否自动打开浏览器 autoOpenBrowser: true, diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..513bbd8 --- /dev/null +++ b/dist.zip Binary files differ diff --git a/src/api/factoryManager/miniUserManage.js b/src/api/factoryManager/miniUserManage.js index 3fe6557..e994949 100644 --- a/src/api/factoryManager/miniUserManage.js +++ b/src/api/factoryManager/miniUserManage.js @@ -31,9 +31,8 @@ // 解除绑定 export function unbind(data) { return request({ - url: 'app/user/unbind', - method: 'post', - data + url: `app/user/unbind?id=${data.id}`, + method: 'get' }) } diff --git a/config/dev.env.js b/config/dev.env.js index 3a3a84a..a59f46e 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,8 +7,11 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://139.198.18.188:8083"' // 线上 - // BASE_API: '"https://logapi.smartlog.work/"' // 小程序 + // BASE_API: '"https://logapi.smartlog.work"' // 小程序 // BASE_API: '"http://192.168.43.84:8083"' - BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地 + // BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地 + // BASE_API: '"http://192.168.83.40:8083"' // 柴壮本地ip + BASE_API: '"http://192.168.8.110:8083"' // 柴壮本地 // BASE_API: '"http://111.198.10.15:21405"' + // BASE_API: '"https://gas.task.smartlog.work"' //测试域名 }) diff --git a/config/index.js b/config/index.js index fac42c8..9378ef1 100644 --- a/config/index.js +++ b/config/index.js @@ -14,7 +14,7 @@ proxyTable: {}, // Various Dev Server settings - // host: '0.0.0.0', // can be overwritten by process.env.HOST + host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined //是否自动打开浏览器 autoOpenBrowser: true, diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..513bbd8 --- /dev/null +++ b/dist.zip Binary files differ diff --git a/src/api/factoryManager/miniUserManage.js b/src/api/factoryManager/miniUserManage.js index 3fe6557..e994949 100644 --- a/src/api/factoryManager/miniUserManage.js +++ b/src/api/factoryManager/miniUserManage.js @@ -31,9 +31,8 @@ // 解除绑定 export function unbind(data) { return request({ - url: 'app/user/unbind', - method: 'post', - data + url: `app/user/unbind?id=${data.id}`, + method: 'get' }) } diff --git a/src/api/factoryManager/project.js b/src/api/factoryManager/project.js index 8fddf53..f8b637b 100644 --- a/src/api/factoryManager/project.js +++ b/src/api/factoryManager/project.js @@ -39,3 +39,5 @@ }) } + + diff --git a/config/dev.env.js b/config/dev.env.js index 3a3a84a..a59f46e 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,8 +7,11 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://139.198.18.188:8083"' // 线上 - // BASE_API: '"https://logapi.smartlog.work/"' // 小程序 + // BASE_API: '"https://logapi.smartlog.work"' // 小程序 // BASE_API: '"http://192.168.43.84:8083"' - BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地 + // BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地 + // BASE_API: '"http://192.168.83.40:8083"' // 柴壮本地ip + BASE_API: '"http://192.168.8.110:8083"' // 柴壮本地 // BASE_API: '"http://111.198.10.15:21405"' + // BASE_API: '"https://gas.task.smartlog.work"' //测试域名 }) diff --git a/config/index.js b/config/index.js index fac42c8..9378ef1 100644 --- a/config/index.js +++ b/config/index.js @@ -14,7 +14,7 @@ proxyTable: {}, // Various Dev Server settings - // host: '0.0.0.0', // can be overwritten by process.env.HOST + host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined //是否自动打开浏览器 autoOpenBrowser: true, diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..513bbd8 --- /dev/null +++ b/dist.zip Binary files differ diff --git a/src/api/factoryManager/miniUserManage.js b/src/api/factoryManager/miniUserManage.js index 3fe6557..e994949 100644 --- a/src/api/factoryManager/miniUserManage.js +++ b/src/api/factoryManager/miniUserManage.js @@ -31,9 +31,8 @@ // 解除绑定 export function unbind(data) { return request({ - url: 'app/user/unbind', - method: 'post', - data + url: `app/user/unbind?id=${data.id}`, + method: 'get' }) } diff --git a/src/api/factoryManager/project.js b/src/api/factoryManager/project.js index 8fddf53..f8b637b 100644 --- a/src/api/factoryManager/project.js +++ b/src/api/factoryManager/project.js @@ -39,3 +39,5 @@ }) } + + diff --git a/src/api/factoryManager/projectManagement.js b/src/api/factoryManager/projectManagement.js index 5699ae5..70cbdf8 100644 --- a/src/api/factoryManager/projectManagement.js +++ b/src/api/factoryManager/projectManagement.js @@ -19,3 +19,11 @@ }) } +// 关联小程序用户列表 +export function getMiniUserList(params) { + return request({ + url: '/app/user/relate/project', + method: 'get', + params + }) +} diff --git a/config/dev.env.js b/config/dev.env.js index 3a3a84a..a59f46e 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,8 +7,11 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://139.198.18.188:8083"' // 线上 - // BASE_API: '"https://logapi.smartlog.work/"' // 小程序 + // BASE_API: '"https://logapi.smartlog.work"' // 小程序 // BASE_API: '"http://192.168.43.84:8083"' - BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地 + // BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地 + // BASE_API: '"http://192.168.83.40:8083"' // 柴壮本地ip + BASE_API: '"http://192.168.8.110:8083"' // 柴壮本地 // BASE_API: '"http://111.198.10.15:21405"' + // BASE_API: '"https://gas.task.smartlog.work"' //测试域名 }) diff --git a/config/index.js b/config/index.js index fac42c8..9378ef1 100644 --- a/config/index.js +++ b/config/index.js @@ -14,7 +14,7 @@ proxyTable: {}, // Various Dev Server settings - // host: '0.0.0.0', // can be overwritten by process.env.HOST + host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined //是否自动打开浏览器 autoOpenBrowser: true, diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..513bbd8 --- /dev/null +++ b/dist.zip Binary files differ diff --git a/src/api/factoryManager/miniUserManage.js b/src/api/factoryManager/miniUserManage.js index 3fe6557..e994949 100644 --- a/src/api/factoryManager/miniUserManage.js +++ b/src/api/factoryManager/miniUserManage.js @@ -31,9 +31,8 @@ // 解除绑定 export function unbind(data) { return request({ - url: 'app/user/unbind', - method: 'post', - data + url: `app/user/unbind?id=${data.id}`, + method: 'get' }) } diff --git a/src/api/factoryManager/project.js b/src/api/factoryManager/project.js index 8fddf53..f8b637b 100644 --- a/src/api/factoryManager/project.js +++ b/src/api/factoryManager/project.js @@ -39,3 +39,5 @@ }) } + + diff --git a/src/api/factoryManager/projectManagement.js b/src/api/factoryManager/projectManagement.js index 5699ae5..70cbdf8 100644 --- a/src/api/factoryManager/projectManagement.js +++ b/src/api/factoryManager/projectManagement.js @@ -19,3 +19,11 @@ }) } +// 关联小程序用户列表 +export function getMiniUserList(params) { + return request({ + url: '/app/user/relate/project', + method: 'get', + params + }) +} diff --git a/src/views/factoryManager/components/addUserDialog.vue b/src/views/factoryManager/components/addUserDialog.vue index 29663f8..2611208 100644 --- a/src/views/factoryManager/components/addUserDialog.vue +++ b/src/views/factoryManager/components/addUserDialog.vue @@ -20,7 +20,7 @@ :value="item.value"/> - + - + + + + + + diff --git a/config/dev.env.js b/config/dev.env.js index 3a3a84a..a59f46e 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,8 +7,11 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://139.198.18.188:8083"' // 线上 - // BASE_API: '"https://logapi.smartlog.work/"' // 小程序 + // BASE_API: '"https://logapi.smartlog.work"' // 小程序 // BASE_API: '"http://192.168.43.84:8083"' - BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地 + // BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地 + // BASE_API: '"http://192.168.83.40:8083"' // 柴壮本地ip + BASE_API: '"http://192.168.8.110:8083"' // 柴壮本地 // BASE_API: '"http://111.198.10.15:21405"' + // BASE_API: '"https://gas.task.smartlog.work"' //测试域名 }) diff --git a/config/index.js b/config/index.js index fac42c8..9378ef1 100644 --- a/config/index.js +++ b/config/index.js @@ -14,7 +14,7 @@ proxyTable: {}, // Various Dev Server settings - // host: '0.0.0.0', // can be overwritten by process.env.HOST + host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined //是否自动打开浏览器 autoOpenBrowser: true, diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..513bbd8 --- /dev/null +++ b/dist.zip Binary files differ diff --git a/src/api/factoryManager/miniUserManage.js b/src/api/factoryManager/miniUserManage.js index 3fe6557..e994949 100644 --- a/src/api/factoryManager/miniUserManage.js +++ b/src/api/factoryManager/miniUserManage.js @@ -31,9 +31,8 @@ // 解除绑定 export function unbind(data) { return request({ - url: 'app/user/unbind', - method: 'post', - data + url: `app/user/unbind?id=${data.id}`, + method: 'get' }) } diff --git a/src/api/factoryManager/project.js b/src/api/factoryManager/project.js index 8fddf53..f8b637b 100644 --- a/src/api/factoryManager/project.js +++ b/src/api/factoryManager/project.js @@ -39,3 +39,5 @@ }) } + + diff --git a/src/api/factoryManager/projectManagement.js b/src/api/factoryManager/projectManagement.js index 5699ae5..70cbdf8 100644 --- a/src/api/factoryManager/projectManagement.js +++ b/src/api/factoryManager/projectManagement.js @@ -19,3 +19,11 @@ }) } +// 关联小程序用户列表 +export function getMiniUserList(params) { + return request({ + url: '/app/user/relate/project', + method: 'get', + params + }) +} diff --git a/src/views/factoryManager/components/addUserDialog.vue b/src/views/factoryManager/components/addUserDialog.vue index 29663f8..2611208 100644 --- a/src/views/factoryManager/components/addUserDialog.vue +++ b/src/views/factoryManager/components/addUserDialog.vue @@ -20,7 +20,7 @@ :value="item.value"/> - + + + + + + diff --git a/src/views/factoryManager/miniUserManage/list.vue b/src/views/factoryManager/miniUserManage/list.vue index 9c33a6d..5f12126 100644 --- a/src/views/factoryManager/miniUserManage/list.vue +++ b/src/views/factoryManager/miniUserManage/list.vue @@ -60,10 +60,10 @@ @@ -146,7 +146,7 @@ }, { text: '微信用户', - value: 'wechatName', + value: 'attr', align: 'center' }, { diff --git a/config/dev.env.js b/config/dev.env.js index 3a3a84a..a59f46e 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -7,8 +7,11 @@ module.exports = merge(prodEnv, { NODE_ENV: '"development"', // BASE_API: '"http://139.198.18.188:8083"' // 线上 - // BASE_API: '"https://logapi.smartlog.work/"' // 小程序 + // BASE_API: '"https://logapi.smartlog.work"' // 小程序 // BASE_API: '"http://192.168.43.84:8083"' - BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地 + // BASE_API: '"https://38ka911915.picp.vip"' // 柴壮本地 + // BASE_API: '"http://192.168.83.40:8083"' // 柴壮本地ip + BASE_API: '"http://192.168.8.110:8083"' // 柴壮本地 // BASE_API: '"http://111.198.10.15:21405"' + // BASE_API: '"https://gas.task.smartlog.work"' //测试域名 }) diff --git a/config/index.js b/config/index.js index fac42c8..9378ef1 100644 --- a/config/index.js +++ b/config/index.js @@ -14,7 +14,7 @@ proxyTable: {}, // Various Dev Server settings - // host: '0.0.0.0', // can be overwritten by process.env.HOST + host: '0.0.0.0', // can be overwritten by process.env.HOST port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined //是否自动打开浏览器 autoOpenBrowser: true, diff --git a/dist.zip b/dist.zip new file mode 100644 index 0000000..513bbd8 --- /dev/null +++ b/dist.zip Binary files differ diff --git a/src/api/factoryManager/miniUserManage.js b/src/api/factoryManager/miniUserManage.js index 3fe6557..e994949 100644 --- a/src/api/factoryManager/miniUserManage.js +++ b/src/api/factoryManager/miniUserManage.js @@ -31,9 +31,8 @@ // 解除绑定 export function unbind(data) { return request({ - url: 'app/user/unbind', - method: 'post', - data + url: `app/user/unbind?id=${data.id}`, + method: 'get' }) } diff --git a/src/api/factoryManager/project.js b/src/api/factoryManager/project.js index 8fddf53..f8b637b 100644 --- a/src/api/factoryManager/project.js +++ b/src/api/factoryManager/project.js @@ -39,3 +39,5 @@ }) } + + diff --git a/src/api/factoryManager/projectManagement.js b/src/api/factoryManager/projectManagement.js index 5699ae5..70cbdf8 100644 --- a/src/api/factoryManager/projectManagement.js +++ b/src/api/factoryManager/projectManagement.js @@ -19,3 +19,11 @@ }) } +// 关联小程序用户列表 +export function getMiniUserList(params) { + return request({ + url: '/app/user/relate/project', + method: 'get', + params + }) +} diff --git a/src/views/factoryManager/components/addUserDialog.vue b/src/views/factoryManager/components/addUserDialog.vue index 29663f8..2611208 100644 --- a/src/views/factoryManager/components/addUserDialog.vue +++ b/src/views/factoryManager/components/addUserDialog.vue @@ -20,7 +20,7 @@ :value="item.value"/> - + + + + + + diff --git a/src/views/factoryManager/miniUserManage/list.vue b/src/views/factoryManager/miniUserManage/list.vue index 9c33a6d..5f12126 100644 --- a/src/views/factoryManager/miniUserManage/list.vue +++ b/src/views/factoryManager/miniUserManage/list.vue @@ -60,10 +60,10 @@ @@ -146,7 +146,7 @@ }, { text: '微信用户', - value: 'wechatName', + value: 'attr', align: 'center' }, { diff --git a/src/views/factoryManager/projectManagement/list.vue b/src/views/factoryManager/projectManagement/list.vue index 1aa7fbf..7536c70 100644 --- a/src/views/factoryManager/projectManagement/list.vue +++ b/src/views/factoryManager/projectManagement/list.vue @@ -57,19 +57,21 @@ - +