Merge branch 'dev-xiaomi' into 'master'
完善星璇 通过设备编号自动登录的功能 See merge request !2
This commit is contained in:
commit
5f32332fc5
5
src/assets/js/api/autoLogin-xingXuan.js
Normal file
5
src/assets/js/api/autoLogin-xingXuan.js
Normal file
@ -0,0 +1,5 @@
|
||||
import {post} from '../http'
|
||||
// 星璇自动登录
|
||||
export function autoLogin(data) {
|
||||
return post('/xmgl/base/getProjectUserByNumber', data)
|
||||
}
|
||||
@ -11,20 +11,22 @@ import '@/assets/style/button.less'
|
||||
import '@/assets/style/table.less'
|
||||
import '@/assets/style/dialog.less'
|
||||
import '@/assets/style/pagination.less'
|
||||
import { autoLogin } from '@/assets/js/api/autoLogin-xingXuan'
|
||||
|
||||
|
||||
if (COMPANY == 'xingxuan') {
|
||||
// tag: 测试功能
|
||||
if(window.location.href.indexOf('?project_id=') != -1) {
|
||||
const projectId = window.location.href.split('?project_id=')[1].split('&')[0];
|
||||
console.log('projectId: ', projectId);
|
||||
// login()
|
||||
login(projectId)
|
||||
}
|
||||
|
||||
function login() {
|
||||
function login(projectNumber) {
|
||||
// TODO: 对接登录接口
|
||||
|
||||
autoLogin({ projectNumber }).then(res => {
|
||||
if (res.code != 200) return
|
||||
parseLoginData(res.result);
|
||||
})
|
||||
}
|
||||
|
||||
function parseLoginData(data) {
|
||||
|
||||
@ -20,7 +20,7 @@ import axios from 'axios'
|
||||
import { Message } from 'element-ui'
|
||||
import Pagination from '@/components/Pagination'
|
||||
import { resetForm } from '@/util'
|
||||
|
||||
import { autoLogin } from '@/assets/js/api/autoLogin-xingXuan'
|
||||
|
||||
// 全局组件挂载
|
||||
Vue.component('Pagination', Pagination)
|
||||
@ -32,14 +32,15 @@ if (COMPANY == 'xingxuan') {
|
||||
// tag: 测试功能
|
||||
if(window.location.href.indexOf('?project_id=') != -1) {
|
||||
const projectId = window.location.href.split('?project_id=')[1].split('&')[0];
|
||||
console.log('projectId: ', projectId);
|
||||
// login()
|
||||
login(projectId)
|
||||
}
|
||||
|
||||
function login() {
|
||||
function login(projectNumber) {
|
||||
// TODO: 对接登录接口
|
||||
|
||||
autoLogin({ projectNumber }).then(res => {
|
||||
if (res.code != 200) return
|
||||
parseLoginData(res.result);
|
||||
})
|
||||
}
|
||||
|
||||
function parseLoginData(data) {
|
||||
@ -135,6 +136,7 @@ if (COMPANY == 'xingxuan') {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
let url = ''
|
||||
console.log(COMPANY)
|
||||
if(COMPANY == 'longguang'){
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user