Commit ae85b291 authored by zhanglw's avatar zhanglw

登录记忆账户

parent e72fd256
...@@ -12,7 +12,7 @@ export const childMenu = '/api/menus/child'; ...@@ -12,7 +12,7 @@ export const childMenu = '/api/menus/child';
export const creatOrder = '/api/Order/changeOdoStatusByCarNumber'; //点击智能派单生成Order表 export const creatOrder = '/api/Order/changeOdoStatusByCarNumber'; //点击智能派单生成Order表
export const getUserNameByDeviceOAID = '/auth/getUserNameByDeviceOAID'; //根据设备号获取之前登陆过的用户名
export const screenMapSetUpQuery = '/Weilan/list'; //获取区域围栏范围信息 export const screenMapSetUpQuery = '/Weilan/list'; //获取区域围栏范围信息
export const manualSchedulingQuery = '/api/Manmade'; //获取人工调度信息 export const manualSchedulingQuery = '/api/Manmade'; //获取人工调度信息
export const vehicleInformationQuery = '/api/CarPeop'; //获取车辆信息 export const vehicleInformationQuery = '/api/CarPeop'; //获取车辆信息
......
// 项目配置相关 // 项目配置相关
const config = { const config = {
//ganxu //ganxu
BASE_URL: 'http://192.168.3.23:9092', // BASE_URL: 'http://192.168.3.23:9092',
REAL_URL: 'http://192.168.3.23:9092', // REAL_URL: 'http://192.168.3.23:9092',
ws: '192.168.3.23:9092', // ws: '192.168.3.23:9092',
//服务器 //服务器
// BASE_URL: 'http://39.164.225.220:5000', BASE_URL: 'http://39.164.225.220:5000',
// REAL_URL: 'http://39.164.225.220:5000', REAL_URL: 'http://39.164.225.220:5000',
// ws: '39.164.225.220:5000', ws: '39.164.225.220:5000',
TOKEN_KEY: 'token', TOKEN_KEY: 'token',
USER_KEY: 'userInfo', USER_KEY: 'userInfo',
......
...@@ -10,12 +10,18 @@ ...@@ -10,12 +10,18 @@
<div class="userIcon"> <div class="userIcon">
<img src="../assets/imgs/yonghuming.png"/> <img src="../assets/imgs/yonghuming.png"/>
</div> </div>
<el-input <el-autocomplete
v-model="loginForm.username"
id="userInp" id="userInp"
v-model="loginForm.username"
:fetch-suggestions="querySearch"
placeholder="输入用户名" placeholder="输入用户名"
@focus="showkey('username')" ></el-autocomplete>
></el-input> <!-- <el-input-->
<!-- v-model="loginForm.username"-->
<!-- id="userInp"-->
<!-- placeholder="输入用户名"-->
<!-- @focus="showkey('username')"-->
<!-- ></el-input>-->
</el-form-item> </el-form-item>
<el-form-item class="passWordInpBody"> <el-form-item class="passWordInpBody">
<div class="passWordIcon"> <div class="passWordIcon">
...@@ -46,6 +52,7 @@ import { ...@@ -46,6 +52,7 @@ import {
vehicleInformationQuery, vehicleInformationQuery,
personalCenterInforQuery, personalCenterInforQuery,
logOnStatus, logOnStatus,
getUserNameByDeviceOAID,
} from "@/axios/api.js"; } from "@/axios/api.js";
import {encrypt} from "@/utils/rsaEncrypt.js"; import {encrypt} from "@/utils/rsaEncrypt.js";
import Cookies from "js-cookie"; import Cookies from "js-cookie";
...@@ -57,8 +64,8 @@ export default { ...@@ -57,8 +64,8 @@ export default {
data() { data() {
return { return {
loginForm: { loginForm: {
username: "五号电铲司机", username: "",
password: "123456", password: "",
uuid: "", uuid: "",
}, },
loading: false, loading: false,
...@@ -71,6 +78,9 @@ export default { ...@@ -71,6 +78,9 @@ export default {
bindingStatus: false, bindingStatus: false,
//绑定的车牌号 //绑定的车牌号
bindingCar: "", bindingCar: "",
userNameList: [
{value:'xxxxx'}, {value:'eeeeee'}
]
}; };
}, },
created() { created() {
...@@ -96,6 +106,14 @@ export default { ...@@ -96,6 +106,14 @@ export default {
// Keyboard // Keyboard
}, },
methods: { methods: {
querySearch(queryString, cb) {
let userNameList = this.userNameList;
let results = queryString ? userNameList.filter((restaurant) => {
return (restaurant.value.indexOf(queryString) === 0);
}) : userNameList;
// 调用 callback 返回建议列表的数据
cb(results);
},
//app获取设备号方法 //app获取设备号方法
appGetDeviceId() { appGetDeviceId() {
let that = this; let that = this;
...@@ -125,6 +143,11 @@ export default { ...@@ -125,6 +143,11 @@ export default {
that.bindingStatus = false; that.bindingStatus = false;
}); });
} }
httpGet(getUserNameByDeviceOAID, {
deviceOAID: that.deviceOAID,
}).then((res) => {
that.userNameList = res;
});
} }
); );
} }
...@@ -295,6 +318,7 @@ export default { ...@@ -295,6 +318,7 @@ export default {
username: this.loginForm.username, username: this.loginForm.username,
password: this.loginForm.password, password: this.loginForm.password,
uuid: this.loginForm.uuid, uuid: this.loginForm.uuid,
deviceOAID: this.deviceOAID
}; };
if (user.password !== this.cookiePass) { if (user.password !== this.cookiePass) {
user.password = encrypt(user.password); user.password = encrypt(user.password);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment