odjbin/tunnel-cloud-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

邓洁 : 修改页面细节

Browse Source
This commit is contained in:
邓洁
2023-11-06 23:45:22 +08:00
parent 5d9c841728
commit fa4af69d4c
19 changed files with 176 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/custom-query/data-adapter/index.vue
View File

@@ -225,7 +225,7 @@ const handleDelete = async (adapterId) => {
}
//多删
const handleMoreDelete=(adapterIds)=>{
ElMessageBox.confirm(`确认删除名称为${adapterNameList}的适配器吗?`, '系统提示', {
ElMessageBox.confirm(`确认删除名称为${adapterNameList.value}的适配器吗?`, '系统提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'

14
src/views/custom-query/datamodel/index.vue
View File

@@ -21,7 +21,7 @@
<div class="query-btn">
<el-button type="primary" v-perm="['query:source:add']" @click="handleAdd" :icon="Plus" plain>新增</el-button>
<el-button type="danger" :icon="Delete" v-perm="['query:source:del']"
@click="handleMoreDelete(sourceId)" :disabled="disabled" plain>删除
@click="handleMoreDelete(sourceId,sourceName)" :disabled="disabled" plain>删除
</el-button>
<el-button type="warning" v-perm="['query:source:export']" @click="handleExport" :icon="Download" plain>导出
</el-button>
@@ -332,15 +332,11 @@ const handleExport = () => {
}
//勾选table数据行的 Checkbox
const handleSelect = async (selection, row) => {
const handleSelect = async (selection) => {
if (selection.length !== 0) {
disabled.value = false
sourceId.value = row.id
sourceName.value = row.dsName
if (selection.length > 1) {
const del_row = selection.shift();
singleTable.value.toggleRowSelection(del_row, false);
}
sourceId.value = selection.map(item => item.id).join()
sourceName.value = selection.map(item => item.dsName).join()
} else {
disabled.value = true
}
@@ -369,7 +365,7 @@ const handleDelete = async (id) => {
})
}
//多删
const handleMoreDelete = (sourceId) => {
const handleMoreDelete = (sourceId, sourceName) => {
ElMessageBox.confirm(`确认删除名称为${sourceName}的数据模型吗?`, '系统提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',

2
src/views/custom-query/topo/index.vue
View File

@@ -273,7 +273,7 @@ const handleDelete = async (id) => {
}
//多删
const handleMoreDelete = (uqIds) => {
ElMessageBox.confirm(`确认删除名称为${uqNameList}的拓扑图查询吗?`, '系统提示', {
ElMessageBox.confirm(`确认删除名称为${uqNameList.value}的拓扑图查询吗?`, '系统提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'

2
src/views/monitor/online/index.vue
View File

@@ -34,7 +34,7 @@
<el-table-column prop="loginTime" label="登录时间" sortable align="center"/>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button type="text" size="mini" @click="handleForcedOffline(scope.row)" :icon="Delete" style="color: red">强制下线</el-button>
<el-button type="text" size="mini" @click="handleForcedOffline(scope.row)" style="color: red">强制下线</el-button>
</template>
</el-table-column>
</el-table>

2
src/views/rapid/gen/importTable.vue
View File

@@ -49,7 +49,7 @@
<el-table-column prop="updateTime" label="更新时间" sortable align="center"/>
<el-table-column label="操作">
<template #default="scope">
<el-button type="text" size="mini" @click="handleImport(scope.row)" :icon="View">导入</el-button>
<el-button type="text" size="mini" @click="handleImport(scope.row)" >导入</el-button>
</template>
</el-table-column>
</el-table>

34
src/views/rapid/gen/index.vue
View File

@@ -21,10 +21,11 @@
<el-config-provider>
<el-date-picker
v-model="dateValue"
type="daterange"
type="datetimerange"
:shortcuts="shortcuts"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-config-provider>
</el-form-item>
@@ -134,6 +135,35 @@ const list = ref([])
const loading = ref(true)
const total = ref()
const dateValue = ref()
const shortcuts = [
{
text: "上周",
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
return [start, end];
}
},
{
text: "上月",
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
return [start, end];
}
},
{
text: "三月前",
value: () => {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
return [start, end];
}
}
];
const dataSourceOption = ref()
const code = ref()
const genForm = ref()

35
src/views/rapid/regular/index.vue
View File

@@ -21,13 +21,13 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleSearch()" :icon="Search">搜索</el-button>
<el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
<el-button @click="handleReset" :icon="Refresh">重置</el-button>
</el-form-item>
</el-form>
<div class="query-btn">
<el-button type="primary" v-perm="['rapid:regular:add']" @click="handleAdd" :icon="Plus" plain>新增</el-button>
<el-button type="danger" v-perm="['rapid:regular:del']" @click="handleDelete" :icon="Delete" plain
<el-button type="danger" v-perm="['rapid:regular:del']" @click="handleMoreDelete(regularId,regularNameList)" :icon="Delete" plain
:disabled="disabled">删除
</el-button>
<el-button type="warning" v-perm="['rapid:regular:export']" @click="handleExport" :icon="Download" plain>导出
@@ -56,11 +56,10 @@
<el-table-column label="操作">
<template #default="scope">
<el-button type="text" size="mini" v-perm="['rapid:regular:edit']"
@click="handleEdit(scope.row.id)" :icon="Edit">编辑
</el-button>
<el-button type="text" size="mini" v-perm="['rapid:regular:del']" @click="handleDelete(scope.row)"
:icon="Delete">删除
@click="handleEdit(scope.row.id)" >编辑
</el-button>
<popover-delete :name="scope.row.name" :type="'正则校验'" :perm="['rapid:regular:del']"
@delete="handleDelete(scope.row.id)"/>
</template>
</el-table-column>
</el-table>
@@ -137,6 +136,8 @@ const pageInfo = reactive({
const disabled = ref(true)
const list = ref([])
const queryForm = ref([])
const regularId = ref([])
const regularNameList = ref([])
const loading = ref(true)
const total = ref()
const singleTable = ref()
@@ -158,10 +159,6 @@ const formRules = ref({
{required: true, message: "是否启用 1:启动 2:关闭不能为空", trigger: "change"},
],
})
//搜索功能
const handleSearch = () => {
getList()
}
//重置搜索
const handleReset = () => {
queryForm.value.resetFields()
@@ -262,11 +259,8 @@ const handleExport = () => {
const handleSelect = async (selection, row) => {
if (selection.length !== 0) {
disabled.value = false
id.value = row.id
if (selection.length > 1) {
const del_row = selection.shift();
singleTable.value.toggleRowSelection(del_row, false);
}
regularId.value = selection.map(item => item.id).join()
regularNameList.value = selection.map(item => item.name).join()
} else {
disabled.value = true
}
@@ -283,13 +277,17 @@ const handleCurrentChange = async (val) => {
pageInfo.value.pageNum = val
await getList()
}
//删除
const handleDelete = async ({dsName, id}) => {
ElMessageBox.confirm(`确认删除名称为${dsName}的校验规则表吗?`, '系统提示', {
const handleMoreDelete=(regularId,regularNameList)=>{
ElMessageBox.confirm(`确认删除名称为${regularNameList}的校验规则表吗?`, '系统提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
handleDelete(regularId)
})
}
//删除
const handleDelete = async (id) => {
delRegular(id).then(res => {
if (res.code === 1000) {
ElMessage.success(res.msg)
@@ -298,7 +296,6 @@ const handleDelete = async ({dsName, id}) => {
ElMessage.error(res.msg)
}
})
})
}
getList()
</script>

29
src/views/rapid/source/index.vue
View File

@@ -11,7 +11,9 @@
</el-form>
<div class="query-btn">
<el-button type="primary" @click="handleAdd" :icon="Plus" plain>新增</el-button>
<el-button type="danger" @click="handleDelete" :icon="Delete" plain :disabled="disabled">删除</el-button>
<el-button type="danger" @click="handleMoreDelete(sourceId,sourceNameList)" :icon="Delete" plain
:disabled="disabled">删除
</el-button>
<el-button type="danger" @click="handleExport" :icon="Download" plain>导出</el-button>
</div>
<div class="table">
@@ -37,8 +39,9 @@
<el-table-column prop="createTime" label="创建时间" align="center"/>
<el-table-column label="操作">
<template #default="scope">
<el-button type="text" size="mini" @click="handleEdit(scope.row.dsId)" :icon="Edit">编辑</el-button>
<el-button type="text" size="mini" @click="handleDelete(scope.row)" :icon="Delete">删除</el-button>
<el-button type="text" size="mini" @click="handleEdit(scope.row.dsId)" >编辑</el-button>
<popover-delete :name="scope.row.dsName" :type="'数据源信息'"
@delete="handleDelete(scope.row.dsId)"/>
</template>
</el-table-column>
</el-table>
@@ -166,6 +169,7 @@ const total = ref()
const title = ref('')
const isVisited = ref(false)
const sourceId = ref();
const sourceNameList = ref();
const singleTable = ref();
const form = ref()
const formInstance = ref()
@@ -318,14 +322,11 @@ const handleExport = () => {
}
//勾选table数据行的 Checkbox
const handleSelect = async (selection, row) => {
const handleSelect = async (selection) => {
if (selection.length !== 0) {
disabled.value = false
sourceId.value = row.dsId
if (selection.length > 1) {
const del_row = selection.shift();
singleTable.value.toggleRowSelection(del_row, false);
}
sourceId.value = selection.map(item => item.dsId).join()
sourceNameList.value = selection.map(item => item.dsName).join()
} else {
disabled.value = true
}
@@ -342,13 +343,16 @@ const handleCurrentChange = async (val) => {
pageInfo.value.pageNum = val
await getList()
}
const handleDelete = async ({dsName, dsId}) => {
ElMessageBox.confirm(`确认删除名称为${dsName}的数据源信息吗?`, '系统提示', {
const handleMoreDelete = (dsId, sourceNameList) => {
ElMessageBox.confirm(`确认删除名称为${sourceNameList}的数据源信息吗?`, '系统提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
handleDelete(dsId)
})
}
const handleDelete = async (dsId) => {
deleteDataSource(dsId).then(res => {
if (res.code === 1000) {
ElMessage.success(res.msg)
@@ -357,7 +361,6 @@ const handleDelete = async ({dsName, dsId}) => {
ElMessage.error(res.msg)
}
})
})
}
getList()
</script>

31
src/views/system/config/index.vue
View File

@@ -24,7 +24,7 @@
</el-form>
<div class="query-btn">
<el-button type="primary" v-perm="['admin:config:add']" @click="handleAdd" :icon="Plus" plain>新增</el-button>
<el-button type="danger" v-perm="['admin:config:del']" @click="handleDelete" :icon="Delete" plain
<el-button type="danger" v-perm="['admin:config:del']" @click="handleMoreDelete(configIds,configNameList)" :icon="Delete" plain
:disabled="disabled">删除
</el-button>
<el-button type="warning" v-perm="['admin:config:export']" @click="handleExport" :icon="Download" plain>导出
@@ -52,11 +52,10 @@
<el-table-column label="操作">
<template #default="scope">
<el-button type="text" size="mini" v-perm="['admin:config:edit']"
@click="handleEdit(scope.row.configId)" :icon="Edit">编辑
</el-button>
<el-button type="text" size="mini" v-perm="['admin:config:del']" @click="handleDelete(scope.row)"
:icon="Delete">删除
@click="handleEdit(scope.row.configId)" >编辑
</el-button>
<popover-delete :name="scope.row.dsName" :type="'参数配置表'" :perm="['admin:config:del']"
@delete="handleDelete(scope.row.configId)"/>
</template>
</el-table-column>
</el-table>
@@ -136,6 +135,8 @@ const pageInfo = reactive({
const disabled = ref(true)
const list = ref([])
const queryForm = ref([])
const configIds = ref([])
const configNameList = ref([])
const loading = ref(true)
const total = ref()
const title = ref('')
@@ -258,14 +259,11 @@ const handleExport = () => {
}
//勾选table数据行的 Checkbox
const handleSelect = async (selection, row) => {
const handleSelect = async (selection) => {
if (selection.length !== 0) {
disabled.value = false
configId.value = row.configId
if (selection.length > 1) {
const del_row = selection.shift();
singleTable.value.toggleRowSelection(del_row, false);
}
configIds.value = selection.map(item => item.configId).join()
configNameList.value = selection.map(item => item.configName).join()
} else {
disabled.value = true
}
@@ -282,13 +280,17 @@ const handleCurrentChange = async (val) => {
pageInfo.value.pageNum = val
await getList()
}
//删除
const handleDelete = async ({dsName, configId}) => {
ElMessageBox.confirm(`确认删除名称为${dsName}的参数配置表吗?`, '系统提示', {
const handleMoreDelete = (configId,configName) => {
ElMessageBox.confirm(`确认删除名称为${configName}的参数配置表吗?`, '系统提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
handleDelete(configId)
})
}
//删除
const handleDelete = async (configId) => {
delConfig(configId).then(res => {
if (res.code === 1000) {
ElMessage.success(res.msg)
@@ -297,7 +299,6 @@ const handleDelete = async ({dsName, configId}) => {
ElMessage.error(res.msg)
}
})
})
}
getList()
</script>

14
src/views/system/dept/index.vue
View File

@@ -45,8 +45,8 @@
<template #default="scope">
<el-button type="text" size="mini" @click="handleAddLine(scope.row.deptId)">新增</el-button>
<el-button type="text" size="mini" @click="handleEdit(scope.row.deptId)">修改</el-button>
<el-button type="text" size="mini" v-if="scope.row.parentId!==0" @click="handleDelete(scope.row)">删除
</el-button>
<popover-delete v-if="scope.row.parentId!==0" :name="scope.row.deptName" :type="'部门'"
@delete="handleDelete(scope.row.deptId)"/>
</template>
</el-table-column>
</el-table>
@@ -266,13 +266,8 @@ const expandChange = (data, isExpansion) => {
}
//删除功能
const handleDelete = (row) => {
ElMessageBox.confirm(`确认删除部门名称为${row.deptName}的数据吗?`, "系统提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
deleteDept(row.deptId).then(res => {
const handleDelete = (deptId) => {
deleteDept(deptId).then(res => {
if (res.code === 1000) {
ElMessage.success(res.msg);
getList();
@@ -280,7 +275,6 @@ const handleDelete = (row) => {
ElMessage.error(res.msg);
}
});
});
};
const handleDataCancel = () => {

2
src/views/system/menu/DistributeRole.vue
View File

@@ -56,7 +56,7 @@
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button type="text" size="mini"
@click="handleCancelAuthorization(scope.row.roleId,scope.row.roleName)" :icon="CircleClose">取消授权
@click="handleCancelAuthorization(scope.row.roleId,scope.row.roleName)" >取消授权
</el-button>
</template>
</el-table-column>

17
src/views/system/notice/inform/index.vue
View File

@@ -28,11 +28,10 @@
</el-table-column>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button type="text" size="mini" :icon="View" @click="handleViewDetails(scope.row.noticeId)">详情
</el-button>
<el-button type="text" size="mini" :icon="Delete"
@click="handleDelete(scope.row)" style="color: red">删除
<el-button type="text" size="mini" @click="handleViewDetails(scope.row.noticeId)">详情
</el-button>
<popover-delete :name="scope.row.noticeTitle" :type="'通知公告'"
@delete="handleDelete(scope.row.noticeId)"/>
</template>
</el-table-column>
</el-table>
@@ -125,13 +124,8 @@ const handleCloseDialog=()=>{
isViewVisited.value = false
}
//删除单个消息
const handleDelete = (row) => {
ElMessageBox.confirm(`确认删除名称为${row.noticeTitle}的通知公告吗?`, "系统提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
deleteSingleNotify(row.noticeId).then(res => {
const handleDelete = (noticeId) => {
deleteSingleNotify(noticeId).then(res => {
if (res.code === 1000) {
ElMessage.success(res.msg)
getList()
@@ -139,7 +133,6 @@ const handleDelete = (row) => {
ElMessage.error(res.msg)
}
})
});
};
//切换每页显示条数
const handleSizeChange = (val) => {

22
src/views/system/notice/publish/index.vue
View File

@@ -61,10 +61,10 @@
<el-table-column prop="createTime" label="创建时间" align="center"/>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button type="text" size="mini" :icon="View" @click="handleViewDetails(scope.row)">详情
</el-button>
<el-button type="text" size="mini" :icon="Delete" @click="handleDelete(scope.row)" style="color: red">删除
<el-button type="text" size="mini" @click="handleViewDetails(scope.row)">详情
</el-button>
<popover-delete :name="scope.row.noticeTitle" :type="'公告'"
@delete="handleDelete(scope.row.noticeId)"/>
</template>
</el-table-column>
</el-table>
@@ -342,13 +342,13 @@ const handleViewDetails = async (row) => {
}
//删除
const handleDelete = async (row) => {
ElMessageBox.confirm(`确认删除名称为${row.noticeTitle}的公告吗?`, '系统提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteNotice(row.noticeId).then(res => {
const handleDelete = async (noticeId) => {
// ElMessageBox.confirm(`确认删除名称为${row.noticeTitle}的公告吗?`, '系统提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(() => {
deleteNotice(noticeId).then(res => {
if (res.code === 1000) {
ElMessage.success(res.msg)
getList()
@@ -356,7 +356,7 @@ const handleDelete = async (row) => {
ElMessage.error(res.msg)
}
})
})
// })
}
const restForm = () => {
form.value = {

2
src/views/system/post/DistributeUser.vue
View File

@@ -47,7 +47,7 @@
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button type="text" size="mini"
@click="handleCancelAuthorization(scope.row.userId,scope.row.userName)" :icon="CircleClose">取消授权
@click="handleCancelAuthorization(scope.row.userId,scope.row.userName)" >取消授权
</el-button>
</template>
</el-table-column>

20
src/views/system/post/index.vue
View File

@@ -48,8 +48,8 @@
<el-button type="text" size="mini" @click="handleEdit(scope.row.postId)">修改</el-button>
<el-button type="text" size="mini" @click="handleAssignedUser(scope.row)">分配用户
</el-button>
<el-button type="text" size="mini" v-if="scope.row.parentId!==0" @click="handleDelete(scope.row)">删除
</el-button>
<popover-delete v-if="scope.row.parentId!==0" :name="scope.row.postName" :type="'岗位'"
@delete="handleDelete(scope.row.postId)"/>
</template>
</el-table-column>
</el-table>
@@ -187,13 +187,13 @@ const handleAssignedUser = (row) => {
router.push('/post-auth/user/' + row.postId)
}
//删除功能
const handleDelete = (row) => {
ElMessageBox.confirm(`确认删除名称为${row.postName}的数据吗?`, "系统提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
deletePost(row.postId).then(res => {
const handleDelete = (postId) => {
// ElMessageBox.confirm(`确认删除名称为${row.postName}的数据吗?`, "系统提示", {
// confirmButtonText: "确定",
// cancelButtonText: "取消",
// type: "warning"
// }).then(() => {
deletePost(postId).then(res => {
if (res.code === 1000) {
ElMessage.success(res.msg);
getList();
@@ -201,7 +201,7 @@ const handleDelete = (row) => {
ElMessage.error(res.msg);
}
});
});
// });
};
//切换每页显示条数

2
src/views/system/role/DistributeUser.vue
View File

@@ -47,7 +47,7 @@
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button type="text" size="mini"
@click="handleCancelAuthorization(scope.row.userId,scope.row.userName)" :icon="CircleClose">取消授权
@click="handleCancelAuthorization(scope.row.userId,scope.row.userName)" >取消授权
</el-button>
</template>
</el-table-column>

20
src/views/system/role/index.vue
View File

@@ -84,8 +84,8 @@
</el-button>
<el-button type="text" size="mini" @click="handleAssignedUser(scope.row)">分配用户
</el-button>
<el-button type="text" size="mini" @click="handleDel(scope.row)">删除
</el-button>
<popover-delete :name="scope.row.roleName" :type="'角色'"
@delete="handleDel(scope.row.roleId)"/>
</template>
</el-table-column>
</el-table>
@@ -332,13 +332,13 @@ const handleEdit = (roleId) => {
getMenu()
};
//删除功能
const handleDel = (row) => {
ElMessageBox.confirm(`确认删除角色名称为${row.roleName}的数据吗?`, "系统提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
deleteRole(row.roleId).then(res => {
const handleDel = (roleId) => {
// ElMessageBox.confirm(`确认删除角色名称为${row.roleName}的数据吗?`, "系统提示", {
// confirmButtonText: "确定",
// cancelButtonText: "取消",
// type: "warning",
// }).then(() => {
deleteRole(roleId).then(res => {
if (res.code === 1000) {
ElMessage.success(res.msg);
getList();
@@ -346,7 +346,7 @@ const handleDel = (row) => {
ElMessage.error(res.msg);
}
});
});
// });
};
//分配用户
const handleAssignedUser = (row) => {

44
src/views/system/user/index.vue
View File

@@ -91,8 +91,8 @@
<el-button type="text" size="mini"
@click="handleEdit(scope.row.userId)" >编辑
</el-button>
<el-button type="text" size="mini" @click="handleDelete(scope.row)">删除
</el-button>
<popover-delete :name="scope.row.userName" :type="'用户'"
@delete="handleDelete(scope.row.userId)"/>
</template>
</el-table-column>
</el-table>
@@ -182,9 +182,9 @@
<div v-if="title=='新增用户'">
<el-option
v-for="item in postList"
:key="item.postId"
:label="item.postName"
:value="item.postId"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</div>
<div v-else>
@@ -207,9 +207,9 @@
<div v-if="title=='新增用户'">
<el-option
v-for="item in roleList"
:key="item.roleId"
:label="item.roleName"
:value="item.roleId"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</div>
<div v-else>
@@ -252,10 +252,10 @@
<script setup>
import {Search, Refresh, Plus, Edit, Delete} from "@element-plus/icons-vue";
import {defineProps} from "vue";
import {getRoleList} from "@/api/role/role";
import {getRoleOption} from "@/api/role/role";
import {getUserList, getUserDetail, addUser, editUser,deleteUser} from "@/api/user/user";
import {getDeptList} from "@/api/dept/dept";
import {getPostList} from "@/api/post/post";
import {getSelectOption} from "@/api/post/post";
import {ElMessage, ElMessageBox} from "element-plus";
import {useCacheStore} from "@/stores/cache.js";
import Tag from '@/components/Tag.vue'
@@ -387,16 +387,16 @@ const getList = async () => {
});
};
const getRole = () => {
getRoleList().then(res => {
getRoleOption().then(res => {
if (res.code === 1000) {
roleList.value = res.data.rows;
roleList.value = res.data;
}
});
};
const getPost= async () => {
getPostList().then(res => {
getSelectOption().then(res => {
if (res.code === 1000) {
postList.value = res.data.rows;
postList.value = res.data;
}
})
}
@@ -471,13 +471,13 @@ const handleEdit = (userId) => {
});
};
//删除功能
const handleDelete = (row) => {
ElMessageBox.confirm(`确认删除用户名称为${row.userName}的数据吗?`, "系统提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
deleteUser(row.userId).then(res => {
const handleDelete = (userId) => {
// ElMessageBox.confirm(`确认删除用户名称为${row.userName}的数据吗?`, "系统提示", {
// confirmButtonText: "确定",
// cancelButtonText: "取消",
// type: "warning"
// }).then(() => {
deleteUser(userId).then(res => {
if (res.code === 1000) {
ElMessage.success(res.msg);
getList();
@@ -485,7 +485,7 @@ const handleDelete = (row) => {
ElMessage.error(res.msg);
}
});
});
// });
};
//取消

3
src/views/tool/dict/index.vue
View File

@@ -59,7 +59,6 @@
ref="singleTable"
v-loading="loading"
:header-cell-style="{'background':'#f5f7fa'}"
>
<!-- <el-table-column prop="dictType" label="字典类型" align="center"/>-->
<el-table-column prop="dictLabel" label="字典标签" align="center"/>
@@ -84,7 +83,7 @@
<el-button type="text" size="mini" v-perm="['dict:data:edit']"
@click="handleEditData(scope.row.dictCode)">编辑
</el-button>
<popover-delete :name="scope.row.dictLabel" :type="'字典数据'" :perm="['dict:data:del']" :btn-icon="Delete"
<popover-delete :name="scope.row.dictLabel" :type="'字典数据'" :perm="['dict:data:del']"
@delete="handleDeleteData(scope.row.dictCode)"/>
</template>
</el-table-column>