Skip to content

F
founder_vue
Commit 59b4ece5 by 张超军
Options

合并

parents 03c4e853 7acfd8b7
Showing with 373 additions and 132 deletions
src/App.vue
<!--
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-11-15 16:23:02
* @LastEditTime: 2021-11-15 21:11:28
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\App.vue
......@@ -14,15 +14,17 @@
<script>
import zoom from "./utils/autosize";
export default {
};
export default {};
</script>
<style lang="scss">
/*每个页面公共css */
@import "assets/styles/main.scss";
#app {
<<<<<<< HEAD
// height: 800px;
=======
>>>>>>> 7acfd8b793b806e0a1fb538c8082af86c450457a
margin: 0;
padding: 0;
box-sizing: border-box;
......@@ -35,6 +37,16 @@ export default {
font-family: "MicrosoftYaHei";
src: url("../src/assets/font/MSYH.ttf") format("truetype");
}
.boxShadow {
position: fixed;
width: 100%;
height: 100%;
top: 0;
left: 0;
// background: url('~@/assets/img/shadow.png') 0 0 / cover;
z-index: -100;
opacity: 0.65;
}
// 滚动条的宽度
/deep/ .el-table__body-wrapper::-webkit-scrollbar {
width: 6px; // 横向滚动条
......
src/components/Confirmation.vue 0 → 100644
<!--
* @Author: your name
* @Date: 2021-11-15 14:15:58
* @LastEditTime: 2021-11-15 14:34:26
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\components\confrim.vue
-->
<template>
<div>
<el-tooltip
class="item"
effect="dark"
:content="content"
placement="top"
:open-delay="500"
>
<slot></slot>
<el-popconfirm
v-if="hintBoo"
placement="top-start"
:hide-icon="true"
confirm-button-text="确认"
@onConfirm="$emit('onConfirm')"
class="icon del"
title="确认要删除该数据吗？该操作无法撤消！"
>
<div slot="reference">
<slot name="reference"></slot>
</div>
</el-popconfirm>
</el-tooltip>
</div>
</template>
<script>
export default {
data() {
return {};
},
props: {
//提示词
content: String,
//是否出现二次选择框
hintBoo: {
type: Boolean,
default: false,
},
},
};
</script>
<style lang="scss">
.el-popconfirm__main {
margin: 23px 24px 17px 24px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
.el-popconfirm__action {
margin-bottom: 24px;
padding-bottom: 24px;
// 交换 确定 和 取消 按钮的位置
.el-button:nth-child(1) {
float: right;
margin-right: 23%;
width: 72px;
height: 32px;
background: #055fe7;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ffffff;
}
.el-button:nth-child(2) {
float: left;
margin-left: 23%;
width: 72px;
height: 32px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #2e3846;
}
}
</style>
<style lang="scss" scoped>
.el-popconfirm__action {
text-align: right;
}
/deep/.el-popconfirm__action {
display: flex;
justify-content: center;
}
</style>
\ No newline at end of file
src/plugins/axios.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-15 10:51:08
* @LastEditTime: 2021-11-15 21:11:46
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\plugins\axios.js
......@@ -74,6 +74,7 @@ _axios.interceptors.response.use(
if (response.data.code === 401) {
localStorage.removeItem("token"); //删除名称为“token”的信息。
localStorage.removeItem("userName"); //删除名称为“userName”的信息。
localStorage.removeItem("userInfor"); //删除名称为“userName”的信息。
this.$router.push("/login1");
}
return response;
......
src/views/Editor/modules/imageEdAJ.scss
......@@ -397,7 +397,7 @@ $directionRotate: var(--directionRotate, 0deg);
}
}
.tui-brush-color-picker {
.tui-brush-color-picker /deep/{
z-index: 100;
background: #ffffff;
padding: 5px;
......
src/views/Home.vue
......@@ -153,6 +153,7 @@ export default {
if (res.data.code === 200) {
localStorage.removeItem("token"); //删除名称为“token”的信息。
localStorage.removeItem("userName"); //删除名称为“userName”的信息。
localStorage.removeItem("userInfor"); //删除名称为“userInfor”的信息。
this.$router.replace("/login1");
this.$message.info("退出成功！");
}
......@@ -188,14 +189,20 @@ export default {
let res = this.paths.filter((item) => {
return item.name != pathName;
});
this.paths = res;
console.log(pathName == this.$route.meta.title);
if (pathName == this.$route.meta.title) {
if (this.paths.length > 0) {
this.$router.push(this.paths[0].path);
this.routePath = this.paths[0].routeName;
debugger;
let routerIndex = this.paths.findIndex((i) => i.routeName == name);
if (routerIndex == 0) {
this.$router.push(this.paths[1].path);
this.routePath = this.paths[1].routeName;
} else {
this.$router.push(this.paths[routerIndex - 1].path);
this.routePath = this.paths[routerIndex - 1].routeName;
}
}
}
this.paths = res;
}
sessionStorage.setItem("crumbs", JSON.stringify(this.paths));
this.setKeepAlive();
......@@ -210,10 +217,9 @@ export default {
cachePageName = "";
}
this.$store.commit("layout/resetcachePageName", cachePageName);
this.$store.commit("layout/delcachePageName", 'ryzwbj');
this.$store.commit("layout/delcachePageName", 'ajzwbj');
console.log(1111222222211111, this.$store.state.layout.cachePageName)
this.$store.commit("layout/delcachePageName", "ryzwbj");
this.$store.commit("layout/delcachePageName", "ajzwbj");
console.log(1111222222211111, this.$store.state.layout.cachePageName);
},
/**
* @description: 调回任务管理
......@@ -298,9 +304,9 @@ export default {
},
watch: {
$route: {
handler (newValue, oldValue) {
console.log(this.routePath, 11111111111)
console.log(newValue, 11111111111)
handler(newValue, oldValue) {
console.log(this.routePath, 11111111111);
console.log(newValue, 11111111111);
this.routePath = newValue.name;
setTimeout(() => {
console.log(1);
......
src/views/Home/Home.vue
......@@ -176,6 +176,7 @@ export default {
if (res.data.code === 200) {
localStorage.removeItem("token"); //删除名称为“token”的信息。
localStorage.removeItem("userName"); //删除名称为“userName”的信息。
localStorage.removeItem("userInfor");
this.$router.replace("/login1");
this.$message.info("退出成功！");
}
......
src/views/SystemManage/PermissionManage.vue
......@@ -171,7 +171,7 @@
<!-- 用户分页-->
<div class="footer">
<span class="count"
>共{{ userSearchParams.page.count }} 条记录 第{{
>共{{ userTableData.length }} 条记录 第{{
userSearchParams.page.page
}}/{{ userTpage }}页</span
>
......@@ -329,7 +329,7 @@
<!-- 用户组分页-->
<div class="footer">
<span class="count"
>共{{ groupSearchParams.page.count }} 条记录 第{{
>共{{ groupTableData.length }} 条记录 第{{
groupSearchParams.page.page
}}/{{ groupTpage }}页</span
>
......
src/views/SystemManage/RoleManage.vue
......@@ -4,7 +4,12 @@
<div class="btns">
<div class="add" @click="add">
<svg-icon
style="width: .8125rem;height: .8125rem;margin-bottom: -0.0625rem;margin-right: .25rem "
style="
width: 0.8125rem;
height: 0.8125rem;
margin-bottom: -0.0625rem;
margin-right: 0.25rem;
"
icon-class="ic_add"
/>
新增角色
......@@ -12,20 +17,30 @@
<div class="img-btn" @click="copy">
<img
src="../../assets/img/role/copy.png"
style="height: .9375rem;width: .9375rem;margin-left:.0625rem ;margin-top: .25rem"
style="
height: 0.9375rem;
width: 0.9375rem;
margin-left: 0.0625rem;
margin-top: 0.25rem;
"
/>
</div>
<div class="img-btn" @click="del(diyRoleItemIndex)">
<img
src="../../assets/img/role/delete.png"
style="height: .9375rem;width: .9375rem;margin-left:.0625rem ;margin-top: .25rem"
style="
height: 0.9375rem;
width: 0.9375rem;
margin-left: 0.0625rem;
margin-top: 0.25rem;
"
/>
</div>
</div>
<div class="default-role">
<div
class="default-role-item"
v-for="(item, index) in defaultRoleBtns"
v-for="item in defaultRoleBtns"
:key="item.id"
:class="{ active: item.id === defaultRoleItemIndex }"
@click="chooseDefaultRoleItem(item)"
......@@ -206,15 +221,15 @@ import "@/icons/ic_add.svg";
export default {
name: "RoleManage",
watch: {
roleMenusSelection: function(val) {
roleMenusSelection: function (val) {
console.info(val);
}
},
},
data() {
return {
// 功能权限标志 数据权限标志
editurl: require("@/assets/img/edit.png"),
funFlag: false,
funFlag: true,
dataFlag: false,
roles: [],
addRoleParams: [],
......@@ -227,13 +242,13 @@ export default {
// 自定义的角色组
diyRoleList: [],
diyRoleItemIndex: -1,
defaultRoleItemIndex: -1
defaultRoleItemIndex: -1,
};
},
methods: {
// 获取权限列表
getPermissionDataLists() {
this.$axios.get("/system/permissions").then(res => {
this.$axios.get("/system/permissions").then((res) => {
if (res.data.length > 0) {
var arr = [];
for (let i = 0; i < res.data.length; i++) {
......@@ -257,9 +272,9 @@ export default {
addrole() {
var role = {
name: "测试角色",
permissionIds: [11, 12]
permissionIds: [11, 12],
};
this.$axios.post("/system/roles", role).then(res => {
this.$axios.post("/system/roles", role).then((res) => {
console.info(res);
});
},
......@@ -276,7 +291,7 @@ export default {
search() {
this.$axios
.get("/system/roles")
.then(res => {
.then((res) => {
if (res.data !== null) {
res.data.forEach((item, index) => {
var arr = [];
......@@ -308,7 +323,7 @@ export default {
this.$message.error("获取角色信息失败！");
}
})
.catch(failResponse => {});
.catch((failResponse) => {});
},
// 删除
del(id) {
......@@ -322,7 +337,7 @@ export default {
name: "自定义" + (this.diyRoleList.length + 1),
flag: false,
code: this.diyRoleList.length,
edit: false
edit: false,
};
this.diyRoleList.push(roleitem);
console.info("新增数据");
......@@ -368,7 +383,7 @@ export default {
this.funFlag = false;
this.dataFlag = true;
console.info("数据权限");
}
},
},
created() {
this.search();
......@@ -377,7 +392,7 @@ export default {
mounted() {
this.defaultRoleBtns[0].flag = true;
this.funFlag = true;
}
},
};
</script>
......
src/views/SystemManage/UserPermission.vue
......@@ -197,7 +197,7 @@ export default {
return {
id: "",
rolename: "",
status: "-1",
status: "1",
userData: {},
funFlag: false,
dataFlag: false,
......@@ -209,7 +209,7 @@ export default {
{ name: "质量检查员", value: 4, flag: false },
{ name: "高级质量检查", value: 5, flag: false },
{ name: "一般管理员", value: 6, flag: false },
{ name: "超级管理员", value: 7, flag: false }
{ name: "超级管理员", value: 7, flag: false },
],
// 角色权限菜单
roleMenus: [
......@@ -221,12 +221,12 @@ export default {
{ name: "质量检查", code: 5, flag: false },
{ name: "高级质量检查", code: 6, flag: false },
{ name: "信息管理", code: 7, flag: false },
{ name: "高级管理", code: 8, flag: false }
{ name: "高级管理", code: 8, flag: false },
],
// 指掌纹采集菜单
printCollectMenus: [
{ name: "指掌纹采集", code: 0, flag: false },
{ name: "非违法人员指纹采集", code: 1, flag: false }
{ name: "非违法人员指纹采集", code: 1, flag: false },
],
// 指掌纹录入菜单
printInputMenus: [
......@@ -234,12 +234,12 @@ export default {
{ name: "FPTX数据导入", code: 1, flag: false },
{ name: "人员指纹扫描", code: 2, flag: false },
{ name: "案件指纹扫描", code: 3, flag: false },
{ name: "笔录指纹", code: 4, flag: false }
{ name: "笔录指纹", code: 4, flag: false },
],
// 档案信息录入菜单
fileInformationInputMenus: [
{ name: "人员文字信息录入", code: 0, flag: false },
{ name: "案件文字信息录入", code: 1, flag: false }
{ name: "案件文字信息录入", code: 1, flag: false },
],
// 综合认定
comprehensiveMenus: [
......@@ -260,7 +260,7 @@ export default {
{ name: "案件指纹编辑", code: 14, flag: false },
{ name: "文字信息修改", code: 15, flag: false },
{ name: "二次打印", code: 16, flag: false },
{ name: "比中信息撤销", code: 17, flag: false }
{ name: "比中信息撤销", code: 17, flag: false },
],
// 高级认定
seniorMenus: [
......@@ -268,19 +268,19 @@ export default {
{ name: "高级案件编辑", code: 2, flag: false },
{ name: "人案控制条码规则", code: 3, flag: false },
{ name: "基本/比中数据上报", code: 4, flag: false },
{ name: "全用户认定权限", code: 5, flag: false }
{ name: "全用户认定权限", code: 5, flag: false },
],
// 质量检查
qualityTestingMenus: [
{ name: "比中信息复核", code: 1, flag: false },
{ name: "协查信息复核", code: 2, flag: false },
{ name: "人案控制条码规则", code: 3, flag: false }
{ name: "人案控制条码规则", code: 3, flag: false },
],
// 高级质量检查
seniorQualityTestingMenus: [
{ name: "比中信息复核", code: 1, flag: false },
{ name: "协查信息复核", code: 2, flag: false },
{ name: "人案控制条码规则", code: 3, flag: false }
{ name: "人案控制条码规则", code: 3, flag: false },
],
// 信息管理
informationManageMenus: [
......@@ -294,7 +294,7 @@ export default {
{ name: "系统操作日志", code: 8, flag: false },
{ name: "复制案件数据", code: 9, flag: false },
{ name: "FPTX数据导出", code: 10, flag: false },
{ name: "批量处理操作", code: 11, flag: false }
{ name: "批量处理操作", code: 11, flag: false },
],
// 高级管理
seniorManageMenus: [
......@@ -312,10 +312,10 @@ export default {
{ name: "查询模块管理", code: 12, flag: false },
{ name: "上报条件设置", code: 13, flag: false },
{ name: "本地重卡反馈", code: 14, flag: false },
{ name: "本地涉案反馈", code: 15, flag: false }
{ name: "本地涉案反馈", code: 15, flag: false },
],
// 保存的角色选项
roleMenusSelection: []
roleMenusSelection: [],
};
},
methods: {
......@@ -333,7 +333,7 @@ export default {
save() {
this.roleMenusSelection = this.roleMenus;
console.info("roleMenusSelection====", this.roleMenusSelection);
}
},
},
mounted() {
this.funFlag = true;
......@@ -344,7 +344,7 @@ export default {
// 获取用户信息
this.$axios
.post("/login/user/queryuserInfo", user)
.then(res => {
.then((res) => {
if (res.data) {
console.info(res.data);
this.userData = res.data.user;
......@@ -352,9 +352,9 @@ export default {
console.info(res.data.user.status);
}
})
.catch(failResponse => {});
.catch((failResponse) => {});
console.info("chuancan", this.$route.params.id);
}
},
};
</script>
......
src/views/SystemManage/scss/dialog_table.scss 0 → 100644
.dialog /deep/ {
.el-form-item__content {
margin-left: 20px !important;
position: relative !important;
.el-input__inner {
padding-right: 30px;
}
}
.el-form-item__error {
left: 100%;
width: 100%;
top: 50%;
box-sizing: border-box;
transform: translateY(-50%);
padding-left: 10px;
padding-top: 0 !important;
}
.is-error {
.el-input {
&::after {
display: block;
content: "";
width: 16px;
height: 16px;
position: absolute;
right: 10px;
top: 50%;
transform: translateY(-50%);
background: url("~@/assets/img/warn.png") 100% 100% / cover;
}
}
.el-input__inner {
border-color: #e6e6e8 !important;
color: #e60012;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
}
}
.el-radio-group {
display: flex;
align-items: center;
> .el-radio {
margin-right: 20px;
}
.el-radio__label {
color: #333333 !important;
}
.qiyong,
.tingyong {
.el-radio__label {
position: relative;
padding-left: 20px !important;
&::before {
content: "";
display: block;
width: 8px;
height: 8px;
background: #055fe7;
border-radius: 50%;
position: absolute;
left: 6px;
top: 50%;
transform: translateY(-50%);
}
}
}
.tingyong {
.el-radio__label {
&::before {
background: #fe0000 !important;
}
}
}
.is-checked {
.el-radio__inner {
border-color: #055fe7;
background: #055fe7;
&::after {
width: 7px;
height: 7px;
}
}
}
}
}
src/views/SystemManage/scss/role.scss
......@@ -81,6 +81,8 @@
//border: saddlebrown 1px solid;
width: 215px;
height: 366px;
box-sizing: border-box;
padding-left: 20px;
//display: flex;
//flex-direction: column;
overflow:scroll;
......
src/views/SystemManage/scss/user.scss
......@@ -228,11 +228,10 @@
.addUserDialog{
box-sizing: border-box;
position: absolute;
top: calc(50% - 457px);
top: 20px;
left: calc(50% - 471.5px);
z-index: 1000;
width: 890px;
height: 860px;
background: #ffffff;
box-shadow: 0px 14px 30px 0px rgba(0, 21, 51, 0.25);
border-radius: 6px;
......
src/views/SystemManage/scss/userpermission.scss
.manage-page {
width: 100%;
padding: 24px;
padding-top: 12px;
font-family: MicrosoftYaHei;
div {
display: inline-block;
}
.header{
.header {
display: flex;
width: 1544px;
height: 54px;
border-radius: 8px;
margin-bottom: 9px;
overflow: hidden;
&.down{
background: #FEF5F6;
&.down {
background: #fef5f6;
}
&.up{
&.up {
background: #f2f7fe;
}
.title{
.title {
width: 96px;
height: 96px;
border-radius: 16px;
......@@ -24,88 +27,88 @@
position: relative;
left: -23px;
top: -17px;
&.down{
background: #FAE1E4;
&.down {
background: #fae1e4;
}
&.up{
background: #DDEBFF;
&.up {
background: #ddebff;
}
.title-status{
.title-status {
position: relative;
top: 28px;
left: 30px;
transform: rotate(-40deg);
.circle-red{
width: 8px;
height: 8px;
background-color:#FE0000;
border-radius: 50%;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
z-index: 100;
}
.circle-blue{
width: 8px;
height: 8px;
background-color:#055FE7;
border-radius: 50%;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
z-index: 100;
}
.circle-red {
width: 8px;
height: 8px;
background-color: #fe0000;
border-radius: 50%;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
z-index: 100;
}
.circle-blue {
width: 8px;
height: 8px;
background-color: #055fe7;
border-radius: 50%;
-moz-border-radius: 50%;
-webkit-border-radius: 50%;
z-index: 100;
}
}
}
.info{
.info {
display: flex;
justify-content: flex-start;
align-items: center;
//border: 1px solid hotpink; width: auto;
.info-item{
padding:0 20px 0 20px;
border-right: 1px solid #E6E6E8;
.info-title{
.info-item {
padding: 0 20px 0 20px;
border-right: 1px solid #e6e6e8;
.info-title {
width: auto;
height: 22px;
font-size: 14px;
color: #999999;
line-height: 22px;
}
.info-value{
.info-value {
width: auto;
height: 22px;
font-size: 14px;
color: #333333;
line-height: 22px;
}
.info-value1{
.info-value1 {
width: auto;
height: 22px;
font-size: 14px;
color: #333333;
line-height: 22px;
.tags{
.tags {
}
}
}
.info-item1{
padding:0 20px 0 20px;
.info-title{
.info-item1 {
padding: 0 20px 0 20px;
.info-title {
width: auto;
height: 22px;
font-size: 14px;
color: #999999;
line-height: 22px;
}
.info-value{
.info-value {
width: auto;
height: 22px;
font-size: 14px;
color: #333333;
line-height: 22px;
.tags{
.tags {
width: 100px;
height: 24px;
background: #FFFFFF;
background: #ffffff;
border-radius: 4px;
text-align: center;
margin-right: 16px;
......@@ -115,7 +118,6 @@
}
}
.main {
width: 100%;
height: 100%;
......@@ -123,8 +125,12 @@
flex-direction: column;
justify-content: center;
.header {
display: flex;
align-items: center;
justify-content: space-between;
height: 55px;
margin: 0 auto;
margin-bottom: 5px;
//margin-bottom: 3px;
.btns {
width: 224px;
......@@ -155,7 +161,6 @@
}
.save {
.btn {
position: absolute;
right: 30px;
top: 150px;
width: 72px;
......@@ -170,20 +175,18 @@
}
.role-info {
width: 100%;
height: 690px;
height: calc(100% - 115px);
background: #ffffff;
box-shadow: 1px 0px 3px 0px rgba(5, 95, 231, 0.3),
-1px 1px 3px 0px rgba(5, 95, 231, 0.24);
box-shadow: 1px 0px 3px 0px rgba(5, 95, 231, 0.3), -1px 1px 3px 0px rgba(5, 95, 231, 0.24);
border-radius: 10px;
display: flex;
flex-direction: row;
.menus {
width: 155px;
height: 100%;
border-right: 1px solid #eeeeee;
.div3 {
width: 100%;
height: 130px;
height: 117px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 12px 20px 0 20px;
......@@ -191,7 +194,7 @@
}
.div2 {
width: 100%;
height: 90px;
height: 85px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 25px 20px 0 25px;
......@@ -199,7 +202,7 @@
}
.div1 {
width: 100%;
height: 70px;
height: 65px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 25px 20px 0 25px;
......@@ -227,31 +230,30 @@
}
.content {
width: 100%;
height: 725px;
.div3 {
width: 100%;
height: 130px;
height: 117px;
border-bottom: 1px solid #eeeeee;
padding-left: 30px;
padding-top: 8px;
.line {
height: 40px;
height: 30px;
}
}
.div2 {
width: 100%;
height: 90px;
height: 85px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 10px 20px 0 25px;
}
.line {
height: 35px;
height: 30px;
}
}
.div1 {
width: 100%;
height: 70px;
height: 65px;
border-bottom: 1px solid #eeeeee;
.el-checkbox {
margin: 25px 20px 0 25px;
......@@ -283,4 +285,4 @@
}
}
}
}
\ No newline at end of file
}
src/views/cxyrd/LTz.scss
......@@ -397,7 +397,7 @@ div {
}
}
}
.tui-brush-color-picker {
.tui-brush-color-picker /deep/{
z-index: 100;
background: #ffffff;
padding: 5px;
......
src/views/login/Login1.vue
......@@ -306,6 +306,7 @@ div {
right: 0;
top: 0;
z-index: 4;
box-sizing: border-box;
/*opacity: 0.5;*/
background: rgba(36, 54, 76, 0.5);
/*background-color: #24364c;*/
......@@ -346,7 +347,7 @@ div {
.login_bottom_layer {
position: relative;
bottom: -200px;
bottom: 0px;
right: 0;
/*margin-bottom: 40px;*/
margin: 0 auto;
......
src/views/login/modules/AccountsLogin.vue
......@@ -7,23 +7,31 @@
placeholder="请输入用户名"
v-model="userInfo.userName"
>
<i slot="prefix" style="display: flex;align-items: center;">
<i slot="prefix" style="display: flex; align-items: center">
<img
style="margin:1.3125rem 1.3125rem 1.3125rem 1.1875rem;width:1rem;height:1rem"
style="
margin: 1.3125rem 1.3125rem 1.3125rem 1.1875rem;
width: 1rem;
height: 1rem;
"
:src="usernameUrl"
alt
/>
</i>
</el-input>
<el-input
class=" width100 margin_top25_bottom10"
class="width100 margin_top25_bottom10"
type="password"
placeholder="请输入密码"
v-model="userInfo.passWord"
>
<i slot="prefix">
<img
style="margin:1.3125rem 1.3125rem 1.3125rem 1.1875rem;width:.9375rem;height:.9375rem"
style="
margin: 1.3125rem 1.3125rem 1.3125rem 1.1875rem;
width: 0.9375rem;
height: 0.9375rem;
"
:src="passwordUrl"
alt
/>
......@@ -34,6 +42,7 @@
type="primary"
ref="userLogin"
@click="login(userInfo)"
:loading="btnLoading"
>登录</el-button
>
</div>
......@@ -56,15 +65,16 @@ export default {
} else {
this.isShow = false;
}
}
}
},
},
},
data() {
return {
btnLoading: false,
isShow: false,
userInfo: { userName: "admin", passWord: "123456" },
usernameUrl: require("../../../assets/img/login/user.png"),
passwordUrl: require("../../../assets/img/login/password.png")
passwordUrl: require("../../../assets/img/login/password.png"),
};
},
methods: {
......@@ -78,6 +88,7 @@ export default {
"passWord",
Encrypt(userinfo.passWord.trim()).toString()
);
me.btnLoading = true;
// let authentication = userinfo;
// let data = new FormData();
//密码加密
......@@ -90,19 +101,21 @@ export default {
// data.passWord = passwordAES;
// todo 登录请求
this.$axios
.post("/login/myLoginForm", authentication)
.post("/login/myLoginForm", authentication, { loading: false })
// .post("/login/myLoginForm?" + qs.stringify(authentication))
.then(res => {
.then((res) => {
me.btnLoading = false;
if (res.data.code === "200") {
localStorage.setItem("token", res.data.token);
localStorage.setItem("userName", res.data.userName);
localStorage.setItem("userInfor", JSON.stringify(res.data.userInfo));
this.$message.success(userinfo.userName + "登录成功！");
this.$router.push("/Home/Home");
} else {
this.$message.error(res.data.message);
}
})
.catch(err => {
.catch((err) => {
// this.$message.error(err.message);
// this.getCaptcha();
console.info(err);
......@@ -140,17 +153,18 @@ export default {
// });
// }
// })
}
},
},
mounted() {
// todo 选中进来清空userInfo数据
}
},
};
</script>
<style scoped>
.login_account {
height: 300px;
margin: 0 auto;
}
.el-input {
......
src/views/login/modules/KeyLogin.vue
<!--
* @Author: your name
* @Date: 2021-11-02 15:41:31
* @LastEditTime: 2021-11-15 16:01:40
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\views\login\modules\KeyLogin.vue
-->
<template>
<div class="width70 middle padding_top55" v-show="isShow">
<div class="width70 middle padding_top55" style="margin: 0 auto" v-show="isShow">
<el-image class="login_key middle" :src="usbUrl"></el-image>
<div class="middle font_color">
警号：<span>{{ keyInfo.number }}</span
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-15 19:18:29
* @LastEditTime: 2021-11-15 21:11:13
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -115,7 +115,7 @@ module.exports = {
}
},
"/system": {
target: "http://192.168.128.109:8765", // 湖南-王
target: "http://192.168.128.104:8765", // 湖南-王
ws: true,
changeOrigin: true,
pathRewrite: {
......
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