Commit 7ae43b29 authored by 拾柒's avatar 拾柒

修改数据表格操作的间隙过大的问题,同时修改用户界面重置字样改成重置密码字样

parent a1c2f607
...@@ -150,6 +150,7 @@ ...@@ -150,6 +150,7 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
class = "errorCat"
size="mini" size="mini"
type="text" type="text"
@click="handleView(scope.row,scope.index)" @click="handleView(scope.row,scope.index)"
...@@ -578,5 +579,9 @@ export default { ...@@ -578,5 +579,9 @@ export default {
margin-bottom:10px margin-bottom:10px
} }
} }
.errorCat{
margin-left: 10px;
margin-right: 20px;
}
</style> </style>
...@@ -150,6 +150,7 @@ ...@@ -150,6 +150,7 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
class = "operCat"
size="mini" size="mini"
type="text" type="text"
@click="handleView(scope.row,scope.index)" @click="handleView(scope.row,scope.index)"
...@@ -576,5 +577,9 @@ export default { ...@@ -576,5 +577,9 @@ export default {
margin-bottom:10px margin-bottom:10px
} }
} }
.operCat{
margin-right: 20px;
margin-left: 10px;
}
</style> </style>
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
<!-- style="color: #49cec9"--> <!-- style="color: #49cec9"-->
<!-- @click="handleUpdate(scope.row)"--> <!-- @click="handleUpdate(scope.row)"-->
<!-- >修改</el-button>--> <!-- >修改</el-button>-->
<coolbutton :type="typeParent" style="color: #49cec9" :name="updataName" :size="size" :haspermi="updateHaspermi" @btn-click="handleUpdate(scope.row)" /> <coolbutton :type="typeParent" class = "dictUpdata" style="color: #49cec9" :name="updataName" :size="size" :haspermi="updateHaspermi" @btn-click="handleUpdate(scope.row)" />
<!-- <el-button--> <!-- <el-button-->
<!-- v-hasPermi="['sys:dict:remove']"--> <!-- v-hasPermi="['sys:dict:remove']"-->
<!-- size="mini"--> <!-- size="mini"-->
...@@ -633,4 +633,8 @@ export default { ...@@ -633,4 +633,8 @@ export default {
} }
} }
} }
.dictUpdata{
margin-left: 10px;
margin-right: 20px;
}
</style> </style>
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<!-- style="color: #49cec9"--> <!-- style="color: #49cec9"-->
<!-- @click="handleUpdate(scope.row)"--> <!-- @click="handleUpdate(scope.row)"-->
<!-- >修改</el-button>--> <!-- >修改</el-button>-->
<coolbutton style="color: #49cec9" :type="typeParent" :name="updataName" :size="size" :haspermi="updateHaspermi" @btn-click="handleUpdate(scope.row)" /> <coolbutton style="margin-right: 30px color: #49cec9" :type="typeParent" :name="updataName" :size="size" :haspermi="updateHaspermi" @btn-click="handleUpdate(scope.row)" />
<el-switch <el-switch
v-model="scope.row.flag" v-model="scope.row.flag"
active-value="1" active-value="1"
...@@ -598,10 +598,10 @@ export default { ...@@ -598,10 +598,10 @@ export default {
.table-drop{ .table-drop{
vertical-align: 2px; vertical-align: 2px;
line-height: 20px; line-height: 20px;
margin-left: 15px margin-left: 25px
} }
.el-switch{ .el-switch{
margin-left: 15px; margin-left: 25px;
} }
.icon-list { .icon-list {
div { div {
......
...@@ -422,6 +422,7 @@ export default { ...@@ -422,6 +422,7 @@ export default {
/** 查询菜单树结构 */ /** 查询菜单树结构 */
getMenuTreeselect() { getMenuTreeselect() {
menuTreeselect().then(response => { menuTreeselect().then(response => {
console.info(response.data)
this.menuOptions = response.data this.menuOptions = response.data
}) })
}, },
......
...@@ -444,7 +444,7 @@ export default { ...@@ -444,7 +444,7 @@ export default {
typePrimary: 'primary', typePrimary: 'primary',
typeSuccess: 'success', typeSuccess: 'success',
nameParent: '删除', nameParent: '删除',
resetName: '重置', resetName: '重置密码',
addName: '新增', addName: '新增',
exportName: '导出', exportName: '导出',
updataName: '修改', updataName: '修改',
...@@ -666,6 +666,7 @@ export default { ...@@ -666,6 +666,7 @@ export default {
this.loading = true this.loading = true
listUser(this.queryParams).then(response => { listUser(this.queryParams).then(response => {
this.userList = response.rows this.userList = response.rows
console.info(this.userList)
this.total = response.total this.total = response.total
this.loading = false this.loading = false
} }
......
...@@ -82,7 +82,7 @@ module.exports = { ...@@ -82,7 +82,7 @@ module.exports = {
// target: `http://192.168.1.29:8082/`, // target: `http://192.168.1.29:8082/`,
// target: `http://10.5.87.231:10010/internal`, // 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:20075/`, target: `http://localhost:8082/`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: '' ['^' + 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