Commit 53bcd3d5 by maxiaohan

登录和退出 修改 localStorage

parent 1f6d64c3
...@@ -25,7 +25,7 @@ let config = { ...@@ -25,7 +25,7 @@ let config = {
// withCredentials: true, // Check cross-site Access-Control // withCredentials: true, // Check cross-site Access-Control
// Authorization: sessionStorage.getItem("token") || "" // Authorization: sessionStorage.getItem("token") || ""
headers: { headers: {
Authorization: sessionStorage.getItem("token") || "" Authorization: localStorage.getItem("token") || ""
} }
}; };
......
...@@ -189,8 +189,8 @@ export default { ...@@ -189,8 +189,8 @@ export default {
// this.$router.replace('/login1') // this.$router.replace('/login1')
this.$axios.post("/login/login/userLogout").then(res => { this.$axios.post("/login/login/userLogout").then(res => {
if (res.data.code === 200) { if (res.data.code === 200) {
sessionStorage.removeItem("token"); //删除名称为“token”的信息。 localStorage.removeItem("token"); //删除名称为“token”的信息。
sessionStorage.removeItem("userName"); //删除名称为“userName”的信息。 localStorage.removeItem("userName"); //删除名称为“userName”的信息。
this.$router.replace("/login1"); this.$router.replace("/login1");
this.$message.info("退出成功!"); this.$message.info("退出成功!");
} }
......
...@@ -123,8 +123,8 @@ export default { ...@@ -123,8 +123,8 @@ export default {
logout() { logout() {
this.$axios.post("/login/login/userLogout").then(res => { this.$axios.post("/login/login/userLogout").then(res => {
if (res.data.code === 200) { if (res.data.code === 200) {
sessionStorage.removeItem("token"); //删除名称为“token”的信息。 localStorage.removeItem("token"); //删除名称为“token”的信息。
sessionStorage.removeItem("userName"); //删除名称为“userName”的信息。 localStorage.removeItem("userName"); //删除名称为“userName”的信息。
this.$router.replace("/login1"); this.$router.replace("/login1");
this.$message.info("退出成功!"); this.$message.info("退出成功!");
} }
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<div class="label">用户名:</div> <div class="label">用户名:</div>
<el-input <el-input
class="search-info" class="search-info"
v-model="username" v-model="searchParams.username"
placeholder="请输入用户名" placeholder="请输入用户名"
></el-input> ></el-input>
</div> </div>
...@@ -16,75 +16,70 @@ ...@@ -16,75 +16,70 @@
<div class="label">姓名:</div> <div class="label">姓名:</div>
<el-select <el-select
class="search-info" class="search-info"
v-model="value" v-model="searchParams.truename"
placeholder="请输入并选择" placeholder="请输入并选择"
> >
<el-option <!-- <el-option-->
v-for="item in options" <!-- -->
:key="item.value" <!-- >-->
:label="item.label" <!-- </el-option>-->
:value="item.value"
>
</el-option>
</el-select> </el-select>
</div> </div>
<div class="search-item"> <div class="search-item">
<div class="label">用户组:</div> <div class="label">用户组:</div>
<el-select <el-select
class="search-info" class="search-info"
v-model="value" v-model="searchParams.usergroup"
placeholder="请输入并选择" placeholder="请输入并选择"
> >
<el-option <!-- <el-option-->
v-for="item in options" <!-- -->
:key="item.value" <!-- >-->
:label="item.label" <!-- </el-option>-->
:value="item.value"
>
</el-option>
</el-select> </el-select>
</div> </div>
<div class="search-item"> <div class="search-item">
<div class="label">单位代码:</div> <div class="label">单位代码:</div>
<el-select <el-select
class="search-info" class="search-info"
v-model="value" v-model="searchParams.unitcode"
placeholder="请输入并选择" placeholder="请输入并选择"
> >
<el-option <!-- <el-option-->
v-for="item in options" <!-- v-for="item in options"-->
:key="item.value" <!-- :key="item.value"-->
:label="item.label" <!-- :label="item.label"-->
:value="item.value" <!-- :value="item.value"-->
> <!-- >-->
</el-option> <!-- </el-option>-->
</el-select> </el-select>
</div> </div>
<div class="search-item"> <div class="search-item">
<div class="label">角色:</div> <div class="label">角色:</div>
<el-select <el-select
class="search-info" class="search-info"
v-model="value" v-model="searchParams.role"
placeholder="请输入并选择" placeholder="请输入并选择"
> >
<el-option <el-option label="1" value="1"> </el-option>
v-for="item in options" <!-- <el-option-->
:key="item.value" <!-- v-for="item in options"-->
:label="item.label" <!-- :key="item.value"-->
:value="item.value" <!-- :label="item.label"-->
> <!-- :value="item.value"-->
</el-option> <!-- >-->
<!-- </el-option>-->
</el-select> </el-select>
</div> </div>
<div class="search-item"> <div class="search-item">
<div class="label">权限:</div> <div class="label">权限:</div>
<el-input <el-input
class="search-info" class="search-info"
v-model="auth" v-model="searchParams.auth"
placeholder="请输入权限" placeholder="请输入权限"
></el-input> ></el-input>
</div> </div>
<div class="btn">筛选用户</div> <div class="btn" @click="search">筛选用户</div>
</div> </div>
<div class="operation"> <div class="operation">
<div class="btn1" @click="batch">批量操作</div> <div class="btn1" @click="batch">批量操作</div>
...@@ -144,24 +139,25 @@ ...@@ -144,24 +139,25 @@
</el-table> </el-table>
</div> </div>
<div class="footer"> <div class="footer">
<span class="count" <!-- <span class="count"-->
>{{ reqParam.page.total }} 条记录 第{{ reqParam.page.currPage }}/{{ <!-- >共{{ searchParams.page.total }} 条记录 第{{-->
Tpage <!-- searchParams.page.page-->
}}</span <!-- }}/{{ Tpage }}</span-->
> <!-- >-->
<div class="page"> <div class="page">
<el-pagination <!-- :current-page="searchParams.page.currPage"-->
class="paging"
background <!-- <el-pagination-->
@size-change="handleSizeChange" <!-- class="paging"-->
@current-change="handleCurrPageChange" <!-- background-->
:current-page="reqParam.page.currPage" <!-- @size-change="handleSizeChange"-->
:page-sizes="[10, 20, 50, 100]" <!-- @current-change="handleCurrPageChange"-->
:page-size="reqParam.page.pageSize" <!-- :page-sizes="[10, 20, 50, 100]"-->
layout="prev, pager, next" <!-- :page-size="searchParams.page.pageSize"-->
:total="reqParam.page.total" <!-- layout="prev, pager, next"-->
> <!-- :total="searchParams.page.total"-->
</el-pagination> <!-- >-->
<!-- </el-pagination>-->
</div> </div>
</div> </div>
<!-- 新增弹窗--> <!-- 新增弹窗-->
...@@ -180,73 +176,107 @@ ...@@ -180,73 +176,107 @@
<div class="info"> <div class="info">
<div class="info-item"> <div class="info-item">
<div class="label">*用户名:</div> <div class="label">*用户名:</div>
<el-input class="input-info" placeholder="请输入用户名"></el-input> <el-input
class="input-info"
placeholder="请输入用户名"
v-model="addParams.username"
></el-input>
</div> </div>
<div class="info-item"> <div class="info-item">
<div class="label">姓名:</div> <div class="label">姓名:</div>
<el-input class="input-info" placeholder="请输入姓名"></el-input> <el-input
class="input-info"
placeholder="请输入姓名"
v-model="addParams.truename"
></el-input>
</div> </div>
<div class="info-item"> <div class="info-item">
<div class="label">所属单位代码:</div> <div class="label">所属单位代码:</div>
<el-select class="input-info" placeholder="请选择所属单位代码"> <el-input
<el-option class="input-info"
v-for="item in options" placeholder="请输入姓名"
:key="item.value" v-model="addParams.unitcode"
:label="item.label" ></el-input>
:value="item.value"
> <!-- <el-select class="input-info" placeholder="请选择所属单位代码">-->
</el-option> <!-- <el-option-->
</el-select> <!-- v-for="item in options"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- >-->
<!-- </el-option>-->
<!-- </el-select>-->
</div> </div>
<div class="info-item"> <div class="info-item">
<div class="label">所属单位:</div> <div class="label">所属单位:</div>
<el-input class="input-info" placeholder="请输入所属单位"></el-input> <el-input
class="input-info"
placeholder="请输入所属单位"
v-model="addParams.unitname"
></el-input>
</div> </div>
<div class="info-item"> <div class="info-item">
<div class="label">用户警号:</div> <div class="label">用户警号:</div>
<el-input class="input-info" placeholder="请输入用户警号"></el-input> <el-input
class="input-info"
placeholder="请输入用户警号"
v-model="addParams.policemanid"
></el-input>
</div> </div>
<div class="info-item"> <div class="info-item">
<div class="label">密码:</div> <div class="label">密码:</div>
<el-input class="input-info" placeholder="请输入密码"></el-input> <el-input
class="input-info"
placeholder="请输入密码"
v-model="addParams.password"
></el-input>
</div> </div>
<div class="info-item"> <div class="info-item">
<div class="label">确认密码:</div> <div class="label">确认密码:</div>
<el-input class="input-info" placeholder="请确认密码"></el-input> <el-input
class="input-info"
placeholder="请确认密码"
v-model="addParams.okpassword"
></el-input>
</div> </div>
<div class="info-item"> <div class="info-item">
<div class="label">手机号码:</div> <div class="label">手机号码:</div>
<el-input class="input-info" placeholder="请输入手机号码"></el-input> <el-input
class="input-info"
placeholder="请输入手机号码"
v-model="addParams.telphone"
></el-input>
</div> </div>
<div class="info-item"> <div class="info-item">
<div class="label">加入用户组:</div> <div class="label">加入用户组:</div>
<el-select class="input-info" placeholder="请选择用户组"> <!-- <el-select class="input-info" placeholder="请选择用户组">-->
<el-option <!-- &lt;!&ndash; <el-option&ndash;&gt;-->
v-for="item in options" <!-- &lt;!&ndash; v-for="item in options"&ndash;&gt;-->
:key="item.value" <!-- &lt;!&ndash; :key="item.value"&ndash;&gt;-->
:label="item.label" <!-- &lt;!&ndash; :label="item.label"&ndash;&gt;-->
:value="item.value" <!-- &lt;!&ndash; :value="item.value"&ndash;&gt;-->
> <!-- &lt;!&ndash; >&ndash;&gt;-->
</el-option> <!-- &lt;!&ndash; </el-option>&ndash;&gt;-->
</el-select> <!-- </el-select>-->
</div> </div>
<div class="info-item"> <div class="info-item">
<div class="label">加入角色:</div> <div class="label">加入角色:</div>
<el-select class="input-info" placeholder="请选择角色"> <!-- <el-select class="input-info" placeholder="请选择角色">-->
<el-option <!-- &lt;!&ndash; <el-option&ndash;&gt;-->
v-for="item in options" <!-- &lt;!&ndash; v-for="item in options"&ndash;&gt;-->
:key="item.value" <!-- &lt;!&ndash; :key="item.value"&ndash;&gt;-->
:label="item.label" <!-- &lt;!&ndash; :label="item.label"&ndash;&gt;-->
:value="item.value" <!-- &lt;!&ndash; :value="item.value"&ndash;&gt;-->
> <!-- &lt;!&ndash; >&ndash;&gt;-->
</el-option> <!-- &lt;!&ndash; </el-option>&ndash;&gt;-->
</el-select> <!-- </el-select>-->
</div> </div>
<div class="info-item"> <div class="info-item">
<div class="label">启用状态:</div> <div class="label">启用状态:</div>
<el-radio-group <el-radio-group
class="radio-info" class="radio-info"
v-model="status" v-model="user.status"
@change="searchStyle" @change="searchStyle"
> >
<el-radio :label="0">启用</el-radio> <el-radio :label="0">启用</el-radio>
...@@ -268,20 +298,75 @@ export default { ...@@ -268,20 +298,75 @@ export default {
name: "UserManage", name: "UserManage",
data() { data() {
return { return {
user: {
userId: "", // 主见
username: "", //用户名
password: "", //密码
truename: "", //用户真实姓名
policemanid: "", //警号
identitycard: "", //身份证号
sex: "", //性别
birthday: "", //出生日期
telphone: "", //用户电话
unitcode: "", //单位代码
unitname: "", //单位名称
remark: "",
groupid_coll: "", //权限组id
groupid_list: "",
groupid_edit: "",
groupid_admin: "",
grade: "",
ip: "",
/**角色的id合集*/
roleId: "",
/**角色的name合集*/
roleName: "",
status: "", //状态:1正常 0禁用
lrr: "",
lrsj: "",
lrdwdm: "",
lrdwmc: "",
gxr: "",
gxsj: "",
gxdwdm: "",
gxdwmc: "",
scbz: "",
page: "", //页码
total: "" //当页总条数
},
// 搜索对象
searchParams: {
username: "", username: "",
userdesc: "", truename: "",
usergroup: "",
unitcode: "", unitcode: "",
role: "",
auth: "", auth: "",
status: "",
searchOptions: "",
reqParam: {
userdesc: "",
page: { page: {
total: 0, page: 1,
pageSize: 10, total: 10
currPage: 1
} }
}, },
// 新增对象
addParams: {
username: "", //用户名
password: "", //密码
okpassword: "", // 确认密码
truename: "", //用户真实姓名
policemanid: "", //警号
telphone: "", //用户电话
unitcode: "", //单位代码
unitname: "" //单位名称
},
searchOptions: "",
// reqParam: {
// userdesc: "",
// page: {
// total: 0,
// pageSize: 10,
// currPage: 1
// }
// },
// 选中数据 // 选中数据
multipleSelection: [], multipleSelection: [],
isShowTip: false, //批量操作提示 isShowTip: false, //批量操作提示
...@@ -290,28 +375,7 @@ export default { ...@@ -290,28 +375,7 @@ export default {
isShowAddUserDialogBg: false, isShowAddUserDialogBg: false,
// 是否展示认定完成确认框 // 是否展示认定完成确认框
isShowAddUserDialog: false, isShowAddUserDialog: false,
tableData: [ tableData: [],
{
date: "2016-05-02",
name: "王小虎",
address: "上海市普陀区金沙江路 1518 弄"
},
{
date: "2016-05-04",
name: "王小虎",
address: "上海市普陀区金沙江路 1517 弄"
},
{
date: "2016-05-01",
name: "王小虎",
address: "上海市普陀区金沙江路 1519 弄"
},
{
date: "2016-05-03",
name: "王小虎",
address: "上海市普陀区金沙江路 1516 弄"
}
],
options: [ options: [
{ {
value: "选项1", value: "选项1",
...@@ -333,15 +397,14 @@ export default { ...@@ -333,15 +397,14 @@ export default {
value: "选项5", value: "选项5",
label: "北京烤鸭" label: "北京烤鸭"
} }
], ]
value: ""
}; };
}, },
computed: { computed: {
// 计算总页数 // 计算总页数
Tpage() { Tpage() {
return ( return (
Math.floor(this.reqParam.page.total / this.reqParam.page.pageSize) + 1 Math.floor(this.searchParams.page.total / this.search.page.page) + 1
); );
} }
}, },
...@@ -349,6 +412,28 @@ export default { ...@@ -349,6 +412,28 @@ export default {
clear() { clear() {
console.info("清空方法"); console.info("清空方法");
}, },
search() {
console.info("搜索用户列表");
var user = new URLSearchParams();
user.append("username", this.searchParams.username);
user.append("truename", this.searchParams.truename);
// user.append("usergroup", this.searchParams.usergroup); // 警号
user.append("unitcode", this.searchParams.unitcode);
user.append("role", this.searchParams.role);
user.append("page", this.searchParams.page.page);
user.append("total", this.searchParams.page.total);
this.$axios
.post("/login/user/queryUserList", user)
.then(res => {
console.log(res);
})
.catch(failResponse => {});
// 做查询时 user.append("page","1");
// user.append("total","20");这两个参数必填
// 修改删除时,userid必填
},
// 搜索方式 // 搜索方式
searchStyle(val) { searchStyle(val) {
// console.log(val, '搜索方式') // console.log(val, '搜索方式')
...@@ -369,7 +454,7 @@ export default { ...@@ -369,7 +454,7 @@ export default {
// 选择数据 // 选择数据
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = val; this.multipleSelection = val;
console.info(this.multipleSelection); console.info("选择的数据", this.multipleSelection);
if (this.multipleSelection.length) { if (this.multipleSelection.length) {
this.isShowTip = true; this.isShowTip = true;
} else { } else {
...@@ -381,15 +466,15 @@ export default { ...@@ -381,15 +466,15 @@ export default {
this.isSelected = !this.isSelected; this.isSelected = !this.isSelected;
}, },
// 当期页发生变化 // 当期页发生变化
handleCurrPageChange: function(val) { // handleCurrPageChange: function(val) {
this.reqParam.page.currPage = val; // this.searchParams.page.total = val;
// this.search(); // // this.search();
}, // },
// 每页展示数量发生变化 // 每页展示数量发生变化
handleSizeChange: function(val) { // handleSizeChange: function(val) {
this.reqParam.page.pageSize = val; // this.reqParam.page.pageSize = val;
// this.search(); // // this.search();
}, // },
// 打开新增弹窗 // 打开新增弹窗
open() { open() {
this.isShowAddUserDialog = true; this.isShowAddUserDialog = true;
...@@ -404,8 +489,32 @@ export default { ...@@ -404,8 +489,32 @@ export default {
add() { add() {
this.isShowAddUserDialog = false; this.isShowAddUserDialog = false;
this.isShowAddUserDialogBg = false; this.isShowAddUserDialogBg = false;
var user = new URLSearchParams();
user.append("username", this.addParams.username);
user.append("username", this.addParams.truename);
user.append("username", this.addParams.unitname);
user.append("username", this.addParams.unitcode);
user.append("truename", this.addParams.password);
// user.append("truename", this.addParams.okpassword);
user.append("truename", this.addParams.policemanid);
user.append("truename", this.addParams.telphone);
// user.append("usergroup", this.searchParams.usergroup); // 警号
user.append("role", this.addParams.role);
// user.append("page", this.addParams.page.page);
// user.append("total", this.addParams.page.total);
console.info(this.addParams);
console.info(user);
this.$axios
.post("/login/user/saveuser", user)
.then(res => {
console.log(res);
})
.catch(failResponse => {});
this.$message.success("新增成功!"); this.$message.success("新增成功!");
} }
},
mounted() {
this.search();
} }
}; };
</script> </script>
......
...@@ -87,8 +87,8 @@ export default { ...@@ -87,8 +87,8 @@ export default {
.post("/login/myLoginForm?" + qs.stringify(authentication)) .post("/login/myLoginForm?" + qs.stringify(authentication))
.then(res => { .then(res => {
if (res.data.code === "200") { if (res.data.code === "200") {
sessionStorage.setItem("token", res.data.token); localStorage.setItem("token", res.data.token);
sessionStorage.setItem("userName", res.data.userName); localStorage.setItem("userName", res.data.userName);
this.$message.success(userinfo.userName + "登录成功!"); this.$message.success(userinfo.userName + "登录成功!");
this.$router.push("/Home/Home"); this.$router.push("/Home/Home");
} else { } else {
......
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