diff --git a/supervise-organizational-ui/.env.development b/supervise-organizational-ui/.env.development index eebfcf52..aa41dc13 100644 --- a/supervise-organizational-ui/.env.development +++ b/supervise-organizational-ui/.env.development @@ -5,5 +5,5 @@ ENV = 'development' VUE_APP_BASE_API = '/api' ## 配置测试和本地开发时的 接口地址 -VUE_APP_URL = "http://192.168.1.107:8112" +VUE_APP_URL = "http://192.168.1.104:7008" ##VUE_APP_URL = "http://8.130.39.13:8112" diff --git a/supervise-organizational-ui/src/api/brank/brank.js b/supervise-organizational-ui/src/api/brank/brank.js index d72a4eba..35291bc4 100644 --- a/supervise-organizational-ui/src/api/brank/brank.js +++ b/supervise-organizational-ui/src/api/brank/brank.js @@ -4,7 +4,6 @@ export default { addInfo: function(data) { return request({ - baseURL: "/api/crm", url: '/v1/loanbankinformation/save', method: 'post', data: data @@ -13,14 +12,12 @@ export default { fetchBySid: function(sid) { return request({ - baseURL: '/api/crm', url: '/v1/loanbankinformation/getBankInfBySid/' + sid }) }, updateData: function(data) { return request({ - baseURL: "/api/crm", url: '/v1/loanbankinformation/update', method: 'post', data: data @@ -29,8 +26,7 @@ export default { delBySids: function(sid) { return request({ - baseURL: '/api/crm', - url: 'v1/loanbankinformation/delete/' + sid, + url: '/v1/loanbankinformation/delete/' + sid, method: 'delete' }) }, @@ -38,7 +34,6 @@ export default { // 查询分页列表 listPage: function(params) { return request({ - baseURL: '/api/crm', url: '/v1/loanbankinformation/listPage', method: 'post', data: params, @@ -52,7 +47,6 @@ export default { addPersonnelInfo: function(data) { return request({ - baseURL: "/api/crm", url: '/v1/bankmanager/save', method: 'post', data: data @@ -61,14 +55,12 @@ export default { fetchPersonnelBySid: function(sid) { return request({ - baseURL: '/api/crm', url: '/v1/bankmanager/getManagerBySid /' + sid }) }, updatePersonnelData: function(data) { return request({ - baseURL: "/api/crm", url: '/v1/bankmanager/update', method: 'post', data: data @@ -77,7 +69,6 @@ export default { delPersonnelBySids: function(sid) { return request({ - baseURL: '/api/crm', url: '/v1/bankmanager/delete', method: 'delete', data: sid, diff --git a/supervise-organizational-ui/src/api/portal/areaPicker.js b/supervise-organizational-ui/src/api/portal/areaPicker.js index 8a2eee36..e426c4f8 100644 --- a/supervise-organizational-ui/src/api/portal/areaPicker.js +++ b/supervise-organizational-ui/src/api/portal/areaPicker.js @@ -1,9 +1,9 @@ import request from '@/utils/request' -// 获取省/portal/v1/regions/getProvince +// 获取省/v1/regions/getProvince export function getProvince(data) { return request({ - url: '/portal/v1/regions/getProvince',data, + url: '/v1/regions/getProvince',data, method: 'get', params:data, }) @@ -11,7 +11,7 @@ export function getProvince(data) { // 根据省sid获取该省的所有市 export function getCity(data) { return request({ - url: '/portal/v1/regions/getCity', + url: '/v1/regions/getCity', params:data, method: 'get', }) @@ -19,7 +19,7 @@ export function getCity(data) { // 根据市sid获取该市的所有县区 export function getCounty(data) { return request({ - url: '/portal/v1/regions/getCounty', + url: '/v1/regions/getCounty', method: 'get', params:data, }) @@ -27,7 +27,7 @@ export function getCounty(data) { // // 区域列表(省市县均可用) // export function selectsList(data) { // return request({ -// url: '/portal/v1/regions/selectsList', data, +// url: '/v1/regions/selectsList', data, // method: 'post', // headers: { 'Content-Type': 'application/json' } // }) diff --git a/supervise-organizational-ui/src/api/system/Role/role.js b/supervise-organizational-ui/src/api/system/Role/role.js index 7eb16f31..54d618e3 100644 --- a/supervise-organizational-ui/src/api/system/Role/role.js +++ b/supervise-organizational-ui/src/api/system/Role/role.js @@ -13,8 +13,7 @@ export function rolemenus(data) { // 获取左侧菜单 export function getrolemenus(data) { return request({ - baseURL: '/api', - url: '/portal/v1/sysmenu/sourcemenutree', + url: '/v1/sysmenu/sourcemenutree', method: 'POST', async: false, // data: {userSid: data.userSid, sourceSid: '000011'}, @@ -36,8 +35,7 @@ export function sourcesofrole(data) { // 根据token值获取登录后的用户信息 export function loginDetails(data) { return request({ - baseURL: '/api', - url: '/portal/v1/sysuser/loginDetails', + url: '/v1/sysuser/loginDetails', method: 'post', data: data, headers: { diff --git a/supervise-organizational-ui/src/api/system/departments/departments.js b/supervise-organizational-ui/src/api/system/departments/departments.js index 9184e33f..50f053d6 100644 --- a/supervise-organizational-ui/src/api/system/departments/departments.js +++ b/supervise-organizational-ui/src/api/system/departments/departments.js @@ -6,7 +6,7 @@ let tokens = window.sessionStorage.getItem('token') // 获取菜单 分页列表 export function pageList(data) { return request({ - url: '/portal/v1/sysorganization/listPage', + url: '/v1/sysorganization/listPage', method: 'POST', data: data, headers: { @@ -18,7 +18,7 @@ export function pageList(data) { // 查询左侧部门列表 export function orgList(data) { return request({ - url: '/portal/v1/sysorganization/list', + url: '/v1/sysorganization/list', method: 'get', data: data, headers: { @@ -30,7 +30,7 @@ export function orgList(data) { // 编辑部门信息 export function postOrgtree(data) { return request({ - url: '/portal/v1/sysorganization/update/' + data.sid, + url: '/v1/sysorganization/update/' + data.sid, method: 'POST', data: data, headers: { @@ -42,7 +42,7 @@ export function postOrgtree(data) { // 获取 机构分页列表(编辑部门信息) export function putOrgtree(data) { return request({ - url: '/portal/v1/sysorganization/update/' + data.sid, + url: '/v1/sysorganization/update/' + data.sid, method: 'POST', data: data, headers: { @@ -55,7 +55,7 @@ export function putOrgtree(data) { // 新增部门信息 export function addOrgTree(data) { return request({ - url: '/portal/v1/sysorganization/save', + url: '/v1/sysorganization/save', method: 'POST', data: data, headers: { @@ -67,7 +67,7 @@ export function addOrgTree(data) { // 回显 export function selectBySid(data) { return request({ - url: 'portal/v1/sysorganization/fetchBySid/' + data, + url: '/v1/sysorganization/fetchBySid/' + data, method: 'get', data: data, headers: { @@ -79,7 +79,7 @@ export function selectBySid(data) { // 树 节点名称 删除 export function delOrgtree(data) { return request({ - url: `/portal/v1/sysorganization/delBySid/` + data.sid, + url: `/v1/sysorganization/delBySid/` + data.sid, method: 'get', data: qs.stringify(data), headers: { @@ -88,10 +88,10 @@ export function delOrgtree(data) { } }) } -// 查询主管人员 旧的:/portal/v1/sysstafforg/staffinfoList +// 查询主管人员 旧的:/v1/sysstafforg/staffinfoList export function getStaff(data) { return request({ - url: 'portal/v1/sysstaffinfo/getStaffNameByDeptSid', + url: '/v1/sysstaffinfo/getStaffNameByDeptSid', method: 'get', params: data, headers: { @@ -103,7 +103,7 @@ export function getStaff(data) { // 查询分管人员 export function getStaffName(params) { return request({ - url: '/portal/v1/sysstaffinfo/getStaffName', + url: '/v1/sysstaffinfo/getStaffName', method: 'get', params: params, headers: { @@ -115,7 +115,7 @@ export function getStaffName(params) { // 查看二维码 export function getQrCode(data) { return request({ - url: '/portal/v1/sysorganization/getQrCode/' + data.sid, + url: '/v1/sysorganization/getQrCode/' + data.sid, method: 'post', data: data, headers: { @@ -126,8 +126,7 @@ export function getQrCode(data) { // 查看二维码 export function loginDetails() { return request({ - baseURL: '/api', - url: '/portal/v1/sysuser/loginDetails', + url: '/v1/sysuser/loginDetails', method: 'post', headers: { 'Content-Type': 'application/json' diff --git a/supervise-organizational-ui/src/api/system/postManage/index.js b/supervise-organizational-ui/src/api/system/postManage/index.js index a7c12ba5..8daf0d95 100644 --- a/supervise-organizational-ui/src/api/system/postManage/index.js +++ b/supervise-organizational-ui/src/api/system/postManage/index.js @@ -5,7 +5,7 @@ let tokens = window.sessionStorage.getItem('token'); //获取菜单 分页列表 export function pageList(data) { return request({ - url: '/portal/v1/syspost/listPage', + url: '/v1/syspost/listPage', method: 'POST', data: data, headers: {'Content-Type': 'application/json', @@ -17,7 +17,7 @@ export function pageList(data) { // 查询部门列表 export function orgList(data){ return request({ - url: '/portal/v1/sysorganization/list', + url: '/v1/sysorganization/list', method: 'get', data: data, headers: {'Content-Type': 'application/json', @@ -28,7 +28,7 @@ export function orgList(data){ // 新增 export function savePost(data){ return request({ - url: '/portal/v1/syspost/save', + url: '/v1/syspost/save', method: 'POST', data: data, headers: {'Content-Type': 'application/json', @@ -39,7 +39,7 @@ export function savePost(data){ // 修改 export function putOrgroles(data){ return request({ - url: '/portal/v1/syspost/update/' +data.sid, + url: '/v1/syspost/update/' +data.sid, method: 'POST', data: data, headers: {'Content-Type': 'application/json', @@ -51,7 +51,7 @@ export function putOrgroles(data){ // 删除 export function delOrgroles(data){ return request({ - url: '/portal/v1/syspost/delBySids/' + data.sids, + url: '/v1/syspost/delBySids/' + data.sids, method: 'get', data: data, headers: {'Content-Type': 'application/json', @@ -62,7 +62,7 @@ export function delOrgroles(data){ export function pullDown(data){ return request({ - url: '/portal/v1/dictcommons/typeValues', + url: '/v1/dictcommons/typeValues', method: 'get', params: data }) @@ -71,7 +71,7 @@ export function pullDown(data){ // 查询岗位列表 export function selectList(data){ return request({ - url: '/portal/v1/syspost/selectList', + url: '/v1/syspost/selectList', method: 'get', params: data }) diff --git a/supervise-organizational-ui/src/api/system/userManage/index.js b/supervise-organizational-ui/src/api/system/userManage/index.js index b80505e2..636f535c 100644 --- a/supervise-organizational-ui/src/api/system/userManage/index.js +++ b/supervise-organizational-ui/src/api/system/userManage/index.js @@ -5,8 +5,7 @@ import qs from 'qs' let tokens = window.sessionStorage.getItem('token'); export function userList(data){ return request({ - // url: '/portal/v1/sysuser/listPage', - url: '/portal/v1/sysstaffinfo/listPageNew', + url: '/v1/sysstaffinfo/listPageNew', method: 'post', data: data, headers: {'Content-Type': 'application/json', @@ -17,8 +16,7 @@ export function userList(data){ // 新增 export function userAdd(data){ return request({ - // url: '/portal/v1/sysuser/save', - url: '/portal/v1/sysstaffinfo/saveNew', + url: '/v1/sysstaffinfo/saveNew', method: 'post', data: data, headers: {'Content-Type': 'application/json', @@ -29,8 +27,7 @@ export function userAdd(data){ // 更新 export function userUpdata(data){ return request({ - // url: '/portal/v1/sysuser/update/' +data.sid, - url: '/portal/v1/sysstaffinfo/updateNew/' +data.sid, + url: '/v1/sysstaffinfo/updateNew/' +data.sid, method: 'post', data: data, headers: {'Content-Type': 'application/json', @@ -42,15 +39,14 @@ export function userUpdata(data){ // 删除 export function delUser(sid){ return request({ - // url: '/portal/v1/sysuser/delBySid/' +data.sid, - url: '/portal/v1/sysstaffinfo/delBySid/' +sid, + url: '/v1/sysstaffinfo/delBySid/' +sid, method: 'delete' }) } // 初始化密码 export function initPwd(data){ return request({ - url: '/portal/v1/sysuser/initPwd/' +data.sid, + url: '/v1/sysuser/initPwd/' +data.sid, method: 'post', data: data, headers: {'Content-Type': 'application/json', @@ -61,7 +57,7 @@ export function initPwd(data){ // 根据sid查询一条信息 export function userSingle(data){ return request({ - url: '/portal/v1/sysuser/fetchBySid/' +data.sid, + url: '/v1/sysuser/fetchBySid/' +data.sid, method: 'get', data: data, headers: {'Content-Type': 'application/json', @@ -72,7 +68,7 @@ export function userSingle(data){ // 单条用户的角色列表 export function setRole(data){ return request({ - url: '/portal/v1/sysrole/listAllByUserSid/' +data.sid, + url: '/v1/sysrole/listAllByUserSid/' +data.sid, method: 'post', data: data, headers: {'Content-Type': 'application/json', @@ -83,7 +79,7 @@ export function setRole(data){ // 角色列表 export function saveOrgRole(data){ return request({ - url: '/portal/v1/sysuserrole/update', + url: '/v1/sysuserrole/update', method: 'post', data: data, headers: {'Content-Type': 'application/json', @@ -94,7 +90,7 @@ export function saveOrgRole(data){ // 查询角色列表 export function roleList(data){ return request({ - url: '/portal/v1/sysrole/listAll', + url: '/v1/sysrole/listAll', method: 'post', data: data, headers: {'Content-Type': 'application/json', @@ -105,7 +101,7 @@ export function roleList(data){ // 查询部门列表 export function orgList(data){ return request({ - url: '/portal/v1/sysorganization/list', + url: '/v1/sysorganization/list', method: 'get', data: data, headers: {'Content-Type': 'application/json', @@ -116,7 +112,7 @@ export function orgList(data){ // 查询岗位列表 export function postList(data){ return request({ - url: '/portal/v1/syspost/fetchByOrgSid/'+data.sid, + url: '/v1/syspost/fetchByOrgSid/'+data.sid, method: 'get', data: data, headers: {'Content-Type': 'application/json', @@ -128,7 +124,7 @@ export function postList(data){ // 获取验证码 export function getCode(data){ return request({ - url: '/portal/v1/sysuser/sendMessageCode/'+data.phone, + url: '/v1/sysuser/sendMessageCode/'+data.phone, method: 'get', data: data, headers: {'Content-Type': 'application/json', @@ -140,7 +136,7 @@ export function getCode(data){ // 设置是否可用:isEnable:1可用,0不可用 export function setRoleEnable(data) { return request({ - url: '/portal/v1/sysuser/setIsEnable/' + data.sid + '/' + data.isEnable, + url: '/v1/sysuser/setIsEnable/' + data.sid + '/' + data.isEnable, method: 'post', data: data, headers: { diff --git a/supervise-organizational-ui/src/main.js b/supervise-organizational-ui/src/main.js index 868034f3..023371a5 100644 --- a/supervise-organizational-ui/src/main.js +++ b/supervise-organizational-ui/src/main.js @@ -16,7 +16,12 @@ import eimage from '@/components/E-image/index.vue' import moment from 'moment' import Print from '@/utils/print' // 引入附件的js文件 import request from '@/utils/request' -import { setDefaultOrgPath, setDefaultOrgPathName, setStorage } from './utils/auth.js' +import { + setDefaultOrgPath, + setDefaultOrgPathName, + setStorage, + getStorage +} from './utils/auth.js' import VueAMap from 'vue-amap' Vue.use(ElementUI) @@ -28,7 +33,7 @@ Vue.component('Pagination', Pagination) Vue.component('tab-search', tabsearch) Vue.component('eimage', eimage) Vue.prototype.moment = moment -Vue.filter('dateFormat', function (dateStr, pattern = 'YYYY-MM-DD') { +Vue.filter('dateFormat', function(dateStr, pattern = 'YYYY-MM-DD') { return moment(dateStr).format(pattern) }) Vue.use(Print) // 注册 @@ -36,7 +41,9 @@ Vue.use(Print) // 注册 Vue.use(VueAMap) VueAMap.initAMapApiLoader({ key: 'ccda12d8bffc72e9f1a32c599323a876', // 此处的key,在高德开放平台申请 - plugin: ['AMap.Scale', 'AMap.OverView', 'AMap.ToolBar', 'AMap.MapType', 'AMap.PlaceSearch', 'AMap.Geolocation', 'AMap.Geocoder'], // 此处的插件按需添加 + plugin: ['AMap.Scale', 'AMap.OverView', 'AMap.ToolBar', 'AMap.MapType', 'AMap.PlaceSearch', 'AMap.Geolocation', + 'AMap.Geocoder' + ], // 此处的插件按需添加 v: '1.4.4', uiVersion: '1.0' }) @@ -44,13 +51,15 @@ VueAMap.initAMapApiLoader({ Vue.config.productionTip = false // let token = null +let token = + "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI4NWUwYWY0Yi1lMGJhLTQyM2UtOTIxMS1kYjI2MDg2NTgwM2YiLCJpc3MiOiJXQksiLCJleHAiOjE2OTk0MjI2NzV9.TPTvCN0Xtfmppv9j8669qHJ_6S56AB48qtab2qO-70I" // token = GetQueryString('token') -// if (token) { -// setStorage(token) -// const href = window.location.href -// // href = href.split(`token=${token}`)[0] -// // window.location.href = href.slice(0, href.length - 1) -// } +if (token) { + setStorage(token) + const href = window.location.href + // href = href.split(`token=${token}`)[0] + // window.location.href = href.slice(0, href.length - 1) +} var one = window.location.href.indexOf('&organizationData') + 18 if (parseInt(one) > 18) { @@ -62,78 +71,74 @@ if (parseInt(one) > 18) { setDefaultOrgPathName(obj.defaultOrgPathName) } } + // 获取登录用户信息 function getUserInfo() { - new Vue({ - el: '#app', - router, - store, - render: h => h(App) + console.log('2222') + console.log('token', getStorage()) // for debug + return request({ + url: '/v1/sysuser/loginDetailsNew', + method: 'post', + headers: { + 'Content-Type': 'application/json' + } + }).then(rep => { + const data = rep.data + console.log('xxxxx') + const user = { + roleSid: data.roleSid, + name: data.name, + userName: data.userName, + departmentName: data.departmentName, // 部门名称 + departmentSid: data.departmentSid, // 部门sid + isAdmin: data.isAdmin, + staffSid: data.staffSid, // 业务员sid + userSid: data.sid, + orgSid: data.organizationSid, // 单位sid + Orgname: data.organizationName, + dwjb: data.dwjb, + orgNamePath: data.orgNamePath, // 使用组织全路径名称 + orgSidPath: data.orgSidPath // 使用组织全路径Sid + } + // 结果存入缓存 + window.sessionStorage.setItem('staffSid', user.staffSid) + window.sessionStorage.setItem('userSid', user.userSid) + window.sessionStorage.setItem('Orgname', user.Orgname) + window.sessionStorage.setItem('orgSid', user.orgSid) + window.sessionStorage.setItem('departmentName', user.departmentName) + window.sessionStorage.setItem('name', user.name) + window.sessionStorage.setItem('user', user) + window.sessionStorage.setItem('departmentName', user.departmentName) + window.sessionStorage.setItem('departmentSid', user.departmentSid) + window.sessionStorage.setItem('orgNamePath', user.orgNamePath) + window.sessionStorage.setItem('orgSidPath', user.orgSidPath) + new Vue({ + el: '#app', + router, + store, + render: h => h(App) + }) }) } + getUserInfo() -// // 获取登录用户信息 -// function getUserInfo() { -// return request({ -// baseURL: '/api', -// url: '/portal/v1/sysuser/loginDetails', -// method: 'post', -// headers: { -// 'Content-Type': 'application/json' -// } -// }).then(rep => { -// const data = rep.data -// const user = { -// roleSid: data.roleSid, -// name: data.name, -// userName: data.userName, -// departmentName: data.departmentName, // 部门名称 -// departmentSid: data.departmentSid, // 部门sid -// isAdmin: data.isAdmin, -// staffSid: data.staffSid, // 业务员sid -// userSid: data.sid, -// orgSid: data.organizationSid, // 单位sid -// Orgname: data.organizationName, -// dwjb: data.dwjb, -// orgNamePath: data.orgNamePath, // 使用组织全路径名称 -// orgSidPath: data.orgSidPath // 使用组织全路径Sid -// } -// // 结果存入缓存 -// window.sessionStorage.setItem('staffSid', user.staffSid) -// window.sessionStorage.setItem('userSid', user.userSid) -// window.sessionStorage.setItem('Orgname', user.Orgname) -// window.sessionStorage.setItem('orgSid', user.orgSid) -// window.sessionStorage.setItem('departmentName', user.departmentName) -// window.sessionStorage.setItem('name', user.name) -// window.sessionStorage.setItem('user', user) -// window.sessionStorage.setItem('departmentName', user.departmentName) -// window.sessionStorage.setItem('departmentSid', user.departmentSid) -// window.sessionStorage.setItem('orgNamePath', user.orgNamePath) -// window.sessionStorage.setItem('orgSidPath', user.orgSidPath) -// new Vue({ -// el: '#app', -// router, -// store, -// render: h => h(App) -// }) -// }) -// } -// getUserInfo() -// function GetQueryString(name) { -// var one = window.location.href.indexOf('?token=') + 7 -// if (one < 7) { return null } -// var two = window.location.href.lastIndexOf('&') // + 1 -// var data = window.location.href.substr(one) -// if (two > one) { -// data = window.location.href.slice(one, two) -// console.log('token', data) -// } -// if (data) { -// return data -// } -// return null -// // var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)') -// // var r = window.location.search.substr(1).match(reg) -// // if (r != null) return unescape(r[2]); return null -// } +function GetQueryString(name) { + var one = window.location.href.indexOf('?token=') + 7 + if (one < 7) { + return null + } + var two = window.location.href.lastIndexOf('&') // + 1 + var data = window.location.href.substr(one) + if (two > one) { + data = window.location.href.slice(one, two) + console.log('token', data) + } + if (data) { + return data + } + return null + // var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)') + // var r = window.location.search.substr(1).match(reg) + // if (r != null) return unescape(r[2]); return null +} \ No newline at end of file diff --git a/supervise-organizational-ui/src/views/brank/brankAdd.vue b/supervise-organizational-ui/src/views/brank/brankAdd.vue index 76d9b778..7bf3cd44 100644 --- a/supervise-organizational-ui/src/views/brank/brankAdd.vue +++ b/supervise-organizational-ui/src/views/brank/brankAdd.vue @@ -11,7 +11,7 @@ -