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

Merge pull request 'dengjie' (#12) from dengjie into master

Browse Source 
Reviewed-on: http://git.feashow.cn/feashow/tunnel-cloud-front/pulls/12
This commit is contained in:
odjbin
2023-11-06 15:46:12 +00:00
parent e403029b9e fa4af69d4c
commit 1316442b68
22 changed files with 313 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,9 +30,9 @@
</el-form> </el-form>
<div class="query-btn"> <div class="query-btn">
<el-button type="primary" v-perm="['query:adapter:add']" @click="handleAdd" :icon="Plus" plain>新增</el-button> <el-button type="primary" v-perm="['query:adapter:add']" @click="handleAdd" :icon="Plus" plain>新增</el-button>
<popover-delete :name="adapterNameList" btn-type="danger" :type="'菜单'" :perm="['query:adapter:del']" <el-button type="danger" :icon="Delete" v-perm="['query:adapter:del']"
:is-disabled="disabled" :is-plain="true" :btn-icon="Delete" @click="handleMoreDelete(adapterIds)" :disabled="disabled" plain>删除
@delete="handleDelete(adapterIds)"/> </el-button>
<el-button type="warning" v-perm="['query:adapter:export']" @click="handleExport" :icon="Download" plain>导出 <el-button type="warning" v-perm="['query:adapter:export']" @click="handleExport" :icon="Download" plain>导出
</el-button> </el-button>
</div> </div>
@@ -223,6 +223,16 @@ const handleDelete = async (adapterId) => {
} }
}) })
} }
//多删
const handleMoreDelete=(adapterIds)=>{
ElMessageBox.confirm(`确认删除名称为${adapterNameList.value}的适配器吗?`, '系统提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
handleDelete(adapterIds)
})
}
//勾选table数据行事件 //勾选table数据行事件
const handleSelect = async (selection) => { const handleSelect = async (selection) => {
if (selection.length !== 0) { if (selection.length !== 0) {

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

@@ -20,8 +20,9 @@
</el-form> </el-form>
<div class="query-btn"> <div class="query-btn">
<el-button type="primary" v-perm="['query:source:add']" @click="handleAdd" :icon="Plus" plain>新增</el-button> <el-button type="primary" v-perm="['query:source:add']" @click="handleAdd" :icon="Plus" plain>新增</el-button>
<popover-delete :name="sourceName" btn-type="danger" :type="'数据模型'" :is-plain="true" :btn-icon="Delete" :is-disabled="disabled" :perm="['query:source:del']" <el-button type="danger" :icon="Delete" v-perm="['query:source:del']"
@delete="handleDelete(sourceId)"/> @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 type="warning" v-perm="['query:source:export']" @click="handleExport" :icon="Download" plain>导出
</el-button> </el-button>
</div> </div>
@@ -42,14 +43,14 @@
<el-table-column prop="type" label="数据模型类型" align="center"/> <el-table-column prop="type" label="数据模型类型" align="center"/>
<el-table-column prop="confType" label="数据模型配置类型" align="center"> <el-table-column prop="confType" label="数据模型配置类型" align="center">
<template #default="scope"> <template #default="scope">
<tag dict-type="data_source_config" :value="scope.row.configType"/> <tag dict-type="data_source_config" :value="scope.row.configType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="url" label="数据模型连接地址" align="center"/> <el-table-column prop="url" label="数据模型连接地址" align="center"/>
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template #default="scope"> <template #default="scope">
<el-button type="text" size="mini" v-perm="['query:source:edit']" <el-button type="text" size="mini" v-perm="['query:source:edit']"
@click="handleEdit(scope.row.id)" >编辑 @click="handleEdit(scope.row.id)">编辑
</el-button> </el-button>
<popover-delete :name="scope.row.dsName" :type="'数据模型'" :perm="['query:source:del']" <popover-delete :name="scope.row.dsName" :type="'数据模型'" :perm="['query:source:del']"
@delete="handleDelete(scope.row.id)"/> @delete="handleDelete(scope.row.id)"/>
@@ -192,27 +193,27 @@ const formRules = ref({
host: [{required: true, message: '请输入数据模型服务地址', trigger: 'blur'}], host: [{required: true, message: '请输入数据模型服务地址', trigger: 'blur'}],
dbName: [{required: true, message: '请输入数据库名称', trigger: 'blur'}], dbName: [{required: true, message: '请输入数据库名称', trigger: 'blur'}],
url: [{required: true, message: '请输入数据模型连接地址', trigger: 'blur'}], url: [{required: true, message: '请输入数据模型连接地址', trigger: 'blur'}],
params:{ params: {
serviceName: [{required: true, message: '请输入服务名称', trigger: 'blur'}], serviceName: [{required: true, message: '请输入服务名称', trigger: 'blur'}],
namespace: [{required: true, message: '请输入命名空间', trigger: 'blur'}] namespace: [{required: true, message: '请输入命名空间', trigger: 'blur'}]
} }
}) })
const getTypeOption=()=>{ const getTypeOption = () => {
getDataSourceType().then(res=>{ getDataSourceType().then(res => {
typeList.value=res.data typeList.value = res.data
}) })
} }
const handleTypeChange = (type) => { const handleTypeChange = (type) => {
if (form.value.configType !== 1){ if (form.value.configType !== 1) {
return; return;
} }
if (type === 'ORACLE'){ if (type === 'ORACLE') {
form.value.params = { form.value.params = {
serviceName: '' serviceName: ''
} }
} }
if (type === 'POSTGRES'){ if (type === 'POSTGRES') {
form.value.params = { form.value.params = {
namespace: '' namespace: ''
} }
@@ -301,7 +302,7 @@ const handleAdd = async () => {
restFrom() restFrom()
title.value = "新增数据模型管理" title.value = "新增数据模型管理"
isVisited.value = true isVisited.value = true
nextTick(()=>{ nextTick(() => {
// 清空校验 // 清空校验
formInstance.value.clearValidate() formInstance.value.clearValidate()
}) })
@@ -316,7 +317,7 @@ const handleEdit = async (id) => {
form.value = res.data form.value = res.data
title.value = "编辑数据模型管理" title.value = "编辑数据模型管理"
isVisited.value = true isVisited.value = true
nextTick(()=>{ nextTick(() => {
// 清空校验 // 清空校验
formInstance.value.clearValidate() formInstance.value.clearValidate()
}) })
@@ -331,15 +332,11 @@ const handleExport = () => {
} }
//勾选table数据行的 Checkbox //勾选table数据行的 Checkbox
const handleSelect = async (selection, row) => { const handleSelect = async (selection) => {
if (selection.length !== 0) { if (selection.length !== 0) {
disabled.value = false disabled.value = false
sourceId.value = row.id sourceId.value = selection.map(item => item.id).join()
sourceName.value = row.dsName sourceName.value = selection.map(item => item.dsName).join()
if (selection.length > 1) {
const del_row = selection.shift();
singleTable.value.toggleRowSelection(del_row, false);
}
} else { } else {
disabled.value = true disabled.value = true
} }
@@ -358,16 +355,25 @@ const handleCurrentChange = async (val) => {
} }
//删除 //删除
const handleDelete = async (id) => { const handleDelete = async (id) => {
delDataSourceManage(id).then(res => { delDataSourceManage(id).then(res => {
if (res.code === 1000) { if (res.code === 1000) {
ElMessage.success(res.msg) ElMessage.success(res.msg)
getList() getList()
} else { } else {
ElMessage.error(res.msg) ElMessage.error(res.msg)
} }
}) })
}
//多删
const handleMoreDelete = (sourceId, sourceName) => {
ElMessageBox.confirm(`确认删除名称为${sourceName}的数据模型吗?`, '系统提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
handleDelete(sourceId)
})
} }
getTypeOption() getTypeOption()
getList() getList()
</script> </script>

66
src/views/custom-query/sql/index.vue
View File

@@ -17,9 +17,9 @@
</el-form> </el-form>
<div class="query-btn"> <div class="query-btn">
<el-button type="primary" @click="handleAdd" :icon="Plus" plain>新增</el-button> <el-button type="primary" @click="handleAdd" :icon="Plus" plain>新增</el-button>
<popover-delete :name="uqNameList" btn-type="danger" :type="'SQL查询'" <el-button type="danger" :icon="Delete"
:is-disabled="disabled" :is-plain="true" :btn-icon="Delete" @click="handleMoreDelete(uqIds)" :disabled="disabled" plain>删除
@delete="handleDelete(uqIds)"/> </el-button>
</div> </div>
<div class="table"> <div class="table">
<el-table <el-table
@@ -34,8 +34,8 @@
<el-table-column label="序号" type="index" width="60" align="center"/> <el-table-column label="序号" type="index" width="60" align="center"/>
<el-table-column prop="uqName" label="名称" align="center"/> <el-table-column prop="uqName" label="名称" align="center"/>
<el-table-column prop="dataSourceId" label="数据源" align="center"> <el-table-column prop="dataSourceId" label="数据源" align="center">
<template #default="scope"> <template #default="scope">
<el-tag >{{getDataSourceOptionItem(scope.row.dataSourceId)}}</el-tag> <el-tag>{{ getDataSourceOptionItem(scope.row.dataSourceId) }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="publish" label="发布类型" align="center"> <el-table-column prop="publish" label="发布类型" align="center">
@@ -50,12 +50,12 @@
<template #default="scope"> <template #default="scope">
<div v-if="scope.row.publish == false"> <div v-if="scope.row.publish == false">
<el-button type="text" size="mini" <el-button type="text" size="mini"
@click="handleEdit(scope.row.id)" >编辑 @click="handleEdit(scope.row.id)">编辑
</el-button> </el-button>
<el-button type="text" size="mini" <el-button type="text" size="mini"
@click="handleDesign(scope.row)" >设计 @click="handleDesign(scope.row)">设计
</el-button> </el-button>
<popover-delete :name="scope.row.uqName" :type="'SQL查询'" <popover-delete :name="scope.row.uqName" :type="'SQL查询'"
@delete="handleDelete(scope.row.id)"/> @delete="handleDelete(scope.row.id)"/>
</div> </div>
<div v-else> <div v-else>
@@ -154,13 +154,13 @@ const formRules = ref({
uqDescribe: [{required: true, message: '请输入描述', trigger: 'blur'}], uqDescribe: [{required: true, message: '请输入描述', trigger: 'blur'}],
}) })
//获取数据源select的option //获取数据源select的option
const getOption =async () => { const getOption = async () => {
await getDataSourceOption().then(res => { await getDataSourceOption().then(res => {
if (res.code === 1000) { if (res.code === 1000) {
dataSourceOption.value = res.data dataSourceOption.value = res.data
// getList(); // getList();
} }
}) })
} }
const getDataSourceOptionItem = (dataSourceId) => { const getDataSourceOptionItem = (dataSourceId) => {
@@ -258,22 +258,24 @@ const handleDownLine = (row) => {
//单个删除 //单个删除
const handleDelete = async (id) => { const handleDelete = async (id) => {
// let list = [] delSql(id).then(res => {
// list.push(row.id) if (res.code === 1000) {
// ElMessageBox.confirm(`确认删除名称为${row.uqName}的数据吗?`, '系统提示', { ElMessage.success(res.msg)
// confirmButtonText: '确定', getList()
// cancelButtonText: '取消', } else {
// type: 'warning' ElMessage.error(res.msg)
// }).then(() => { }
delSql(id).then(res => { })
if (res.code === 1000) { }
ElMessage.success(res.msg) //多删
getList() const handleMoreDelete = (uqIds) => {
} else { ElMessageBox.confirm(`确认删除名称为${uqNameList}的SQL查询吗?`, '系统提示', {
ElMessage.error(res.msg) confirmButtonText: '确定',
} cancelButtonText: '取消',
}) type: 'warning'
// }) }).then(() => {
handleDelete(uqIds)
})
} }
//取消 //取消
const handleCancel = () => { const handleCancel = () => {
@@ -314,7 +316,7 @@ const handleSubmit = async (instance) => {
const handleSelect = async (selection) => { const handleSelect = async (selection) => {
if (selection.length !== 0) { if (selection.length !== 0) {
disabled.value = false disabled.value = false
uqIds.value=selection.map(item => item.id).join() uqIds.value = selection.map(item => item.id).join()
uqNameList.value = selection.map(item => item.uqName).join() uqNameList.value = selection.map(item => item.uqName).join()
} else { } else {
disabled.value = true disabled.value = true

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

@@ -17,9 +17,9 @@
</el-form> </el-form>
<div class="query-btn"> <div class="query-btn">
<el-button type="primary" @click="handleAdd" :icon="Plus" plain>新增</el-button> <el-button type="primary" @click="handleAdd" :icon="Plus" plain>新增</el-button>
<popover-delete :name="uqNameList" btn-type="danger" :type="'拓扑图查询'" <el-button type="danger" :icon="Delete"
:is-disabled="disabled" :is-plain="true" :btn-icon="Delete" @click="handleMoreDelete(uqIds)" :disabled="disabled" plain>删除
@delete="handleDelete(uqIds)"/> </el-button>
</div> </div>
<div class="table"> <div class="table">
<el-table <el-table
@@ -34,8 +34,8 @@
<el-table-column label="序号" type="index" width="60" align="center"/> <el-table-column label="序号" type="index" width="60" align="center"/>
<el-table-column prop="uqName" label="名称" align="center"/> <el-table-column prop="uqName" label="名称" align="center"/>
<el-table-column prop="dataSourceId" label="数据源" align="center"> <el-table-column prop="dataSourceId" label="数据源" align="center">
<template #default="scope"> <template #default="scope">
<el-tag >{{getDataSourceOptionItem(scope.row.dataSourceId)}}</el-tag> <el-tag>{{ getDataSourceOptionItem(scope.row.dataSourceId) }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="publish" label="发布类型" align="center"> <el-table-column prop="publish" label="发布类型" align="center">
@@ -50,12 +50,12 @@
<template #default="scope"> <template #default="scope">
<div v-if="scope.row.publish == false"> <div v-if="scope.row.publish == false">
<el-button type="text" size="mini" <el-button type="text" size="mini"
@click="handleEdit(scope.row.id)" >编辑 @click="handleEdit(scope.row.id)">编辑
</el-button> </el-button>
<el-button type="text" size="mini" <el-button type="text" size="mini"
@click="handleDesign(scope.row)" >设计 @click="handleDesign(scope.row)">设计
</el-button> </el-button>
<popover-delete :name="scope.row.uqName" :type="'拓扑图查询'" <popover-delete :name="scope.row.uqName" :type="'拓扑图查询'"
@delete="handleDelete(scope.row.id)"/> @delete="handleDelete(scope.row.id)"/>
</div> </div>
<div v-else> <div v-else>
@@ -117,7 +117,7 @@
</template> </template>
<script setup> <script setup>
import {Search, Refresh, Plus, Delete, Edit,Bottom,View} from '@element-plus/icons-vue' import {Search, Refresh, Plus, Delete, Edit, Bottom, View} from '@element-plus/icons-vue'
import {ElMessage, ElMessageBox} from "element-plus"; import {ElMessage, ElMessageBox} from "element-plus";
import {useRouter} from "vue-router"; import {useRouter} from "vue-router";
import {getTopoList, delTopo, addTopo, editTopo, getTopoDetails} from "@/api/custom-query/topo"; import {getTopoList, delTopo, addTopo, editTopo, getTopoDetails} from "@/api/custom-query/topo";
@@ -164,7 +164,7 @@ const getOption = () => {
}) })
} }
const getDataSourceOptionItem = (dataSourceId) => { const getDataSourceOptionItem = (dataSourceId) => {
if(dataSourceOption.value===undefined)return; if (dataSourceOption.value === undefined) return;
for (let item of dataSourceOption.value) { for (let item of dataSourceOption.value) {
if (item.value === dataSourceId) { if (item.value === dataSourceId) {
return item.label; return item.label;
@@ -257,32 +257,29 @@ const handleDownLine = (row) => {
}) })
} }
//查看 //查看
const handleView=(id)=>{ const handleView = (id) => {
//router.push({path: `/custom/query/page/${id}`}) //router.push({path: `/custom/query/page/${id}`})
} }
//单个删除 //单个删除
const handleDelete = async (id) => { const handleDelete = async (id) => {
// let list = [] delTopo(id).then(res => {
// if(Array.isArray(id)){ if (res.code === 1000) {
// list=Object.values(id) ElMessage.success(res.msg)
// }else { getList()
// list.push(id) } else {
// } ElMessage.error(res.msg)
// console.log(list,'list') }
// ElMessageBox.confirm(`确认删除名称为${row.uqName}的拓扑图吗?`, '系统提示', { })
// confirmButtonText: '确定', }
// cancelButtonText: '取消', //多删
// type: 'warning' const handleMoreDelete = (uqIds) => {
// }).then(() => { ElMessageBox.confirm(`确认删除名称为${uqNameList.value}的拓扑图查询吗?`, '系统提示', {
delTopo(id).then(res => { confirmButtonText: '确定',
if (res.code === 1000) { cancelButtonText: '取消',
ElMessage.success(res.msg) type: 'warning'
getList() }).then(() => {
} else { handleDelete(uqIds)
ElMessage.error(res.msg) })
}
})
// })
} }
//取消 //取消
const handleCancel = () => { const handleCancel = () => {
@@ -322,7 +319,7 @@ const handleSubmit = async (instance) => {
const handleSelect = async (selection) => { const handleSelect = async (selection) => {
if (selection.length !== 0) { if (selection.length !== 0) {
disabled.value = false disabled.value = false
uqIds.value=selection.map(item => item.id).join() uqIds.value = selection.map(item => item.id).join()
uqNameList.value = selection.map(item => item.uqName).join() uqNameList.value = selection.map(item => item.uqName).join()
} else { } else {
disabled.value = true disabled.value = true
@@ -343,11 +340,11 @@ getOption()
getList() getList()
</script> </script>
<style lang="scss"> <style lang="scss">
.red-warning{ .red-warning {
.el-message-box__content{ .el-message-box__content {
.el-message-box__container{ .el-message-box__container {
.el-icon{ .el-icon {
color: red !important; color: red !important;
} }
} }

17
src/views/monitor/logininfor/index.vue
View File

@@ -35,9 +35,9 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="query-btn"> <div class="query-btn">
<popover-delete :name="infoId" btn-type="danger" :type="'日志'" <el-button type="danger" :icon="Delete"
:is-disabled="disabled" :is-plain="true" :btn-icon="Delete" @click="handleMoreDelete(infoId)" :disabled="disabled" plain>删除
@delete="handleDelete(infoId)"/> </el-button>
</div> </div>
<div class="table"> <div class="table">
<el-table <el-table
@@ -169,7 +169,16 @@ const handleDelete = async (infoId) => {
} }
}) })
} }
//多删
const handleMoreDelete = (infoId) => {
ElMessageBox.confirm(`确认删除名称为${infoId}的日志吗?`, '系统提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
handleDelete(infoId)
})
}
//勾选table数据行的 Checkbox, 多/单选删除功能 //勾选table数据行的 Checkbox, 多/单选删除功能
const handleSelect = async (selection) => { const handleSelect = async (selection) => {
if (selection.length !== 0) { if (selection.length !== 0) {

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 prop="loginTime" label="登录时间" sortable align="center"/>
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template #default="scope"> <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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

19
src/views/monitor/operlog/index.vue
View File

@@ -45,9 +45,9 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="query-btn"> <div class="query-btn">
<popover-delete :name="operIds" btn-type="danger" :type="'日志'" <el-button type="danger" :icon="Delete"
:is-disabled="disabled" :is-plain="true" :btn-icon="Delete" @click="handleMoreDelete(operIds)" :disabled="disabled" plain>删除
@delete="handleDelete(operIds)"/> </el-button>
</div> </div>
<div class="table"> <div class="table">
<el-table <el-table
@@ -83,7 +83,7 @@
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template #default="scope"> <template #default="scope">
<el-button type="text" size="mini" @click="handleViewDetails(scope.row.operId)" >详细</el-button> <el-button type="text" size="mini" @click="handleViewDetails(scope.row.operId)" >详细</el-button>
<popover-delete :name="operIds" :type="'日志'" <popover-delete :name="scope.row.operId" :type="'日志'"
@delete="handleDelete(scope.row.operId)"/> @delete="handleDelete(scope.row.operId)"/>
</template> </template>
</el-table-column> </el-table-column>
@@ -267,7 +267,16 @@ const handleDelete = async (operId) => {
} }
}); });
}; };
//多删
const handleMoreDelete = (operIds) => {
ElMessageBox.confirm(`确认删除名称为${operIds}的日志吗?`, '系统提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
handleDelete(operIds)
})
}
//勾选table数据行的 Checkbox, 实现单/多选删除功能 //勾选table数据行的 Checkbox, 实现单/多选删除功能
const handleSelect = async (selection) => { const handleSelect = async (selection) => {
if (selection.length !== 0) { if (selection.length !== 0) {

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 prop="updateTime" label="更新时间" sortable align="center"/>
<el-table-column label="操作"> <el-table-column label="操作">
<template #default="scope"> <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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

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

@@ -21,10 +21,11 @@
<el-config-provider> <el-config-provider>
<el-date-picker <el-date-picker
v-model="dateValue" v-model="dateValue"
type="daterange" type="datetimerange"
:shortcuts="shortcuts"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
/> />
</el-config-provider> </el-config-provider>
</el-form-item> </el-form-item>
@@ -134,6 +135,35 @@ const list = ref([])
const loading = ref(true) const loading = ref(true)
const total = ref() const total = ref()
const dateValue = 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 dataSourceOption = ref()
const code = ref() const code = ref()
const genForm = ref() const genForm = ref()

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

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

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

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

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

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

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

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

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

@@ -56,7 +56,7 @@
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template #default="scope"> <template #default="scope">
<el-button type="text" size="mini" <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> </el-button>
</template> </template>
</el-table-column> </el-table-column>

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

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

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

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

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

@@ -47,7 +47,7 @@
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template #default="scope"> <template #default="scope">
<el-button type="text" size="mini" <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> </el-button>
</template> </template>
</el-table-column> </el-table-column>

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

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

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

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

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

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