朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 b1844bfbcbececf0be34680d7ea704fc1cafae0e 1 个父辈 7793d57b

.......

内嵌 并排对比
正在显示 8 个修改的文件 包含 97 行增加 和 89 行删除
... ... @@ -7,13 +7,10 @@
<el-input v-model="filters.username" placeholder="账号"></el-input>
</el-form-item>
<el-form-item>
<el-input v-model="filters.methodname" placeholder="系统动作"></el-input>
</el-form-item>
<el-form-item>
<el-input v-model="filters.modelnamecn" placeholder="操作模块"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" v-on:click="getRoles()">查询</el-button>
<el-button type="primary" v-on:click="getLogs()">查询</el-button>
</el-form-item>
</el-form>
</el-col>
... ... @@ -35,8 +32,6 @@
</el-table-column>
<el-table-column prop="modelnamecn" label="操作模块" width="120" sortable>
</el-table-column>
<!--<el-table-column prop="parameters" label="参数" width="100" sortable>-->
<!--</el-table-column>-->
<el-table-column prop="classname" label="系统类" show-overflow-tooltip="true" width="100" sortable>
</el-table-column>
<el-table-column prop="result" label="操作结果" min-width="200" sortable>
... ... @@ -45,7 +40,7 @@
<!--工具条-->
<el-col :span="24" class="toolbar">
<el-pagination layout="prev, pager, next" @current-change="handleCurrentChange" :page-size="10" :total="total" style="float:right;">
<el-pagination layout="total, prev, pager, next" @current-change="handleCurrentChange" :page-size="10" :total="total" style="float:right;">
</el-pagination>
</el-col>
</section>
... ... @@ -59,7 +54,10 @@
export default {
data() {
return {
filters: {},
filters: {
modelnamecn:'',
username: ''
},
logs: [],
total: 0,
pageNum: 1,
... ... @@ -78,13 +76,15 @@
},
handleCurrentChange(val) {
this.pageNum = val;
this.getRoles();
this.getLogs();
},
//获取角色列表
getLogs() {
let para = {
pageNum: this.pageNum,
pageSize: this.pageSize,
modelnamecn: this.filters.modelnamecn,
username: this.filters.username
};
this.listLoading = true;
//NProgress.start();
... ... @@ -112,28 +112,6 @@
selsChange: function (sels) {
this.sels = sels;
},
//批量删除
batchRemove: function () {
var ids = this.sels.map(item => item.id).toString();
this.$confirm('确认删除选中记录吗？', '提示', {
type: 'warning'
}).then(() => {
this.listLoading = true;
//NProgress.start();
let para = { ids: ids };
batchRemove(para).then((res) => {
this.listLoading = false;
//NProgress.done();
this.$message({
message: '删除成功',
type: 'success'
});
this.getRoles();
});
}).catch(() => {
});
}
},
mounted() {
this.getLogs();
... ...
... ... @@ -55,7 +55,7 @@
<!--工具条-->
<el-col :span="24" class="toolbar">
<el-button type="danger" @click="batchRemove" :disabled="this.sels.length===0">批量删除</el-button>
<el-pagination layout="prev, pager, next" @current-change="handleCurrentChange" :page-size="5" :total="total" style="float:right;">
<el-pagination layout="total, prev, pager, next" @current-change="handleCurrentChange" :page-size="5" :total="total" style="float:right;">
</el-pagination>
</el-col>
... ...
... ... @@ -40,7 +40,7 @@
<!--工具条-->
<el-col :span="24" class="toolbar">
<el-button type="danger" @click="batchRemove" :disabled="this.sels.length===0">批量删除</el-button>
<el-pagination layout="prev, pager, next" @current-change="handleCurrentChange" :page-size="5" :total="total" style="float:right;">
<el-pagination layout="total, prev, pager, next" @current-change="handleCurrentChange" :page-size="5" :total="total" style="float:right;">
</el-pagination>
</el-col>
... ...
... ... @@ -40,7 +40,7 @@
<!--工具条-->
<el-col :span="24" class="toolbar">
<el-button type="danger" @click="batchRemove" :disabled="this.sels.length===0">批量删除</el-button>
<el-pagination layout="prev, pager, next" @current-change="handleCurrentChange" :page-size="5" :total="total" style="float:right;">
<el-pagination layout="total, prev, pager, next" @current-change="handleCurrentChange" :page-size="5" :total="total" style="float:right;">
</el-pagination>
</el-col>
... ... @@ -114,7 +114,7 @@
permIds: [],
total: 0,
pageNum: 1,
pageSize: 5,
pageSize: 10,
listLoading: false,
sels: [],//列表选中列
//编辑界面是否显示
... ...
... ... @@ -38,7 +38,7 @@
<!--工具条-->
<el-col :span="24" class="toolbar">
<el-button type="danger" @click="batchRemove" :disabled="this.sels.length===0">批量删除</el-button>
<el-pagination layout="prev, pager, next" @current-change="handleCurrentChange" :page-size="5" :total="total" style="float:right;">
<el-pagination layout="total, prev, pager, next" @current-change="handleCurrentChange" :page-size="5" :total="total" style="float:right;">
</el-pagination>
</el-col>
... ...
... ... @@ -4,10 +4,10 @@
<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
<el-form :inline="true" :model="filters">
<el-form-item>
<el-input v-model="filters.permName" placeholder="权限名称"></el-input>
<el-input v-model="filters.name" placeholder="权限名称"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" v-on:click="getRoles()">查询</el-button>
<el-button type="primary" v-on:click="getTableList()">查询</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleAdd">新增</el-button>
... ... @@ -42,7 +42,7 @@
<!--工具条-->
<el-col :span="24" class="toolbar">
<el-button type="danger" @click="batchRemove" :disabled="this.sels.length===0">批量删除</el-button>
<el-pagination layout="prev, pager, next" @current-change="handleCurrentChange" :page-size="5" :total="total" style="float:right;">
<el-pagination layout="total, prev, pager, next" @current-change="handleCurrentChange" :page-size="pageSize" :total="total" style="float:right;">
</el-pagination>
</el-col>
... ... @@ -50,20 +50,37 @@
<el-dialog title="编辑" v-model="editFormVisible" :close-on-click-modal="false">
<el-form :model="editForm" label-width="80px" :rules="editFormRules" ref="editForm">
<el-form-item label="ID">
<span>{{editForm.roleId}}</span>
<span>{{editForm.permissionId}}</span>
</el-form-item>
<el-form-item label="权限名称">
<el-input v-model="editForm.roleName" auto-complete="off" placeholder="请输入权限名称：例如:ROLE_name"></el-input>
<el-form-item label="权限名称" prop="name">
<el-input v-model="editForm.name" auto-complete="off" placeholder="请输入权限名称：例如:用户新增权限"></el-input>
</el-form-item>
<el-form-item label="权限描述">
<el-form-item label="权限描述" prop="description">
<el-input v-model="editForm.description" auto-complete="off" placeholder="请输入权限描述：例如:用户管理员"></el-input>
</el-form-item>
<el-form-item label="权限排序">
<el-input v-model="editForm.roleSign" auto-complete="off" placeholder="请输入权限排序：例如:数字123"></el-input>
<el-form-item label="权限总路径" prop="path">
<el-input v-model="editForm.path" auto-complete="off" placeholder="请输入父目录ID：例如:123"></el-input>
</el-form-item>
<el-form-item label="权限路径" prop="url">
<el-input v-model="editForm.url" auto-complete="off" placeholder="请输入权限描述：例如:/user/update"></el-input>
</el-form-item>
<el-form-item label="权限排序" prop="permissionOrder">
<el-input v-model="editForm.permissionOrder" auto-complete="off" placeholder="请输入权限排序：例如:123"></el-input>
</el-form-item>
<el-form-item label="父目录ID" prop="parentId">
<el-input v-model="editForm.parentId" auto-complete="off" placeholder="请输入父目录ID：例如:123"></el-input>
</el-form-item>
<el-form-item label="是否ismenu" prop="ismenu">
<el-switch
v-model="editForm.ismenu"
active-color="#13ce66"
inactive-color="#ff4949"
active-text="是"
inactive-text="否"
active-value="1"
inactive-value="0">
</el-switch>
</el-form-item>
<!--<el-form-item label="创建日期">-->
<!--<el-date-picker type="date" placeholder="创建日期" v-model="editForm.creattime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"></el-date-picker>-->
<!--</el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click.native="editFormVisible = false">取消</el-button>
... ... @@ -80,17 +97,28 @@
<el-form-item label="权限描述" prop="description">
<el-input v-model="addForm.description" auto-complete="off" placeholder="请输入权限描述：例如:用户管理员"></el-input>
</el-form-item>
<el-form-item label="权限总路径" prop="path">
<el-input v-model="addForm.path" auto-complete="off" placeholder="请输入父目录ID：例如:123"></el-input>
</el-form-item>
<el-form-item label="权限路径" prop="url">
<el-input v-model="addForm.url" auto-complete="off" placeholder="请输入权限描述：例如:/user/update"></el-input>
</el-form-item>
<el-form-item label="权限排序" prop="permissionSign">
<el-input v-model="addForm.permissionSign" auto-complete="off" placeholder="请输入权限排序：例如:123"></el-input>
<el-form-item label="权限排序" prop="permissionOrder">
<el-input v-model="addForm.permissionOrder" auto-complete="off" placeholder="请输入权限排序：例如:123"></el-input>
</el-form-item>
<el-form-item label="父目录ID" prop="parentId">
<el-input v-model="addForm.parentId" auto-complete="off" placeholder="请输入父目录ID：例如:123"></el-input>
</el-form-item>
<el-form-item label="父目录ID" prop="parentId">
<el-input v-model="addForm.parentId" auto-complete="off" placeholder="请输入父目录ID：例如:123"></el-input>
<el-form-item label="是否ismenu" prop="ismenu">
<el-switch
v-model="addForm.ismenu"
active-color="#13ce66"
inactive-color="#ff4949"
active-text="是"
inactive-text="否"
active-value="1"
inactive-value="0">
</el-switch>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
... ... @@ -110,12 +138,12 @@
data() {
return {
filters: {
permName: ''
name: ''
},
tableList: [],
total: 0,
pageNum: 1,
pageSize: 5,
pageSize: 10,
listLoading: false,
sels: [],//列表选中列
//编辑界面是否显示
... ... @@ -128,21 +156,37 @@
},
//编辑界面数据
editForm: {
roleId: 1,
permissionId:'',
description: '',
roleName: '',
roleSign: 1
name: '',
url: '',
path: '',
parentId: '',
ismenu: '',
permissionOrder:''
},
addFormVisible: false,//新增界面是否显示
addLoading: false,
addFormRules: {
roleName: [
name: [
{ required: true, message: '请输入权限名称', trigger: 'blur' }
],
description: [
{ required: true, message: '请输入权限描述', trigger: 'blur' }
]
],
paht: [
{ required: true, message: '请输入总路径', trigger: 'blur' }
],
url: [
{ required: true, message: '请输入权限路径', trigger: 'blur' }
],
permissionOrder: [
{ required: true, message: '请输入排序字段', trigger: 'blur' }
],
parentId: [
{ required: true, message: '请输入父类ID', trigger: 'blur' }
]
},
//新增界面数据
addForm: {
... ... @@ -150,7 +194,9 @@
name: '',
url: '',
path: '',
parent_id: '',
parentId: '',
ismenu: '',
permissionOrder:''
}
... ... @@ -173,7 +219,7 @@
let para = {
pageNum: this.pageNum,
pageSize: this.pageSize,
name: this.filters.permName
name: this.filters.name
};
this.listLoading = true;
//NProgress.start();
... ... @@ -205,7 +251,7 @@
}).then(() => {
this.listLoading = true;
//NProgress.start();
let para = { userId: row.userId };
let para = { permissionId: row.permissionId };
remove(para).then((res) => {
this.listLoading = false;
//NProgress.done();
... ... @@ -213,7 +259,7 @@
message: '删除成功',
type: 'success'
});
this.getRoles();
this.getTableList();
}).catch((error) => {
this.listLoading = false;
alert(error);
... ... @@ -251,18 +297,6 @@
this.editLoading = true;
//NProgress.start();
let para = Object.assign({}, this.editForm);
//不需要提交的 去掉，后端不好接收
para.authorities = null;
para.permissions = null;
para.roles = null;
// para.birth = (!para.birth || para.birth == '') ? '' : util.formatDate.format(new Date(para.birth), 'yyyy-MM-dd');
/*
查询之后格式this.filters.column.create_start_date中日期发生变化;
Wed Aug 09 2017 00:00:00 GMT+0800 (中国标准时间) 变成了 "2017-08-08T16:00:00.000Z";
所以使用 moment 日期格式化插件将时间转换成 [ Wed Aug 09 2017 00:00:00 GMT+0800 (中国标准时间) ] 格
式;
*/
/*moment 安装 npm install moment --save*/
para.creattime = moment(para.creattime).format('YYYY-MM-DD HH:mm:ss');
this.editLoading = false;
edit(para).then((res) => {
... ... @@ -274,7 +308,7 @@
});
this.$refs['editForm'].resetFields();
this.editFormVisible = false;
this.getRoles();
this.getTableList();
}).catch(error => alert(error));
});
}
... ... @@ -298,7 +332,7 @@
});
this.$refs['addForm'].resetFields();
this.addFormVisible = false;
this.getRoles();
this.getTableList();
}).catch(error => alert(error));
});
}
... ... @@ -309,7 +343,7 @@
},
//批量删除
batchRemove: function () {
var ids = this.sels.map(item => item.id).toString();
var ids = this.sels.map(item => item.permissionId).toString();
this.$confirm('确认删除选中记录吗？', '提示', {
type: 'warning'
}).then(() => {
... ... @@ -323,7 +357,7 @@
message: '删除成功',
type: 'success'
});
this.getRoles();
this.getTableList();
});
}).catch(() => {
... ...
... ... @@ -41,7 +41,7 @@
<!--工具条-->
<el-col :span="24" class="toolbar">
<el-button type="danger" @click="batchRemove" :disabled="this.sels.length===0">批量删除</el-button>
<el-pagination layout="prev, pager, next" @current-change="handleCurrentChange" :page-size="5" :total="total" style="float:right;">
<el-pagination layout="total, prev, pager, next" @current-change="handleCurrentChange" :page-size="5" :total="total" style="float:right;">
</el-pagination>
</el-col>
... ...
... ... @@ -56,7 +56,7 @@
<!--工具条-->
<el-col :span="24" class="toolbar">
<el-button type="danger" @click="batchRemove" :disabled="this.sels.length===0">批量删除</el-button>
<el-pagination layout="prev, pager, next" @current-change="handleCurrentChange" :page-size="10" :total="total" style="float:right;">
<el-pagination layout="total, prev, pager, next" @current-change="handleCurrentChange" :page-size="10" :total="total" style="float:right;">
</el-pagination>
</el-col>
... ... @@ -168,9 +168,9 @@
<el-form-item label="账号">
<span>{{roleEditForm.username}}</span>
</el-form-item>
<el-checkbox-group v-model="roleIds" size="small">
<el-checkbox-button v-for="role in roles" :label="role.roleId" :key="role.roleId" >{{role.description}}</el-checkbox-button>
</el-checkbox-group>
<el-checkbox-group v-model="roleIds" size="small">
<el-checkbox-button v-for="role in roles" :label="role.roleId" :key="role.roleId" >{{role.description}}</el-checkbox-button>
</el-checkbox-group>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click.native="roleFormVisible = false">取消</el-button>
... ... @@ -346,9 +346,6 @@
}else {
alert(error);
}
});
},
... ... @@ -409,9 +406,8 @@
if (valid) {
this.$confirm('确认提交吗？', '提示', {}).then(() => {
this.addLoading = true;
//NProgress.start();
let para = Object.assign({}, this.addForm);
para.birth = (!para.birth || para.birth == '') ? '' : util.formatDate.format(new Date(para.birth), 'yyyy-MM-dd');
// para.birth = (!para.birth || para.birth == '') ? '' : util.formatDate.format(new Date(para.birth), 'yyyy-MM-dd');
addUser(para).then((res) => {
this.addLoading = false;
//NProgress.done();
... ...