diff --git a/src/api/job.js b/src/api/job.js index c6d8314..4e71ad7 100644 --- a/src/api/job.js +++ b/src/api/job.js @@ -6,7 +6,7 @@ // 查询工单状态,字典值 export function getJobStatus(params) { return request({ - url: 'dict/code/jobStatus', + url: '/sys/dict/code/jobStatus', method: 'get', params }) diff --git a/src/api/job.js b/src/api/job.js index c6d8314..4e71ad7 100644 --- a/src/api/job.js +++ b/src/api/job.js @@ -6,7 +6,7 @@ // 查询工单状态,字典值 export function getJobStatus(params) { return request({ - url: 'dict/code/jobStatus', + url: '/sys/dict/code/jobStatus', method: 'get', params }) diff --git a/src/api/login.js b/src/api/login.js index 14486ca..eece1f7 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -2,7 +2,7 @@ // 登录 export function login(loginForm) { return request({ - url: 'user/appLogin', + url: '/sys/user/appLogin', method: 'post', params: loginForm }) @@ -10,28 +10,28 @@ // 获取用户信息 export function getInfo() { return request({ - url: '/user/info', + url: '/sys/user/info', method: 'get' }) } // 获取用户权限(菜单、按钮) export function getMenus() { return request({ - url: '/user/permission', + url: '/sys/user/permission', method: 'get' }) } // 登出 export function logout() { return request({ - url: '/user/logout', + url: '/sys/user/logout', method: 'get' }) } // 获取系统基础配置:公钥,验证码是否开启 export function getConfig() { return request({ - url: '/config/baseConfig', + url: '/sys/config/baseConfig', method: 'get' }) } diff --git a/src/api/job.js b/src/api/job.js index c6d8314..4e71ad7 100644 --- a/src/api/job.js +++ b/src/api/job.js @@ -6,7 +6,7 @@ // 查询工单状态,字典值 export function getJobStatus(params) { return request({ - url: 'dict/code/jobStatus', + url: '/sys/dict/code/jobStatus', method: 'get', params }) diff --git a/src/api/login.js b/src/api/login.js index 14486ca..eece1f7 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -2,7 +2,7 @@ // 登录 export function login(loginForm) { return request({ - url: 'user/appLogin', + url: '/sys/user/appLogin', method: 'post', params: loginForm }) @@ -10,28 +10,28 @@ // 获取用户信息 export function getInfo() { return request({ - url: '/user/info', + url: '/sys/user/info', method: 'get' }) } // 获取用户权限(菜单、按钮) export function getMenus() { return request({ - url: '/user/permission', + url: '/sys/user/permission', method: 'get' }) } // 登出 export function logout() { return request({ - url: '/user/logout', + url: '/sys/user/logout', method: 'get' }) } // 获取系统基础配置:公钥,验证码是否开启 export function getConfig() { return request({ - url: '/config/baseConfig', + url: '/sys/config/baseConfig', method: 'get' }) } diff --git a/src/api/user.js b/src/api/user.js index c632c4e..e9375a3 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -7,7 +7,7 @@ // 用户查询 export function getUserList(params) { return request({ - url: 'mgr/simplelist', + url: 'sys/mgr/simpleList', method: 'post', params }) @@ -16,7 +16,7 @@ // 修改密码 export function changePwd(oldPwd, newPwd) { return request({ - url: 'mgr/changePwd', + url: 'sys/mgr/changePwd', method: 'post', params: { oldPwd: oldPwd, diff --git a/src/api/job.js b/src/api/job.js index c6d8314..4e71ad7 100644 --- a/src/api/job.js +++ b/src/api/job.js @@ -6,7 +6,7 @@ // 查询工单状态,字典值 export function getJobStatus(params) { return request({ - url: 'dict/code/jobStatus', + url: '/sys/dict/code/jobStatus', method: 'get', params }) diff --git a/src/api/login.js b/src/api/login.js index 14486ca..eece1f7 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -2,7 +2,7 @@ // 登录 export function login(loginForm) { return request({ - url: 'user/appLogin', + url: '/sys/user/appLogin', method: 'post', params: loginForm }) @@ -10,28 +10,28 @@ // 获取用户信息 export function getInfo() { return request({ - url: '/user/info', + url: '/sys/user/info', method: 'get' }) } // 获取用户权限(菜单、按钮) export function getMenus() { return request({ - url: '/user/permission', + url: '/sys/user/permission', method: 'get' }) } // 登出 export function logout() { return request({ - url: '/user/logout', + url: '/sys/user/logout', method: 'get' }) } // 获取系统基础配置:公钥,验证码是否开启 export function getConfig() { return request({ - url: '/config/baseConfig', + url: '/sys/config/baseConfig', method: 'get' }) } diff --git a/src/api/user.js b/src/api/user.js index c632c4e..e9375a3 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -7,7 +7,7 @@ // 用户查询 export function getUserList(params) { return request({ - url: 'mgr/simplelist', + url: 'sys/mgr/simpleList', method: 'post', params }) @@ -16,7 +16,7 @@ // 修改密码 export function changePwd(oldPwd, newPwd) { return request({ - url: 'mgr/changePwd', + url: 'sys/mgr/changePwd', method: 'post', params: { oldPwd: oldPwd, diff --git a/src/api/well.js b/src/api/well.js index f20310c..14f99cb 100644 --- a/src/api/well.js +++ b/src/api/well.js @@ -24,7 +24,7 @@ // 窨井类别 export function getWellType(params) { return request({ - url: 'dict/code/sluicewellType', + url: 'sys/dict/code/sluicewellType', method: 'get', params }) @@ -62,7 +62,7 @@ // 获取字典值 export function dict(code){ return request({ - url: 'dict/code/'+code, + url: 'sys/dict/code/'+code, method: 'get' }) } diff --git a/src/api/job.js b/src/api/job.js index c6d8314..4e71ad7 100644 --- a/src/api/job.js +++ b/src/api/job.js @@ -6,7 +6,7 @@ // 查询工单状态,字典值 export function getJobStatus(params) { return request({ - url: 'dict/code/jobStatus', + url: '/sys/dict/code/jobStatus', method: 'get', params }) diff --git a/src/api/login.js b/src/api/login.js index 14486ca..eece1f7 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -2,7 +2,7 @@ // 登录 export function login(loginForm) { return request({ - url: 'user/appLogin', + url: '/sys/user/appLogin', method: 'post', params: loginForm }) @@ -10,28 +10,28 @@ // 获取用户信息 export function getInfo() { return request({ - url: '/user/info', + url: '/sys/user/info', method: 'get' }) } // 获取用户权限(菜单、按钮) export function getMenus() { return request({ - url: '/user/permission', + url: '/sys/user/permission', method: 'get' }) } // 登出 export function logout() { return request({ - url: '/user/logout', + url: '/sys/user/logout', method: 'get' }) } // 获取系统基础配置:公钥,验证码是否开启 export function getConfig() { return request({ - url: '/config/baseConfig', + url: '/sys/config/baseConfig', method: 'get' }) } diff --git a/src/api/user.js b/src/api/user.js index c632c4e..e9375a3 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -7,7 +7,7 @@ // 用户查询 export function getUserList(params) { return request({ - url: 'mgr/simplelist', + url: 'sys/mgr/simpleList', method: 'post', params }) @@ -16,7 +16,7 @@ // 修改密码 export function changePwd(oldPwd, newPwd) { return request({ - url: 'mgr/changePwd', + url: 'sys/mgr/changePwd', method: 'post', params: { oldPwd: oldPwd, diff --git a/src/api/well.js b/src/api/well.js index f20310c..14f99cb 100644 --- a/src/api/well.js +++ b/src/api/well.js @@ -24,7 +24,7 @@ // 窨井类别 export function getWellType(params) { return request({ - url: 'dict/code/sluicewellType', + url: 'sys/dict/code/sluicewellType', method: 'get', params }) @@ -62,7 +62,7 @@ // 获取字典值 export function dict(code){ return request({ - url: 'dict/code/'+code, + url: 'sys/dict/code/'+code, method: 'get' }) } diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 381096a..0b13f66 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -332,6 +332,7 @@ } //判断是否显示转单按钮 if(this.jobForm.jobStatus=='1' || this.jobForm.jobStatus=='2'){ + this.jobForm.editable = 1 if(this.jobForm.flow && this.jobForm.flow.length>0 ){ this.showTransferBtn = false }else{ diff --git a/src/api/job.js b/src/api/job.js index c6d8314..4e71ad7 100644 --- a/src/api/job.js +++ b/src/api/job.js @@ -6,7 +6,7 @@ // 查询工单状态,字典值 export function getJobStatus(params) { return request({ - url: 'dict/code/jobStatus', + url: '/sys/dict/code/jobStatus', method: 'get', params }) diff --git a/src/api/login.js b/src/api/login.js index 14486ca..eece1f7 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -2,7 +2,7 @@ // 登录 export function login(loginForm) { return request({ - url: 'user/appLogin', + url: '/sys/user/appLogin', method: 'post', params: loginForm }) @@ -10,28 +10,28 @@ // 获取用户信息 export function getInfo() { return request({ - url: '/user/info', + url: '/sys/user/info', method: 'get' }) } // 获取用户权限(菜单、按钮) export function getMenus() { return request({ - url: '/user/permission', + url: '/sys/user/permission', method: 'get' }) } // 登出 export function logout() { return request({ - url: '/user/logout', + url: '/sys/user/logout', method: 'get' }) } // 获取系统基础配置:公钥,验证码是否开启 export function getConfig() { return request({ - url: '/config/baseConfig', + url: '/sys/config/baseConfig', method: 'get' }) } diff --git a/src/api/user.js b/src/api/user.js index c632c4e..e9375a3 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -7,7 +7,7 @@ // 用户查询 export function getUserList(params) { return request({ - url: 'mgr/simplelist', + url: 'sys/mgr/simpleList', method: 'post', params }) @@ -16,7 +16,7 @@ // 修改密码 export function changePwd(oldPwd, newPwd) { return request({ - url: 'mgr/changePwd', + url: 'sys/mgr/changePwd', method: 'post', params: { oldPwd: oldPwd, diff --git a/src/api/well.js b/src/api/well.js index f20310c..14f99cb 100644 --- a/src/api/well.js +++ b/src/api/well.js @@ -24,7 +24,7 @@ // 窨井类别 export function getWellType(params) { return request({ - url: 'dict/code/sluicewellType', + url: 'sys/dict/code/sluicewellType', method: 'get', params }) @@ -62,7 +62,7 @@ // 获取字典值 export function dict(code){ return request({ - url: 'dict/code/'+code, + url: 'sys/dict/code/'+code, method: 'get' }) } diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 381096a..0b13f66 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -332,6 +332,7 @@ } //判断是否显示转单按钮 if(this.jobForm.jobStatus=='1' || this.jobForm.jobStatus=='2'){ + this.jobForm.editable = 1 if(this.jobForm.flow && this.jobForm.flow.length>0 ){ this.showTransferBtn = false }else{ diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 54111f0..9413f31 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -93,6 +93,7 @@ login(userInfo).then(response => { if (response.code === 200) { const data = response.data + debugger setPwd(userInfo.password) commit('SET_TOKEN', data.token) commit('SET_USERNAME', userInfo.username) @@ -112,8 +113,8 @@ getInfo(state.token).then(response => { console.log('get UserInfo') const data = response.data - if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组 - commit('SET_ROLELIST', data.roleList) + if (data.roleIds && data.roleIds.length > 0) { // 验证返回的roles是否是一个非空数组 + commit('SET_ROLELIST', data.roleIds) commit('SET_ROLENAMES', data.roleNames) commit('SET_ROLETIPS', data.roleTips) } else { @@ -127,7 +128,7 @@ } commit('SET_NAME', data.name) commit('SET_PHONE', data.phone) - commit('SET_RESETPWD', data.sysData.resetPwd) + // commit('SET_RESETPWD', data.sysData.resetPwd) resolve(response) }).catch(error => { reject(error) diff --git a/src/api/job.js b/src/api/job.js index c6d8314..4e71ad7 100644 --- a/src/api/job.js +++ b/src/api/job.js @@ -6,7 +6,7 @@ // 查询工单状态,字典值 export function getJobStatus(params) { return request({ - url: 'dict/code/jobStatus', + url: '/sys/dict/code/jobStatus', method: 'get', params }) diff --git a/src/api/login.js b/src/api/login.js index 14486ca..eece1f7 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -2,7 +2,7 @@ // 登录 export function login(loginForm) { return request({ - url: 'user/appLogin', + url: '/sys/user/appLogin', method: 'post', params: loginForm }) @@ -10,28 +10,28 @@ // 获取用户信息 export function getInfo() { return request({ - url: '/user/info', + url: '/sys/user/info', method: 'get' }) } // 获取用户权限(菜单、按钮) export function getMenus() { return request({ - url: '/user/permission', + url: '/sys/user/permission', method: 'get' }) } // 登出 export function logout() { return request({ - url: '/user/logout', + url: '/sys/user/logout', method: 'get' }) } // 获取系统基础配置:公钥,验证码是否开启 export function getConfig() { return request({ - url: '/config/baseConfig', + url: '/sys/config/baseConfig', method: 'get' }) } diff --git a/src/api/user.js b/src/api/user.js index c632c4e..e9375a3 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -7,7 +7,7 @@ // 用户查询 export function getUserList(params) { return request({ - url: 'mgr/simplelist', + url: 'sys/mgr/simpleList', method: 'post', params }) @@ -16,7 +16,7 @@ // 修改密码 export function changePwd(oldPwd, newPwd) { return request({ - url: 'mgr/changePwd', + url: 'sys/mgr/changePwd', method: 'post', params: { oldPwd: oldPwd, diff --git a/src/api/well.js b/src/api/well.js index f20310c..14f99cb 100644 --- a/src/api/well.js +++ b/src/api/well.js @@ -24,7 +24,7 @@ // 窨井类别 export function getWellType(params) { return request({ - url: 'dict/code/sluicewellType', + url: 'sys/dict/code/sluicewellType', method: 'get', params }) @@ -62,7 +62,7 @@ // 获取字典值 export function dict(code){ return request({ - url: 'dict/code/'+code, + url: 'sys/dict/code/'+code, method: 'get' }) } diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue index 381096a..0b13f66 100644 --- a/src/page/jobManage/modules/JobDetail.vue +++ b/src/page/jobManage/modules/JobDetail.vue @@ -332,6 +332,7 @@ } //判断是否显示转单按钮 if(this.jobForm.jobStatus=='1' || this.jobForm.jobStatus=='2'){ + this.jobForm.editable = 1 if(this.jobForm.flow && this.jobForm.flow.length>0 ){ this.showTransferBtn = false }else{ diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 54111f0..9413f31 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -93,6 +93,7 @@ login(userInfo).then(response => { if (response.code === 200) { const data = response.data + debugger setPwd(userInfo.password) commit('SET_TOKEN', data.token) commit('SET_USERNAME', userInfo.username) @@ -112,8 +113,8 @@ getInfo(state.token).then(response => { console.log('get UserInfo') const data = response.data - if (data.roleList && data.roleList.length > 0) { // 验证返回的roles是否是一个非空数组 - commit('SET_ROLELIST', data.roleList) + if (data.roleIds && data.roleIds.length > 0) { // 验证返回的roles是否是一个非空数组 + commit('SET_ROLELIST', data.roleIds) commit('SET_ROLENAMES', data.roleNames) commit('SET_ROLETIPS', data.roleTips) } else { @@ -127,7 +128,7 @@ } commit('SET_NAME', data.name) commit('SET_PHONE', data.phone) - commit('SET_RESETPWD', data.sysData.resetPwd) + // commit('SET_RESETPWD', data.sysData.resetPwd) resolve(response) }).catch(error => { reject(error) diff --git a/unpackage/resources/H58F8F36D/www/src/api/login.js b/unpackage/resources/H58F8F36D/www/src/api/login.js index f268db5..b3393dd 100644 --- a/unpackage/resources/H58F8F36D/www/src/api/login.js +++ b/unpackage/resources/H58F8F36D/www/src/api/login.js @@ -37,7 +37,7 @@ // 获取系统基础配置:公钥,验证码是否开启 export function getConfig() { return request({ - url: '/config/baseconfig', + url: 'sys/config/baseconfig', method: 'get' }) }