diff --git a/src/setting.js b/src/setting.js index 82aca0a..db63277 100644 --- a/src/setting.js +++ b/src/setting.js @@ -3,29 +3,17 @@ * */ const url = location.host; const isDev = process.env.NODE_ENV === 'development'; // 开发环境 -const isTest = url.includes('39.108.250.202'); //测试服 const isPro = url.includes('www.huorantech.cn'); //正式服 -let jumpPath = ""; -let host = ""; +let jumpPath = `${location.origin}/judgmentPoint` +let host = `${location.origin}:9000/` if (isDev) { - // jumpPath = "http://www.huorantech.cn/judgmentPoint/"; - // jumpPath = "http://39.108.250.202/judgmentPoint/"; jumpPath = "http://192.168.31.125:8087/"; // 本地调试-需要启动本地判分点系统 - // host = "http://www.huorantech.cn:9000";//线上 - host = "http://39.108.250.202:9000/";//测试 - // host = 'http://192.168.31.151:9000/'// 榕 + // host = 'http://39.108.250.202:9000/' + host = 'http://192.168.31.151:9000/'// 榕 // host = 'http://192.168.31.137:9000/'// 赓 -} else if (isTest) { - // jumpPath = "http://124.71.12.62/judgmentPoint/"; - jumpPath = "http://39.108.250.202/judgmentPoint/"; - host = "http://39.108.250.202:9000/"; - // host = "http://124.71.12.62:9000";//线上 } else if (isPro) { - // jumpPath = "http://124.71.12.62/judgmentPoint/"; - // host = "http://124.71.12.62:9000";//线上 jumpPath = "http://www.huorantech.cn/judgmentPoint/"; - host = "http://www.huorantech.cn:9000/";//线上 } diff --git a/src/views/setting/index.vue b/src/views/setting/index.vue index 8db498b..308fea4 100644 --- a/src/views/setting/index.vue +++ b/src/views/setting/index.vue @@ -30,7 +30,7 @@ import util from '@/libs/util' export default { data() { return { - token: util.local.get(Setting.tokenKey), + token: sessionStorage.getItem('token'), typeList: [ { index: '1', diff --git a/src/views/user/AddUser.vue b/src/views/user/AddUser.vue index e2d2bf3..72aa49d 100644 --- a/src/views/user/AddUser.vue +++ b/src/views/user/AddUser.vue @@ -632,15 +632,15 @@ export default { methods: { getdata() { this.$get(this.api.queryUserInfoDetails,{ userId: this.userId }).then(res => { - let userInfo = res.result.hrUserInfo - this.form.accountId = userInfo.userId - this.originAccount = res.result.userAccountList[0].account - this.archivesList = res.result.personalFileList - this.form.documentType = '居民身份证' - this.form.countries = res.result.hrUserInfo.countries - this.form.cityName = res.result.hrUserInfo.cityName - this.form.schoolName = res.result.hrUserInfo.schoolName - this.form.provinceName = res.result.hrUserInfo.provinceName + const { result } = res + const { hrUserInfo } = result + let { userAccountList } = result + if (userAccountList.length) userAccountList = userAccountList[0] + const { platformList } = result + let form = this.form + form = Object.assign(form, hrUserInfo, userAccountList) + this.originAccount = userAccountList.account + this.archivesList = result.personalFileList this.$nextTick(() => { if(this.form.provinceId){ @@ -680,7 +680,6 @@ export default { }); // 平台系统 - let platformList = res.result.platformList platformList.map(e =>{ this.regionOption.map((r,index) =>{ if(r.regionId == e.platformId){