diff --git a/config/dev.env.js b/config/dev.env.js index ce2ab17..dc716c0 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -13,5 +13,7 @@ // 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"' //测试域名 + // BASE_API: '"https://gas.task.smartlog.work"' //测试域名 + // BASE_API: '"http://111.198.10.15:20103"' + BASE_API: '"http://192.168.147.39:5905"' // 周甜本地 }) diff --git a/config/dev.env.js b/config/dev.env.js index ce2ab17..dc716c0 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -13,5 +13,7 @@ // 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"' //测试域名 + // BASE_API: '"https://gas.task.smartlog.work"' //测试域名 + // BASE_API: '"http://111.198.10.15:20103"' + BASE_API: '"http://192.168.147.39:5905"' // 周甜本地 }) diff --git a/config/index.js b/config/index.js index 9378ef1..fac42c8 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 ce2ab17..dc716c0 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -13,5 +13,7 @@ // 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"' //测试域名 + // BASE_API: '"https://gas.task.smartlog.work"' //测试域名 + // BASE_API: '"http://111.198.10.15:20103"' + BASE_API: '"http://192.168.147.39:5905"' // 周甜本地 }) diff --git a/config/index.js b/config/index.js index 9378ef1..fac42c8 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/prod.env.js b/config/prod.env.js index 825966d..67b9350 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,11 +4,12 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://192.168.8.201:8083"' // BASE_API: '"http://139.198.17.115:50008"' - BASE_API: '"http://139.198.18.188:8083"' + // BASE_API: '"http://139.198.18.188:8083"' + // BASE_API: '"http://111.198.10.15:20103"' // BASE_API: '"http://localhost:8083"' // BASE_API: '"http://111.198.10.15:11604"' // BASE_API: '"http://192.168.8.108:8083"' // BASE_API: '"https://smartlog.work/prodapi4test"' - // BASE_API: '"http://111.198.10.15:21405"' + BASE_API: '"http://127.0.0.1:5905"' // BASE_API: '"https://logapi.smartlog.work/"' // 小程序 } diff --git a/config/dev.env.js b/config/dev.env.js index ce2ab17..dc716c0 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -13,5 +13,7 @@ // 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"' //测试域名 + // BASE_API: '"https://gas.task.smartlog.work"' //测试域名 + // BASE_API: '"http://111.198.10.15:20103"' + BASE_API: '"http://192.168.147.39:5905"' // 周甜本地 }) diff --git a/config/index.js b/config/index.js index 9378ef1..fac42c8 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/prod.env.js b/config/prod.env.js index 825966d..67b9350 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,11 +4,12 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://192.168.8.201:8083"' // BASE_API: '"http://139.198.17.115:50008"' - BASE_API: '"http://139.198.18.188:8083"' + // BASE_API: '"http://139.198.18.188:8083"' + // BASE_API: '"http://111.198.10.15:20103"' // BASE_API: '"http://localhost:8083"' // BASE_API: '"http://111.198.10.15:11604"' // BASE_API: '"http://192.168.8.108:8083"' // BASE_API: '"https://smartlog.work/prodapi4test"' - // BASE_API: '"http://111.198.10.15:21405"' + BASE_API: '"http://127.0.0.1:5905"' // BASE_API: '"https://logapi.smartlog.work/"' // 小程序 } diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js index 46639ba..e957012 100644 --- a/src/store/modules/websocket.js +++ b/src/store/modules/websocket.js @@ -6,9 +6,9 @@ state: { // wsUrl: 'ws://198.168.1.113:11307/websocket/', // wsUrl: 'ws://127.0.0.1:8095/websocket/', - // wsUrl: 'ws://111.198.10.15:21405/websocket/', + wsUrl: 'ws://111.198.10.15:21405/websocket/', // BASE_API: '"wss://38ka911915.picp.vip/websocket/"', // 柴壮本地 - wsUrl: 'ws://139.198.18.188:8083/websocket/', // 打包 + // wsUrl: 'ws://111.198.10.15:20103/websocket/', // 打包 websocket: null, wsStatus: false, // websocket连接状态 needRefresh: false // 是否需要刷新数据 diff --git a/config/dev.env.js b/config/dev.env.js index ce2ab17..dc716c0 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -13,5 +13,7 @@ // 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"' //测试域名 + // BASE_API: '"https://gas.task.smartlog.work"' //测试域名 + // BASE_API: '"http://111.198.10.15:20103"' + BASE_API: '"http://192.168.147.39:5905"' // 周甜本地 }) diff --git a/config/index.js b/config/index.js index 9378ef1..fac42c8 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/prod.env.js b/config/prod.env.js index 825966d..67b9350 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,11 +4,12 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://192.168.8.201:8083"' // BASE_API: '"http://139.198.17.115:50008"' - BASE_API: '"http://139.198.18.188:8083"' + // BASE_API: '"http://139.198.18.188:8083"' + // BASE_API: '"http://111.198.10.15:20103"' // BASE_API: '"http://localhost:8083"' // BASE_API: '"http://111.198.10.15:11604"' // BASE_API: '"http://192.168.8.108:8083"' // BASE_API: '"https://smartlog.work/prodapi4test"' - // BASE_API: '"http://111.198.10.15:21405"' + BASE_API: '"http://127.0.0.1:5905"' // BASE_API: '"https://logapi.smartlog.work/"' // 小程序 } diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js index 46639ba..e957012 100644 --- a/src/store/modules/websocket.js +++ b/src/store/modules/websocket.js @@ -6,9 +6,9 @@ state: { // wsUrl: 'ws://198.168.1.113:11307/websocket/', // wsUrl: 'ws://127.0.0.1:8095/websocket/', - // wsUrl: 'ws://111.198.10.15:21405/websocket/', + wsUrl: 'ws://111.198.10.15:21405/websocket/', // BASE_API: '"wss://38ka911915.picp.vip/websocket/"', // 柴壮本地 - wsUrl: 'ws://139.198.18.188:8083/websocket/', // 打包 + // wsUrl: 'ws://111.198.10.15:20103/websocket/', // 打包 websocket: null, wsStatus: false, // websocket连接状态 needRefresh: false // 是否需要刷新数据 diff --git a/src/views/factoryManager/components/addUserDialog.vue b/src/views/factoryManager/components/addUserDialog.vue index f98ba49..ad521ee 100644 --- a/src/views/factoryManager/components/addUserDialog.vue +++ b/src/views/factoryManager/components/addUserDialog.vue @@ -20,8 +20,15 @@ :value="item.value"/> + + + + + + + - + + + + + + + + - + { this.projectList = response.data }) - getPrincipalList('1').then(response => { + // getPrincipalList('1').then(response => { + // this.principalList = response.data + // }) + getPrincipalList().then(response => { this.principalList = response.data }) this.fetchData()// 获取数据 diff --git a/config/dev.env.js b/config/dev.env.js index ce2ab17..dc716c0 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -13,5 +13,7 @@ // 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"' //测试域名 + // BASE_API: '"https://gas.task.smartlog.work"' //测试域名 + // BASE_API: '"http://111.198.10.15:20103"' + BASE_API: '"http://192.168.147.39:5905"' // 周甜本地 }) diff --git a/config/index.js b/config/index.js index 9378ef1..fac42c8 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/prod.env.js b/config/prod.env.js index 825966d..67b9350 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -4,11 +4,12 @@ // BASE_API: '"http://119.254.103.80:14537"', // BASE_API: '"http://192.168.8.201:8083"' // BASE_API: '"http://139.198.17.115:50008"' - BASE_API: '"http://139.198.18.188:8083"' + // BASE_API: '"http://139.198.18.188:8083"' + // BASE_API: '"http://111.198.10.15:20103"' // BASE_API: '"http://localhost:8083"' // BASE_API: '"http://111.198.10.15:11604"' // BASE_API: '"http://192.168.8.108:8083"' // BASE_API: '"https://smartlog.work/prodapi4test"' - // BASE_API: '"http://111.198.10.15:21405"' + BASE_API: '"http://127.0.0.1:5905"' // BASE_API: '"https://logapi.smartlog.work/"' // 小程序 } diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js index 46639ba..e957012 100644 --- a/src/store/modules/websocket.js +++ b/src/store/modules/websocket.js @@ -6,9 +6,9 @@ state: { // wsUrl: 'ws://198.168.1.113:11307/websocket/', // wsUrl: 'ws://127.0.0.1:8095/websocket/', - // wsUrl: 'ws://111.198.10.15:21405/websocket/', + wsUrl: 'ws://111.198.10.15:21405/websocket/', // BASE_API: '"wss://38ka911915.picp.vip/websocket/"', // 柴壮本地 - wsUrl: 'ws://139.198.18.188:8083/websocket/', // 打包 + // wsUrl: 'ws://111.198.10.15:20103/websocket/', // 打包 websocket: null, wsStatus: false, // websocket连接状态 needRefresh: false // 是否需要刷新数据 diff --git a/src/views/factoryManager/components/addUserDialog.vue b/src/views/factoryManager/components/addUserDialog.vue index f98ba49..ad521ee 100644 --- a/src/views/factoryManager/components/addUserDialog.vue +++ b/src/views/factoryManager/components/addUserDialog.vue @@ -20,8 +20,15 @@ :value="item.value"/> + + + + + + + - + { this.projectList = response.data }) - getPrincipalList('1').then(response => { + // getPrincipalList('1').then(response => { + // this.principalList = response.data + // }) + getPrincipalList().then(response => { this.principalList = response.data }) this.fetchData()// 获取数据 diff --git a/src/views/factoryManager/miniUserManage/list.vue b/src/views/factoryManager/miniUserManage/list.vue index aa7c48c..ce530bb 100644 --- a/src/views/factoryManager/miniUserManage/list.vue +++ b/src/views/factoryManager/miniUserManage/list.vue @@ -142,7 +142,7 @@ }, { text: '角色', - value: 'role', + value: 'roleName', align: 'center' }, { @@ -204,7 +204,7 @@ return { ...item, userStaus: item.status === '1' ? '已绑定' : item.status === '2' ? '未绑定' : '已删除', - role: item.role === '2' ? '普通用户' : item.role === '1' ? '管理用户' : '未知' + roleName: item.role === '2' ? '普通用户' : item.role === '1' ? '管理用户' : '未知' } }) this.total = parseInt(response.data.total)