Skip to content

9
91isoft_vue_manage
Commit caebd246 authored by 杨硕's avatar 杨硕
Browse files
Options

完善模版项目

parent 39e63d54
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1157 additions and 520 deletions
src/api/monitor/errorLog.js
View file @ caebd246
import request from '@/utils/request'
import Qs from 'qs'
// 查询异常日志列表
export function list(query) {
return request({
url: '/monitor/errorLog/list',
url: '/monitor/errorLog/queryErrorLogListByPagination',
method: 'get',
params: query
})
}
// 删除异常日志
export function delErrLog(operId) {
export function delErrLog(data) {
// data = Qs.stringify(data)
return request({
url: '/monitor/errorLog/' + operId,
method: 'delete'
url: '/monitor/errorLog/delete',
method: 'post',
data,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})
}
......
src/api/monitor/loginInfo.js
View file @ caebd246
import request from '@/utils/request'
import Qs from 'qs'
// 查询登录日志列表
export function list(query) {
return request({
url: '/monitor/loginInfo/list',
url: '/monitor/loginInfo/querySysLoginListByPagination',
method: 'get',
params: query
})
}
// 删除登录日志
export function delLogininfo(infoId) {
export function delLogininfo(data) {
// data = Qs.stringify(data)
return request({
url: '/monitor/loginInfo/' + infoId,
method: 'delete'
url: '/monitor/loginInfo/delete',
method: 'post',
data,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})
}
......
src/api/monitor/operLog.js
View file @ caebd246
import request from '@/utils/request'
import Qs from 'qs'
// 查询操作日志列表
export function list(query) {
return request({
url: '/monitor/operLog/list',
url: '/monitor/operLog/queryOperLogListByPagination',
method: 'get',
params: query
})
}
// 删除操作日志
export function delOperLog(operId) {
export function delOperLog(data) {
// data = Qs.stringify(data)
return request({
url: '/monitor/operLog/' + operId,
method: 'delete'
url: '/monitor/operLog/delete',
method: 'post',
data,
headers: {
'Content-Type': 'application/json;charset=UTF-8'
}
})
}
......
src/api/system/role.js
View file @ caebd246
......@@ -8,6 +8,12 @@ export function listRole(query) {
params: query
})
}
export function getlistRole() {
return request({
url: 'system/role/listAll',
method: 'get'
})
}
// 查询角色详细
export function getRole(businessId) {
......
src/api/system/user.js
View file @ caebd246
......@@ -40,10 +40,10 @@ export function addUser(data) {
// 修改用户
export function updateUser(data) {
const businessId = data.businessId
// const businessId = data.businessId
data = Qs.stringify(data)
return request({
url: '/system/user/update/' + businessId,
url: '/system/user/update',
method: 'put',
data: data,
headers: {
......
src/views/monitor/errorLog/index.vue
View file @ caebd246
......@@ -98,7 +98,7 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column :show-overflow-tooltip="true" label="日志编号" width="100" align="center" prop="businessId">
<template slot-scope="scope">
{{ scope.row.operId || '-' }}
{{ scope.row.businessId || '-' }}
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" label="系统模块" align="center" prop="systemMode">
......@@ -200,9 +200,9 @@
</el-col>
</el-row>
</el-form>
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button @click="open = false">关 闭</el-button>-->
<!-- </div>-->
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button @click="open = false">关 闭</el-button>-->
<!-- </div>-->
</el-dialog>
</div>
</template>
......@@ -315,7 +315,7 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.operId)
this.ids = selection.map(item => item.businessId)
},
/** 详细按钮操作 */
handleView(row) {
......@@ -329,7 +329,13 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
return delErrLog(this.ids)
const id = this.ids.join(',')
// TODO: clear this log
console.log(`this.ids`, id)
const query = {
deleteIds: id
}
return delErrLog(query)
}).then(() => {
this.getList()
this.$message.success('删除成功')
......@@ -384,7 +390,7 @@ export default {
}
</script>
<style lang="scss" scoped>
.app-container-errlog {
.app-container-errlog {
padding: 0;
font-size: 18px;
.placeholder{
......@@ -392,6 +398,6 @@ export default {
background-color: #F4F4F4;
margin-bottom:10px
}
}
}
</style>
src/views/monitor/loginInfo/index.vue
View file @ caebd246
......@@ -80,50 +80,60 @@
<div style="padding:10px">
<div class="mb12 font-small-bold">登录日志列表</div>
<el-table v-loading="loading" border :data="list" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" />-->
<!-- &lt;!&ndash; <el-table-column type="index" label="序号" width="50" />&ndash;&gt;-->
<!-- <el-table-column label="访问编号" width="100" align="center" prop="infoId" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.infoId || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="用户名称" align="center" prop="userName" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.userName || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="登录地址" align="center" prop="ipaddr" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.ipaddr || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="操作信息" align="center" prop="msg" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.msg || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- &lt;!&ndash; <el-table-column label="登录地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />&ndash;&gt;-->
<!-- <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />-->
<!-- &lt;!&ndash; <el-table-column label="浏览器" align="center" prop="browser" show-overflow-tooltip>&ndash;&gt;-->
<!-- &lt;!&ndash; <template slot-scope="scope">&ndash;&gt;-->
<!-- &lt;!&ndash; {{ scope.row.browser || '-' }}&ndash;&gt;-->
<!-- &lt;!&ndash; </template>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-table-column>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-table-column label="操作系统" align="center" prop="os" show-overflow-tooltip>&ndash;&gt;-->
<!-- &lt;!&ndash; <template slot-scope="scope">&ndash;&gt;-->
<!-- &lt;!&ndash; {{ scope.row.os || '-' }}&ndash;&gt;-->
<!-- &lt;!&ndash; </template>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-table-column>&ndash;&gt;-->
<!-- <el-table-column label="登录状态" align="center" prop="status" :formatter="statusFormat" />-->
<!-- <el-table-column type="selection" width="55" align="center" />-->
<!-- &lt;!&ndash; <el-table-column type="index" label="序号" width="50" />&ndash;&gt;-->
<!-- <el-table-column label="访问编号" width="100" align="center" prop="infoId" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.infoId || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="用户名称" align="center" prop="userName" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.userName || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="登录地址" align="center" prop="ipaddr" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.ipaddr || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="操作信息" align="center" prop="msg" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.msg || '-' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- &lt;!&ndash; <el-table-column label="登录地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />&ndash;&gt;-->
<!-- <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />-->
<!-- &lt;!&ndash; <el-table-column label="浏览器" align="center" prop="browser" show-overflow-tooltip>&ndash;&gt;-->
<!-- &lt;!&ndash; <template slot-scope="scope">&ndash;&gt;-->
<!-- &lt;!&ndash; {{ scope.row.browser || '-' }}&ndash;&gt;-->
<!-- &lt;!&ndash; </template>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-table-column>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-table-column label="操作系统" align="center" prop="os" show-overflow-tooltip>&ndash;&gt;-->
<!-- &lt;!&ndash; <template slot-scope="scope">&ndash;&gt;-->
<!-- &lt;!&ndash; {{ scope.row.os || '-' }}&ndash;&gt;-->
<!-- &lt;!&ndash; </template>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-table-column>&ndash;&gt;-->
<!-- <el-table-column label="登录状态" align="center" prop="status" :formatter="statusFormat" />-->
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="访问编号" align="center" prop="infoId" />
<el-table-column label="访问编号" align="center" prop="businessId" />
<el-table-column label="用户名称" align="center" prop="username" />
<el-table-column label="登录地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
<el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
<!-- <el-table-column label="浏览器" align="center" prop="browser" />
<el-table-column label="操作系统" align="center" prop="os" />-->
<el-table-column label="登录状态" align="center" prop="status" :formatter="statusFormat" />
<el-table-column label="提示信息" align="center" prop="msg" />
<!-- <el-table-column label="登录状态" align="center" prop="status" :formatter="statusFormat" />-->
<el-table-column label="登录状态" align="center" prop="status">
<template slot-scope="scope">
<span v-if="scope.row.status === '0'">失败</span>
<span v-if="scope.row.status === '1'">成功</span>
</template>
</el-table-column>
<el-table-column label="提示信息" align="center">
<template slot-scope="scope">
{{ scope.row.msg || '-' }}
</template>
</el-table-column>
<el-table-column label="登录时间" align="center" prop="loginTime" width="180" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.loginTime) | transformDateByFormat('YYYY-MM-DD HH:mm:ss') }}</span>
......@@ -144,8 +154,10 @@
<script>
import { list, delLogininfo, cleanLogininfo, exportLogininfo } from '@/api/monitor/loginInfo'
import dictCons from '@/utils/dictCons'
import Template from '@/views/instance/Template'
export default {
name: 'LoginInfo',
components: { Template },
data() {
return {
// 遮罩层
......@@ -226,7 +238,7 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.infoId)
this.ids = selection.map(item => item.businessId)
this.multiple = !selection.length
},
/** 删除按钮操作 */
......@@ -236,7 +248,13 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
return delLogininfo(this.ids)
const id = this.ids.join(',')
// TODO: clear this log
console.log(`this.ids`, id)
const query = {
deleteIds: id
}
return delLogininfo(query)
}).then(() => {
this.getList()
this.$message.success('删除成功')
......@@ -291,7 +309,7 @@ export default {
}
</script>
<style lang="scss" scoped>
.app-container {
.app-container {
padding: 0;
font-size: 18px;
.placeholder{
......@@ -299,6 +317,6 @@ export default {
background-color: #F4F4F4;
margin-bottom:10px
}
}
}
</style>
src/views/monitor/operLog/index.vue
View file @ caebd246
......@@ -98,7 +98,7 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column :show-overflow-tooltip="true" label="日志编号" width="100" align="center" prop="operId">
<template slot-scope="scope">
{{ scope.row.operId || '-' }}
{{ scope.row.businessId || '-' }}
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" label="系统模块" align="center" prop="systemMode">
......@@ -200,9 +200,9 @@
<!-- </el-col>-->
</el-row>
</el-form>
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button @click="open = false">关 闭</el-button>-->
<!-- </div>-->
<!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button @click="open = false">关 闭</el-button>-->
<!-- </div>-->
</el-dialog>
</div>
</template>
......@@ -316,7 +316,7 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.operId)
this.ids = selection.map(item => item.businessId)
},
/** 详细按钮操作 */
handleView(row) {
......@@ -330,7 +330,14 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
return delOperLog(this.ids)
const id = this.ids.join(',')
// TODO: clear this log
console.log(`this.ids`, id)
const query = {
deleteIds: id
}
// const deleteIds = JSON.stringify(query)
return delOperLog(query)
}).then(() => {
this.getList()
this.$message.success('删除成功')
......@@ -385,7 +392,7 @@ export default {
}
</script>
<style lang="scss" scoped>
.app-container-operlog {
.app-container-operlog {
padding: 0;
font-size: 18px;
.placeholder{
......@@ -393,6 +400,6 @@ export default {
background-color: #F4F4F4;
margin-bottom:10px
}
}
}
</style>
src/views/system/dict/data.vue
View file @ caebd246
This diff is collapsed.
src/views/system/role/index.vue
View file @ caebd246
......@@ -109,13 +109,13 @@
style="color: #49cec9"
@click="handleUpdate(scope.row)"
>修改</el-button>
<el-button
v-hasPermi="['sys:role:update']"
size="mini"
type="text"
icon="el-icon-circle-check"
@click="handleMenu(scope.row)"
>数据权限</el-button>
<!-- <el-button-->
<!-- v-hasPermi="['sys:role:update']"-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-circle-check"-->
<!-- @click="handleMenu(scope.row)"-->
<!-- >数据权限</el-button>-->
<el-button
size="mini"
type="text"
......@@ -674,7 +674,7 @@ export default {
}
</script>
<style lang="scss" scoped>
.app-container {
.app-container {
font-size: 18px;
padding: 0;
......@@ -693,9 +693,9 @@ export default {
.el-switch {
margin-left: 15px;
}
}
.el-divider--vertical{
}
.el-divider--vertical{
height: 12em;
width: 4px;
}
}
</style>
src/views/system/user/index.vue
View file @ caebd246
......@@ -43,14 +43,14 @@
<el-button type="primary" style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</el-form-item>
<el-form-item style="float: right">
<!-- <el-button-->
<!-- v-hasPermi="['sys:user:add']"-->
<!-- style="padding: 8px 7px;"-->
<!-- type="primary"-->
<!-- size="small"-->
<!-- icon="el-icon-plus"-->
<!-- @click="handleFormAdd"-->
<!-- >表单页新增模板</el-button>-->
<!-- <el-button-->
<!-- v-hasPermi="['sys:user:add']"-->
<!-- style="padding: 8px 7px;"-->
<!-- type="primary"-->
<!-- size="small"-->
<!-- icon="el-icon-plus"-->
<!-- @click="handleFormAdd"-->
<!-- >表单页新增模板</el-button>-->
<el-button
v-hasPermi="['sys:user:add']"
style="padding: 8px 7px;"
......@@ -129,7 +129,7 @@
{{ scope.row.username || '-' }}
</template>
</el-table-column>
<el-table-column label="用户类型" prop="userType" :show-overflow-tooltip="true">
<el-table-column label="用户名称" prop="userType" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.name || '-' }}
</template>
......@@ -248,8 +248,8 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="用户类型" prop="name">
<el-input v-model.trim="form.name" placeholder="请输入用户类型" />
<el-form-item label="用户名称" prop="name">
<el-input v-model.trim="form.name" placeholder="请输入用户名称" />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -273,11 +273,10 @@
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="岗位" prop="postId">
<el-form-item label="部门" prop="postId">
<treeSelect
v-model="form.postId"
v-model="form.deptId"
:disable-branch-nodes="true"
multiple
:options="deptChildren"
:show-count="true"
placeholder="请选择归属部门"
......@@ -286,6 +285,20 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="角色" prop="postId">
<el-select v-model="form.roleList" multiple placeholder="请选择" style="width: 100%" @change="roleChange">
<el-option
v-for="item in options"
:key="item.businessId"
:label="item.roleName"
:value="item.businessId"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注">
......@@ -387,6 +400,7 @@ import { getToken } from '@/utils/auth'
import { getChildrenDept, treeselect } from '@/api/system/dept'
import TreeSelect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import { getlistRole, listRole } from '@/api/system/role'
export default {
name: 'User',
......@@ -456,6 +470,7 @@ export default {
deptOptionsTree: undefined,
currentNode: undefined,
currentNodeKey: false,
options: [],
// 是否显示弹出层
open: false,
// 部门名称
......@@ -615,9 +630,10 @@ export default {
}
this.getList()
this.getTreeSelect()
this.getConfigKey('sys.user.initPassword').then(response => {
this.initPassword = response.msg
})
this.getRole()
// this.getConfigKey('sys.user.initPassword').then(response => {
// this.initPassword = response.msg
// })
},
methods: {
changeValue() {
......@@ -633,6 +649,11 @@ export default {
}
)
},
roleChange(e) {
// TODO: clear this log
console.log(`e`, e)
this.$forceUpdate()
},
/** 查询部门下拉树结构 */
getTreeSelect() {
treeselect().then(response => {
......@@ -648,11 +669,18 @@ export default {
},
/** 查询子部门 */
getChildrenDept(userId) {
getChildrenDept(userId).then(response => {
this.deptChildren = response.data.postChildren
this.form.postId = response.data.checkedKeys
treeselect().then(response => {
this.deptChildren = response.data
// this.form.postId = response.data.checkedKeys
})
},
getRole() {
getlistRole().then(
response => {
this.options = response.data
}
)
},
// 筛选节点
filterNode(value, data) {
if (!value) return true
......@@ -754,6 +782,15 @@ export default {
getUser(userId).then(response => {
this.open = true
this.form = response.data
const data = response.data.roleIds.split(',')
// TODO: clear this log
console.log(`data`, data)
this.form.roleList = []
data.forEach(item => {
const id = Number(item)
this.form.roleList.push(id)
})
// this.form.postId = response.data.deptId
this.title = '修改'
})
this.getChildrenDept(userId)
......@@ -954,22 +991,22 @@ export default {
}
</script>
<style lang="scss" scoped>
.user-manage {
.user-manage {
font-size: 18px;
.placeholder{
height:14px;
background-color: #F4F4F4
}
}
.table-drop{
}
.table-drop{
margin-left: 15px;
font-size: 16px;
font-weight: bold;
color: #46BCF3;
}
}
</style>
<style lang="scss">
.user-manage {
.user-manage {
.formClass {
}
.paddingFixed {
......@@ -980,5 +1017,5 @@ export default {
.el-form-item__label-wrap {
margin-left: 0!important;
}
}
}
</style>
vue.config.js
View file @ caebd246
......@@ -79,9 +79,10 @@ module.exports = {
// }
// },
[process.env.VUE_APP_BASE_API]: {
// target: `http://192.168.1.17:10010/internal`,
// target: `http://192.168.1.29:8088/`,
// target: `http://10.5.87.231:10010/internal`,
target: `http://117.122.212.91:32012/`,
// target: `http://117.122.212.91:32012/`,
target: `http://192.144.239.97:20070/`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
......
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