longlong/xw_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

接入系统公司、部门、角色接口

Browse Source
This commit is contained in:
龙运模
2024-07-06 17:00:41 +08:00
parent 0bb1d10f4b
commit 6e01d7c891
37 changed files with 1336 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/login/components/passwordForm.vue
-1
View File
@@ -72,7 +72,6 @@
this.$store.commit("SET_LOGIN_NAME", user.data.user.name);
} else {
this.islogin = false
this.$message.warning(user.message)
return false
}
//获取菜单
src/views/login/components/phoneForm.vue
+66 -23
View File
@@ -1,16 +1,16 @@
<template>
<el-form ref="loginForm" :model="form" :rules="rules" label-width="0" size="large" @keyup.enter="login">
<el-form-item prop="phone">
<el-input v-model="form.phone" prefix-icon="el-icon-iphone" clearable :placeholder="$t('login.mobilePlaceholder')"></el-input>
<el-form-item prop="mobile">
<el-input v-model="form.mobile" prefix-icon="el-icon-iphone" clearable :placeholder="$t('login.mobilePlaceholder')"></el-input>
</el-form-item>
<el-form-item prop="yzm" style="margin-bottom: 35px;">
<el-form-item prop="verify_code" style="margin-bottom: 35px;">
<div class="login-msg-yzm">
<el-input v-model="form.yzm" prefix-icon="el-icon-unlock" clearable :placeholder="$t('login.smsPlaceholder')"></el-input>
<el-input v-model="form.verify_code" prefix-icon="el-icon-unlock" clearable :placeholder="$t('login.smsPlaceholder')"></el-input>
<el-button @click="getYzm" :disabled="disabled">{{this.$t('login.smsGet')}}<span v-if="disabled"> ({{time}})</span></el-button>
</div>
</el-form-item>
<el-form-item>
<el-button type="primary" style="width: 100%;" :loading="islogin" @click="login">{{ $t('login.signIn') }}</el-button>
<el-button type="primary" style="width: 100%;" :loading="isLogin" @click="login">{{ $t('login.signIn') }}</el-button>
</el-form-item>
<div class="login-reg">
{{$t('login.noAccount')}} <router-link to="/user_register">{{$t('login.createAccount')}}</router-link>
@@ -23,20 +23,20 @@
data() {
return {
form: {
phone: "",
yzm: "",
mobile: "",
verify_code: "",
},
rules: {
phone: [
mobile: [
{required: true, message: this.$t('login.mobileError')}
],
yzm: [
verify_code: [
{required: true, message: this.$t('login.smsError')}
]
},
disabled: false,
time: 0,
islogin: false,
isLogin: false,
}
},
mounted() {
@@ -44,24 +44,67 @@
},
methods: {
async getYzm(){
var validate = await this.$refs.loginForm.validateField("phone").catch(()=>{})
const validate = await this.$refs.loginForm.validateField("mobile").catch(() => {});
if(!validate){ return false }
this.$message.success(this.$t('login.smsSent'))
this.disabled = true
this.time = 60
var t = setInterval(() => {
this.time -= 1
if(this.time < 1){
clearInterval(t)
this.disabled = false
this.time = 0
}
},1000)
const res = await this.$API.user.verifyCode.post({mobile: this.form.mobile});
if(res.code == 200){
this.$message.success(this.$t('login.smsSent'))
this.disabled = true
this.time = 60
const t = setInterval(() => {
this.time -= 1
if (this.time < 1) {
clearInterval(t)
this.disabled = false
this.time = 0
}
}, 1000);
}
},
async login(){
var validate = await this.$refs.loginForm.validate().catch(()=>{})
const validate = await this.$refs.loginForm.validate().catch(() => {});
if(!validate){ return false }
//获取token
const user = await this.$API.auth.phoneLogin.post(this.form);
if (user.code == 200) {
this.$TOOL.cookie.set("TOKEN", user.data.token, {
expires: this.form.autologin ? 24 * 60 * 60 : 0
})
this.$TOOL.data.set("USER_INFO", user.data.user)
if(user.data.user.avatar!=''){
this.$store.commit("SET_LOGIN_AVATAR", user.data.user.avatar);
}
this.$store.commit("SET_LOGIN_NAME", user.data.user.name);
} else {
this.islogin = false
return false
}
//获取菜单
const menu = await this.$API.system.menu.myMenus.get();
if (menu.code == 200) {
if (menu.data.menu.length == 0) {
this.islogin = false
await this.$alert("当前用户无任何菜单权限，请联系系统管理员", "无权限访问", {
type: 'error',
center: true
})
return false
}
this.$TOOL.data.set("MENU", menu.data.menu)
this.$TOOL.data.set("PERMISSIONS", menu.data.permissions)
this.$TOOL.data.set("DASHBOARDGRID", menu.data.dashboardGrid)
} else {
this.islogin = false
this.$message.warning(menu.message)
return false
}
this.$router.replace({
path: '/'
})
this.islogin = false
}
}
}
src/views/order/workOrder.vue
+8 -8
View File
@@ -1,14 +1,14 @@
<template>
<el-container class="mainBox mainBoxHeaderNoBorder">
<el-header>
<div class="left-panel">
<el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新增</el-button>
<el-button :size="size" plain icon="el-icon-plus" @click="permission">上传</el-button>
</div>
<div class="right-panel">
<el-header>
<div class="left-panel">
<el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新增</el-button>
<el-button :size="size" plain icon="el-icon-plus" @click="permission">上传</el-button>
</div>
<div class="right-panel">
</div>
</el-header>
</div>
</el-header>
<el-main class="nopadding">
<div class="searchMain searchMainNoTop">
<div class="searchItem">
src/views/setting/company/index.vue
+186 -10
View File
@@ -1,24 +1,200 @@
<template>
<view>2112</view>
<el-container class="mainBox mainHeaderNoBorderPadding">
<el-header>
<div class="left-panel">
<el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新增公司</el-button>
<el-button type="primary" :size="size" plain>批量导入</el-button>
</div>
<div class="right-panel">
</div>
</el-header>
<el-main class="nopadding">
<div class="searchMain searchMainNoTop">
<div class="searchItem">
<label class="name">开通日期</label>
<el-date-picker class="input" type="daterange" :size="size" v-model="params.activation_date" start-placeholder="开始日期" end-placeholder="结束日期" clearable></el-date-picker>
</div>
<div class="searchItem">
<label class="name">公司名称</label>
<el-select class="input" :size="size" v-model="params.full_name" @visible-change="getCompanyList" placeholder="请选择公司名称" filterable clearable>
<el-option v-for="item in setMap.full_name" :key="item" :label="item.full_name" :value="item.id"></el-option>
</el-select>
</div>
<div class="searchItem">
<label class="name">状态</label>
<el-select class="input" :size="size" v-model="params.active_status" @visible-change="getStatusList" placeholder="请选择状态" filterable clearable>
<el-option v-for="item in setMap.active_status" :key="item" :label="item.label" :value="item.active_status"></el-option>
</el-select>
</div>
<div class="searchItem searchBtn">
<el-button :size="size" type="primary" icon="el-icon-search" @click="upSearch">查询</el-button>
<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
</div>
</div>
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe :size="size" @selection-change="selectionChange">
<el-table-column type="selection" align="center" width="40"></el-table-column>
<el-table-column type="index" align="center" label="序号" width="50"></el-table-column>
<template #logo="scope">
<el-image class="logoCell" :src="scope.row.logo"></el-image>
</template>
<template #active_status="scope">
<el-switch :size="size" v-model="scope.row.active_status" @change="changeSwitch($event, scope.row)" :loading="scope.row.$switch_status" :active-value="true" :inactive-value="false"></el-switch>
</template>
<el-table-column label="操作" fixed="right" align="center" width="150">
<template #default="scope">
<el-dropdown>
<el-button class="noBorderBtn" icon="el-icon-more" :size="size"></el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item @click="table_show(scope.row, 'see')" icon="sc-icon-See">查看详情</el-dropdown-item>
<el-dropdown-item @click="table_edit(scope.row, 'edit')" icon="sc-icon-Edit">编辑公司</el-dropdown-item>
<el-dropdown-item @click="table_del(scope.row, 'delete')" icon="sc-icon-AbilityAuthorization" divided>功能授权</el-dropdown-item>
<el-dropdown-item @click="table_del(scope.row, 'delete')" icon="sc-icon-DataAuthorization">数据授权</el-dropdown-item>
<el-dropdown-item @click="table_del(scope.row, 'delete')" icon="sc-icon-UserList" divided>用户列表</el-dropdown-item>
<el-dropdown-item @click="table_del(scope.row, 'delete')" icon="sc-icon-Delete">删除公司</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</template>
</el-table-column>
</scTable>
</el-main>
</el-container>
<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess" @closed="dialog.save=false"></save-dialog>
<see-dialog v-if="dialog.show" ref="showDialog" @closed="dialog.show=false"></see-dialog>
</template>
<script>
export default {
name: "index",
data(){
return{
import saveDialog from './save'
import seeDialog from './see'
export default {
name: 'company',
components: {
saveDialog,
seeDialog
},
data() {
return {
size:'small',
setMap:{
full_name:[],
active_status:[],
},
dialog: {
save: false,
show: false
},
list: {
apiObj: this.$API.system.company.list,
column: [],
},
selection: [],
params: {
activation_date: '',
full_name:'',
active_status:'',
}
}
},
mounted() {
methods: {
async getCompanyList(e) {
if(!e) return
const res = await this.$API.system.company.select.post(this.params);
if(res.code == 200){
this.setMap['full_name'] = res.data;
}
},
async getStatusList(e) {
if(!e) return
const res = await this.$API.oss.status.post(this.params);
if(res.code == 200){
this.setMap['active_status'] = res.data;
}
},
},
methods:{
//添加
add(){
this.dialog.save = true
this.$nextTick(() => {
this.$refs.saveDialog.open()
})
},
//编辑
table_edit(row){
this.dialog.save = true
this.$nextTick(() => {
this.$refs.saveDialog.open('edit').setData(row)
})
},
//查看
table_show(row){
this.dialog.show = true
this.$nextTick(() => {
this.$refs.showDialog.open('show').setData(row);
})
},
//删除
async table_del(row){
const reqData = {id: row.id};
const res = await this.$API.demo.post.post(reqData);
if(res.code == 200){
this.$refs.table.refresh()
this.$message.success("删除成功")
}else{
await this.$alert(res.message, "提示", {type: 'error'})
}
},
//批量删除
async batch_del(){
this.$confirm(`确定删除选中的 ${this.selection.length} 项吗？如果删除项中含有子集将会被一并删除`, '提示', {
type: 'warning'
}).then(() => {
const loading = this.$loading();
this.$refs.table.refresh()
loading.close();
this.$message.success("操作成功")
}).catch(() => {
})
},
//表格选择后回调事件
selectionChange(selection){
this.selection = selection;
},
// 状态
changeSwitch(val, row) {
row.$switch_yx = true;
setTimeout(async () => {
let params = {
id: row.id,
status: row.active_status,
};
const res = await this.$API.system.company.status.post(params);
if(res.code !=200){
row.active_status = !row.active_status;
}
delete row.$switch_yx;
}, 500);
},
upSearch(){
this.$refs.table.upData(this.params);
},
reset(){
this.$refs.table.reload();
}
}
}
</script>
<style scoped lang="scss">
<style lang="scss" scoped>
.logoCell{
display: flex;
align-items: center;
height: 100%;
}
</style>
src/views/setting/company/save.vue
+177
View File
@@ -0,0 +1,177 @@
<template>
<el-dialog :title="titleMap[mode]" v-model="visible" :width="580" destroy-on-close draggable @closed="$emit('closed')">
<el-scrollbar height="460px" style="padding: 0 20px;">
<el-form :model="form" :rules="rules" ref="dialogForm" label-width="140px">
<div class="dialogBoxTitle"><span class="make"></span><span class="name">企业信息</span></div>
<el-form-item label="公司名称" prop="full_name">
<el-input v-model="form.full_name" placeholder="请填写认证企业名称" clearable></el-input>
</el-form-item>
<el-form-item label="公司简称" prop="name">
<el-input v-model="form.name" placeholder="请输入公司简称" clearable></el-input>
</el-form-item>
<el-form-item label="公司系统入口地址" prop="domain">
<el-input v-model="form.domain" placeholder="公司系统入口地址" clearable></el-input>
</el-form-item>
<el-form-item label="公司类型" prop="company_type">
<el-select v-model="form.company_type" @visible-change="getCompanyTypeSelect" placeholder="请输入部门名称" clearable style="width: 100%;">
<el-option v-for="item in setMap.companyType" :key="item" :label="item.label" :value="item.company_type"></el-option>
</el-select>
</el-form-item>
<el-form-item label="公司地址" prop="address">
<el-input v-model="form.address" placeholder="请输入部门名称" clearable></el-input>
</el-form-item>
<el-form-item label="证件照" prop="doc_url">
<ossImgListUpload :list="form.doc_url" :length="3" @parentParams="faultParentParams" />
</el-form-item>
<el-form-item label="公司LOGO" prop="logo">
<ossImgUpload @parentParams="parentParams" :url="form.logo" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input type="textarea" placeholder="请输入备注"></el-input>
</el-form-item>
<div class="dialogBoxTitle"><span class="make"></span><span class="name">企业管理员信息</span></div>
<el-form-item label="负责人/联系方式" prop="status">
<el-row justify="space-between">
<el-col :span="7">
<el-input v-model="form.owner" placeholder="公司负责人"></el-input>
</el-col>
<el-col :span="7">
<el-input v-model="form.mobile" placeholder="联系方式"></el-input>
</el-col>
<el-col :span="8">
<el-input v-model="form.email" placeholder="邮箱地址"></el-input>
</el-col>
</el-row>
</el-form-item>
<el-form-item label="账号" prop="admin_access">
<el-input v-model="form.admin_access" placeholder="请填写管理员账号"></el-input>
</el-form-item>
<el-form-item label="登录密码" prop="password">
<el-input v-model="form.password" type="password" placeholder="请填写密码"></el-input>
</el-form-item>
<el-form-item label="生成系统使用协议" prop="accord">
<el-switch v-model="form.accord" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item>
</el-form>
</el-scrollbar>
<template #footer>
<el-button @click="visible=false" >取 消</el-button>
<el-button v-if="mode!='show'" type="primary" :loading="isSave" @click="submit()">保 存</el-button>
</template>
</el-dialog>
</template>
<script>
export default {
emits: ['success', 'closed'],
data() {
return {
mode: "add",
titleMap: {
add: '新增公司资料',
edit: '编辑公司资料',
},
setMap:{
companyType:[]
},
visible: false,
isSave: false,
//表单数据
form: {
id:"",
domain: "",
company_type: "",
name: "",
full_name:"",
address:"",
email:"",
logo:"",
doc_url:[],
owner:"",
mobile:"",
admin_access:"",
password:"",
remark: "",
accord:1
},
//验证规则
rules: {
full_name: [
{required: true, message: '公司名称不能为空', trigger: 'blur'}
],
admin_access: [
{required: true, message: '账号不能为空', trigger: 'blur'}
],
password: [
{required: true, message: '密码不能为空', trigger: 'blur'}
]
},
}
},
mounted() {
},
methods: {
//显示
open(mode='add'){
this.mode = mode;
this.visible = true;
return this
},
//加载树数据
async getCompanyTypeSelect(e){
if(!e) return
const res = await this.$API.system.company.typeSelect.post();
if(res.code == 200){
this.setMap['companyType'] = res.data;
}
},
faultParentParams(item){
this.form.doc_url = item;
},
parentParams(item){
this.form.logo = item;
},
//表单提交方法
submit(){
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
this.isSave = true;
const res = await this.$API.system.company.add.post(this.form);
this.isSave = false;
if(res.code == 200){
this.$emit('success', this.form, this.mode);
this.visible = false;
this.$message.success("操作成功")
}
}
})
},
//表单注入数据
setData(data){
this.form.id = data.id
this.form.label = data.label
this.form.status = data.status
this.form.sort = data.sort
this.form.parentId = data.parentId
this.form.remark = data.remark
}
}
}
</script>
<style lang="scss" scoped>
.dialogBoxTitle{
margin-bottom: 20px;
display: flex;
align-items: center;
.make{
height: 14px;
width: 4px;
border-radius: 10px;
margin-right: 8px;
background: var(--el-color-primary);
}
}
</style>
src/views/setting/company/see.vue
+71
View File
@@ -0,0 +1,71 @@
<template>
<el-dialog :title="titleMap[mode]" v-model="visible" :width="500" destroy-on-close draggable @closed="$emit('closed')">
<el-form :model="form" ref="dialogForm" label-width="140px">
<el-form-item label="公司名称" prop="full_name">
<span>{{form.full_name}}</span>
</el-form-item>
<el-form-item label="公司系统入口地址" prop="label">
<span>{{form.domain}}</span>
</el-form-item>
<el-form-item label="系统开通日期" prop="label">
<span>{{form.activation_date}}</span>
</el-form-item>
<el-form-item label="公司类型" prop="label">
<span></span>
</el-form-item>
<el-form-item label="公司地址" prop="label">
<span>{{form.address}}</span>
</el-form-item>
<el-form-item label="负责人/联系方式" prop="status">
<span>{{form.owner}} {{form.mobile}}</span>
</el-form-item>
<el-form-item label="证件照" prop="remark">
<el-image style="height: 40px" :src="form.logo"></el-image>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="visible=false">取 消</el-button>
</template>
</el-dialog>
</template>
<script>
export default {
emits: ['success', 'closed'],
data() {
return {
mode: "show",
titleMap: {
show: '查看公司详情'
},
visible: false,
//表单数据
form: {},
}
},
mounted() {
},
methods: {
//显示
open(mode='show'){
this.mode = mode;
this.visible = true;
return this
},
//表单注入数据
async setData(data) {
let params = {
id:data.id
}
const res = await this.$API.system.company.info.post(params);
if(res.code == 200){
this.form = res.data;
}
}
}
}
</script>
<style>
</style>
src/views/setting/deptMag/index.vue
+50 -37
View File
@@ -1,44 +1,39 @@
<template>
<el-container>
<el-container class="mainBox mainBoxHeaderNoBorder">
<el-header>
<div class="left-panel">
<el-button type="primary" icon="el-icon-plus" @click="add"></el-button>
<el-button type="danger" plain icon="el-icon-delete" :disabled="selection.length==0" @click="batch_del"></el-button>
<el-button type="primary" :size="size" icon="el-icon-plus" @click="add"></el-button>
<el-button type="danger" :size="size" plain icon="el-icon-delete" :disabled="selection.length==0" @click="batch_del"></el-button>
</div>
<div class="right-panel">
<div class="right-panel-search">
<el-input v-model="search.keyword" placeholder="部门名称" clearable></el-input>
<el-button type="primary" icon="el-icon-search" @click="upsearch"></el-button>
</div>
</div>
</el-header>
<el-main class="nopadding">
<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange" hidePagination>
<el-table-column type="selection" width="50"></el-table-column>
<el-table-column label="部门名称" prop="label" width="250"></el-table-column>
<el-table-column label="排序" prop="sort" width="150"></el-table-column>
<el-table-column label="状态" prop="status" width="150">
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe :size="size" :showPagination="false" @selection-change="selectionChange">
<el-table-column type="selection" width="40"></el-table-column>
<el-table-column type="index" label="序号" align="center" width="50"></el-table-column>
<el-table-column label="状态" fixed="right" align="center" width="80" prop="active_status">
<template #default="scope">
<el-tag v-if="scope.row.status==1" type="success">启用</el-tag>
<el-tag v-if="scope.row.status==0" type="danger">停用</el-tag>
<el-switch :size="size" v-model="scope.row.active_status" @change="changeSwitch($event, scope.row)" :loading="scope.row.$switch_status" :active-value="true" :inactive-value="false"></el-switch>
</template>
</el-table-column>
<el-table-column label="创建时间" prop="date" width="180"></el-table-column>
<el-table-column label="备注" prop="remark" min-width="300"></el-table-column>
<el-table-column label="操作" fixed="right" align="right" width="170">
<el-table-column label="操作" fixed="right" align="center" width="150">
<template #default="scope">
<el-button-group>
<el-button text type="primary" size="small" @click="table_show(scope.row, scope.$index)">查看</el-button>
<el-button text type="primary" size="small" @click="table_edit(scope.row, scope.$index)">编辑</el-button>
<el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)">
<template #reference>
<el-button text type="primary" size="small">删除</el-button>
</template>
</el-popconfirm>
</el-button-group>
<el-dropdown>
<el-button class="noBorderBtn" icon="el-icon-more" :size="size"></el-button>
<template #dropdown>
<el-dropdown-menu>
<!-- <el-dropdown-item @click="handlerCommand(scope.row, 'see')" icon="sc-icon-See">查看 </el-dropdown-item>-->
<!-- <el-dropdown-item @click="handlerCommand(scope.row, 'review')" icon="sc-icon-Review" v-if="scope.row.review_status == 0">审核</el-dropdown-item>-->
<!-- <el-dropdown-item @click="handlerCommand(scope.row, 'cancel')" icon="sc-icon-Revoke">撤回</el-dropdown-item>-->
<el-dropdown-item @click="table_edit(scope.row, 'edit')" icon="sc-icon-Edit">修改</el-dropdown-item>
<el-dropdown-item @click="table_del(scope.row, 'delete')" icon="sc-icon-Delete" divided>删除</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</template>
</el-table-column>
</scTable>
</el-main>
</el-container>
@@ -57,10 +52,14 @@
},
data() {
return {
size:'small',
dialog: {
save: false
},
apiObj: this.$API.system.dept.list,
list: {
apiObj: this.$API.system.dept.list,
column: [],
},
selection: [],
search: {
keyword: null
@@ -89,15 +88,32 @@
this.$refs.saveDialog.open('show').setData(row)
})
},
// 状态
changeSwitch(val, row) {
row.$switch_yx = true;
setTimeout(async () => {
let params = {
id: row.id,
status: row.active_status,
};
const res = await this.$API.system.dept.status.post(params);
if(res.code ==200){
console.log(res.data)
}else{
row.active_status = !row.active_status;
}
delete row.$switch_yx;
}, 500);
},
//删除
async table_del(row){
var reqData = {id: row.id}
var res = await this.$API.demo.post.post(reqData);
const reqData = {id: row.id};
const res = await this.$API.demo.post.post(reqData);
if(res.code == 200){
this.$refs.table.refresh()
this.$message.success("删除成功")
}else{
this.$alert(res.message, "提示", {type: 'error'})
await this.$alert(res.message, "提示", {type: 'error'})
}
},
//批量删除
@@ -116,14 +132,10 @@
//表格选择后回调事件
selectionChange(selection){
this.selection = selection;
},
//搜索
upsearch(){
},
//根据ID获取树结构
filterTree(id){
var target = null;
let target = null;
function filter(tree){
tree.forEach(item => {
if(item.id == id){
@@ -149,5 +161,6 @@
}
</script>
<style>
<style lang="scss" scoped>
</style>
src/views/setting/deptMag/save.vue
-3
View File
@@ -7,9 +7,6 @@
<el-form-item label="部门名称" prop="label">
<el-input v-model="form.label" placeholder="请输入部门名称" clearable></el-input>
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input-number v-model="form.sort" controls-position="right" :min="1" style="width: 100%;"></el-input-number>
</el-form-item>
<el-form-item label="是否有效" prop="status">
<el-switch v-model="form.status" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item>
src/views/setting/role/index.vue
+26 -23
View File
@@ -1,43 +1,41 @@
<template>
<el-container>
<el-container class="mainBox mainBoxHeaderNoBorder">
<el-header>
<div class="left-panel">
<el-button type="primary" icon="el-icon-plus" @click="add"></el-button>
<el-button type="danger" plain icon="el-icon-delete" :disabled="selection.length==0" @click="batch_del"></el-button>
<el-button type="primary" plain :disabled="selection.length!=1" @click="permission">权限设置</el-button>
<el-button type="primary" :size="size" icon="el-icon-plus" @click="add"></el-button>
<el-button type="danger" :size="size" plain icon="el-icon-delete" :disabled="selection.length==0" @click="batch_del"></el-button>
<el-button type="primary" :size="size" plain :disabled="selection.length!=1" @click="permission">权限设置</el-button>
</div>
<div class="right-panel">
<div class="right-panel-search">
<el-input v-model="search.keyword" placeholder="角色名称" clearable></el-input>
<el-button type="primary" icon="el-icon-search" @click="upsearch"></el-button>
<el-input :size="size" v-model="search.keyword" placeholder="角色名称" clearable></el-input>
<el-button :size="size" type="primary" icon="el-icon-search" @click="upsearch"></el-button>
</div>
</div>
</el-header>
<el-main class="nopadding">
<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange" stripe>
<el-table-column type="selection" width="50"></el-table-column>
<el-table-column label="#" type="index" width="50"></el-table-column>
<scTable ref="table" :apiObj="list.apiObj" row-key="id" @selection-change="selectionChange" stripe :size="size">
<el-table-column type="selection" align="center" width="50"></el-table-column>
<el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
<el-table-column label="角色名称" prop="label" width="150"></el-table-column>
<el-table-column label="别名" prop="alias" width="200"></el-table-column>
<el-table-column label="排序" prop="sort" width="80"></el-table-column>
<el-table-column label="状态" prop="status" width="80">
<template #default="scope">
<el-switch v-model="scope.row.status" @change="changeSwitch($event, scope.row)" :loading="scope.row.$switch_status" active-value="1" inactive-value="0"></el-switch>
<el-switch v-model="scope.row.status" @change="changeSwitch($event, scope.row)" :loading="scope.row.$switch_status" :active-value="true" :inactive-value="false"></el-switch>
</template>
</el-table-column>
<el-table-column label="创建时间" prop="date" width="180"></el-table-column>
<el-table-column label="备注" prop="remark" min-width="150"></el-table-column>
<el-table-column label="操作" fixed="right" align="right" width="170">
<el-table-column label="操作" fixed="right" align="center" width="170">
<template #default="scope">
<el-button-group>
<el-button text type="primary" size="small" @click="table_show(scope.row, scope.$index)">查看</el-button>
<el-button text type="primary" size="small" @click="table_edit(scope.row, scope.$index)">编辑</el-button>
<el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)">
<template #reference>
<el-button text type="primary" size="small">删除</el-button>
</template>
</el-popconfirm>
</el-button-group>
<el-dropdown>
<el-button class="noBorderBtn" icon="el-icon-more" :size="size"></el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item @click="table_edit(scope.row, 'edit')" icon="sc-icon-Edit">修改</el-dropdown-item>
<el-dropdown-item @click="table_del(scope.row, 'delete')" icon="sc-icon-Delete" divided>删除</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</template>
</el-table-column>
@@ -63,11 +61,16 @@
},
data() {
return {
size:'small',
dialog: {
save: false,
permission: false
},
apiObj: this.$API.system.role.list,
list:{
apiObj: this.$API.system.role.list,
column:[]
},
selection: [],
search: {
keyword: null
src/views/setting/role/save.vue
+1 -4
View File
@@ -1,15 +1,12 @@
<template>
<el-dialog :title="titleMap[mode]" v-model="visible" :width="500" destroy-on-close @closed="$emit('closed')">
<el-form :model="form" :rules="rules" :disabled="mode=='show'" ref="dialogForm" label-width="100px" label-position="left">
<el-form :model="form" :rules="rules" :disabled="mode=='show'" ref="dialogForm" label-width="120px" label-position="right">
<el-form-item label="角色名称" prop="label">
<el-input v-model="form.label" clearable></el-input>
</el-form-item>
<el-form-item label="角色别名" prop="alias">
<el-input v-model="form.alias" clearable></el-input>
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input-number v-model="form.sort" controls-position="right" :min="1" style="width: 100%;"></el-input-number>
</el-form-item>
<el-form-item label="是否有效" prop="status">
<el-switch v-model="form.status" active-value="1" inactive-value="0"></el-switch>
</el-form-item>
src/views/setting/user/index.vue
+50 -34
View File
@@ -1,9 +1,9 @@
<template>
<el-container>
<el-container class="mainBox ">
<el-aside width="200px" v-loading="showGrouploading">
<el-container>
<el-header>
<el-input placeholder="输入关键字进行过滤" v-model="groupFilterText" clearable></el-input>
<el-input placeholder="输入关键字进行过滤" :size="size" v-model="groupFilterText" clearable></el-input>
</el-header>
<el-main class="nopadding">
<el-tree ref="group" class="menu" node-key="id" :data="group" :current-node-key="''" :highlight-current="true" :expand-on-click-node="false" :filter-node-method="groupFilterNode" @node-click="groupClick"></el-tree>
@@ -13,42 +13,42 @@
<el-container>
<el-header>
<div class="left-panel">
<el-button type="primary" icon="el-icon-plus" @click="add"></el-button>
<el-button type="danger" plain icon="el-icon-delete" :disabled="selection.length==0" @click="batch_del"></el-button>
<el-button type="primary" plain :disabled="selection.length==0">分配角色</el-button>
<el-button type="primary" plain :disabled="selection.length==0">密码重置</el-button>
<el-button type="primary" :size="size" icon="el-icon-plus" @click="add"></el-button>
<el-button type="danger" plain :size="size" icon="el-icon-delete" :disabled="selection.length==0" @click="batch_del"></el-button>
<el-button type="primary" plain :size="size" :disabled="selection.length==0">分配角色</el-button>
<el-button type="primary" plain :size="size" :disabled="selection.length==0">密码重置</el-button>
</div>
<div class="right-panel">
<div class="right-panel-search">
<el-input v-model="search.name" placeholder="登录账号 / 姓名" clearable></el-input>
<el-button type="primary" icon="el-icon-search" @click="upsearch"></el-button>
<el-input v-model="search.name" :size="size" placeholder="关键字" clearable></el-input>
<el-button type="primary" :size="size" icon="el-icon-search" @click="upSearch"></el-button>
</div>
</div>
</el-header>
<el-main class="nopadding">
<scTable ref="table" :apiObj="apiObj" @selection-change="selectionChange" stripe remoteSort remoteFilter>
<el-table-column type="selection" width="50"></el-table-column>
<el-table-column label="ID" prop="id" width="80" sortable='custom'></el-table-column>
<el-table-column label="头像" width="80" column-key="filterAvatar" :filters="[{text: '已上传', value: '1'}, {text: '未上传', value: '0'}]">
<template #default="scope">
<scTable ref="table" :apiObj="apiObj" @selection-change="selectionChange" stripe :size="size" remoteSort remoteFilter>
<el-table-column type="selection" align="center" width="45"></el-table-column>
<el-table-column label="序号" type="index" align="center" width="50"></el-table-column>
<template #avatar="scope">
<div class="userImg">
<el-avatar :src="scope.row.avatar" size="small"></el-avatar>
</template>
</el-table-column>
<el-table-column label="登录账号" prop="userName" width="150" sortable='custom' column-key="filterUserName" :filters="[{text: '系统账号', value: '1'}, {text: '普通账号', value: '0'}]"></el-table-column>
<el-table-column label="姓名" prop="name" width="150" sortable='custom'></el-table-column>
<el-table-column label="所属角色" prop="groupName" width="200" sortable='custom'></el-table-column>
<el-table-column label="加入时间" prop="date" width="170" sortable='custom'></el-table-column>
<el-table-column label="操作" fixed="right" align="right" width="160">
</div>
</template>
<template #active_status="scope">
<el-switch :size="size" v-model="scope.row.active_status" @change="changeSwitch($event, scope.row)" :loading="scope.row.$switch_status" :active-value="true" :inactive-value="false"></el-switch>
</template>
<el-table-column label="操作" fixed="right" align="center" width="160">
<template #default="scope">
<el-button-group>
<el-button text type="primary" size="small" @click="table_show(scope.row, scope.$index)">查看</el-button>
<el-button text type="primary" size="small" @click="table_edit(scope.row, scope.$index)">编辑</el-button>
<el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)">
<template #reference>
<el-button text type="primary" size="small">删除</el-button>
</template>
</el-popconfirm>
</el-button-group>
<el-dropdown>
<el-button class="noBorderBtn" icon="el-icon-more" :size="size"></el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item @click="table_show(scope.row, 'show')" icon="sc-icon-See">用户详情</el-dropdown-item>
<el-dropdown-item @click="table_edit(scope.row, 'edit')" icon="sc-icon-Edit">编辑用户</el-dropdown-item>
<el-dropdown-item @click="table_del(scope.row, 'delete')" icon="sc-icon-Delete">删除用户</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</template>
</el-table-column>
@@ -71,6 +71,7 @@
},
data() {
return {
size:'small',
dialog: {
save: false
},
@@ -152,9 +153,9 @@
//加载树数据
async getGroup(){
this.showGrouploading = true;
var res = await this.$API.system.dept.list.get();
const res = await this.$API.system.dept.active.post();
this.showGrouploading = false;
var allNode ={id: '', label: '所有'}
const allNode = {id: '', label: '所有'};
res.data.unshift(allNode);
this.group = res.data;
},
@@ -165,13 +166,28 @@
},
//树点击事件
groupClick(data){
var params = {
const params = {
groupId: data.id
}
};
this.$refs.table.reload(params)
},
// 状态
changeSwitch(val, row) {
row.$switch_yx = true;
setTimeout(async () => {
let params = {
id: row.id,
status: row.active_status,
};
const res = await this.$API.system.user.status.post(params);
if(res.code !=200){
row.active_status = !row.active_status;
}
delete row.$switch_yx;
}, 500);
},
//搜索
upsearch(){
upSearch(){
this.$refs.table.upData(this.search)
},
//本地更新数据
src/views/setting/user/save.vue
+1 -1
View File
@@ -1,6 +1,6 @@
<template>
<el-dialog :title="titleMap[mode]" v-model="visible" :width="500" destroy-on-close @closed="$emit('closed')">
<el-form :model="form" :rules="rules" :disabled="mode=='show'" ref="dialogForm" label-width="100px" label-position="left">
<el-form :model="form" :rules="rules" :disabled="mode=='show'" ref="dialogForm" label-width="100px" label-position="right">
<el-form-item label="头像" prop="avatar">
<sc-upload v-model="form.avatar" title="上传头像"></sc-upload>
</el-form-item>
src/views/userCenter/index.vue
+1 -1
View File
@@ -11,7 +11,7 @@
</div>
</div>
</el-header>
<el-main class="nopadding">
<el-main class="nopadding noBorderRadius">
<el-menu class="menu mainMenu" :default-active="page">
<el-menu-item-group v-for="group in menu" :key="group.groupName" :title="group.groupName">
<el-menu-item v-for="item in group.list" :key="item.component" :index="item.component" @click="openPage">
src/views/userCenter/user/account.vue
+3 -4
View File
@@ -27,7 +27,7 @@
<el-input v-model="form.about" type="textarea"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary">保存</el-button>
<el-button type="primary" @click="save">保存</el-button>
</el-form-item>
</el-form>
</el-card>
@@ -101,7 +101,7 @@ export default {
if (!validate) {
return false
}
const res = await this.$API.system.user.verifyCode.post({mobile: this.form.mobile});
const res = await this.$API.user.verifyCode.post({mobile: this.form.mobile});
if (res.code === 200) {
this.$message.success('短信已发送至手机号码');
this.disabled = true
@@ -119,9 +119,8 @@ export default {
save() {
this.$refs.form.validate(async (valid) => {
if (valid) {
const res = await this.$API.system.user.updateProfile.post(this.form)
const res = await this.$API.user.editUser.post(this.form)
if (res.code === 200) {
// this.$TOOL.data.set("USER_INFO", res.data)
this.$message.success("操作成功");
await this.getInfo();
}
src/views/userCenter/user/bind.vue
+6 -7
View File
@@ -15,8 +15,8 @@
</div>
</div>
<div class="rightBtn">
<el-button type="primary" :size="size" round v-if="wechat.open_id==''" @click="bindWechat">绑定</el-button>
<el-button type="primary" :size="size" round v-else plain @click="secureDingTalk(1)">解除</el-button>
<el-button type="primary" :size="size" v-if="wechat.open_id==''" @click="bindWechat">绑 定</el-button>
<el-button type="primary" :size="size" v-else plain @click="secureDingTalk(1)">解 除</el-button>
</div>
</div>
<div class="boxView">
@@ -32,8 +32,8 @@
</div>
</div>
<div class="rightBtn">
<el-button type="primary" :size="size" round v-if="dingTalk.open_id==''" @click="bindDingTalk">绑定</el-button>
<el-button type="primary" :size="size" round v-else plain @click="secureDingTalk(2)">解除</el-button>
<el-button type="primary" :size="size" v-if="dingTalk.open_id==''" @click="bindDingTalk">绑 定</el-button>
<el-button type="primary" :size="size" v-else plain @click="secureDingTalk(2)">解 除</el-button>
</div>
</div>
<div class="title">安全登录</div>
@@ -59,7 +59,7 @@
<div class="title">使用Passkey</div>
<div class="boxView boxViewCenter">
<div class="nameBox passkeyView">
<el-button type="primary" round :size="size" @click="createPasskey">添加指纹</el-button>
<el-button type="primary" :size="size" @click="createPasskey">添加指纹</el-button>
<div class="msg">借助 Passkey，你可以使用自己的指纹、面孔、屏锁设置或实体安全密钥登录你的账号。请仅在你自有的设备上设置 Passkey。</div>
</div>
</div>
@@ -123,7 +123,7 @@ export default {
const userInfo = this.$TOOL.data.get("USER_INFO");
this.userInfo = userInfo;
// this.getUserInfo();
this.getUserInfo();
// this.getSso();
// 获取新消息
// this.$socketApi.getSock(this.getWsResult);
@@ -245,7 +245,6 @@ export default {
async createPasskey() {
try {
const res = await this.$API.system.user.generateRegistration.post();
const publicKey= {
challenge:Uint8Array.from(res.data.challenge),
rp:{
src/views/userCenter/user/password.vue
+27 -24
View File
@@ -2,10 +2,10 @@
<el-card shadow="never" header="修改密码">
<el-alert title="密码更新成功后，您将被重定向到登录页面，您可以使用新密码重新登录。" type="error" show-icon style="margin-bottom: 15px;"/>
<el-form ref="form" :model="form" :rules="rules" label-width="120px" style="margin-top:20px;width: 518px;">
<el-form-item label="当前密码" prop="userPassword">
<el-input v-model="form.userPassword" type="password" show-password placeholder="请输入当前密码"></el-input>
<el-form-item label="当前密码" prop="old_pwd">
<el-input v-model="form.old_pwd" type="password" show-password placeholder="请输入当前密码"></el-input>
</el-form-item>
<el-form-item label="新密码" prop="newPassword">
<el-form-item label="新密码" prop="new_pwd">
<el-popover
class="popoverPassword"
placement="right"
@@ -15,13 +15,13 @@
content=""
>
<template #reference>
<el-input v-model="form.newPassword" type="password" show-password placeholder="请输入新密码"></el-input>
<el-input v-model="form.new_pwd" type="password" show-password placeholder="请输入新密码"></el-input>
</template>
<template #default>
<div class="passwordView">
<div class="title">
<div class="name">安全程度等级:</div>
<div class="strength"><sc-password-strength v-model="form.newPassword"></sc-password-strength></div>
<div class="strength"><sc-password-strength v-model="form.new_pwd"></sc-password-strength></div>
</div>
<div class="text"><div class="icon"></div>6-20位字符</div>
<div class="text"><div class="icon"></div>只能包含大小写字母、数字和标点符号（除空格）</div>
@@ -29,8 +29,8 @@
</template>
</el-popover>
</el-form-item>
<el-form-item label="确认新密码" prop="confirmNewPassword">
<el-input v-model="form.confirmNewPassword" type="password" show-password placeholder="请再次输入新密码"></el-input>
<el-form-item label="确认新密码" prop="conf_pwd">
<el-input v-model="form.conf_pwd" type="password" show-password placeholder="请再次输入新密码"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="save">保存密码</el-button>
@@ -49,21 +49,21 @@
data() {
return {
form: {
userPassword: "",
newPassword: "",
confirmNewPassword: ""
old_pwd: "",
new_pwd: "",
conf_pwd: ""
},
rules: {
userPassword: [
old_pwd: [
{ required: true, message: '请输入当前密码'}
],
newPassword: [
new_pwd: [
{ required: true, message: '请输入新密码'}
],
confirmNewPassword: [
conf_pwd: [
{ required: true, message: '请再次输入新密码'},
{validator: (rule, value, callback) => {
if (value !== this.form.newPassword) {
if (value !== this.form.new_pwd) {
callback(new Error('两次输入密码不一致'));
}else{
callback();
@@ -75,17 +75,20 @@
},
methods: {
save(){
this.$refs.form.validate(valid => {
this.$refs.form.validate(async valid => {
if (valid) {
this.$alert("密码修改成功，是否跳转至登录页使用新密码登录", "修改成功", {
type: 'success',
center: true
}).then(() => {
this.$router.replace({
path: '/login'
})
}).catch(() => {})
}else{
const res = await this.$API.user.editPass.post(this.form);
if(res.code == 200){
this.$alert("密码修改成功，是否跳转至登录页使用新密码登录", "修改成功", {
type: 'success',
center: true
}).then(() => {
this.$router.replace({
path: '/login'
})
}).catch(() => {})
}
} else {
return false
}
})