邓洁 : 修改页面细节

This commit is contained in:
邓洁
2023-11-06 16:41:23 +08:00
parent bbb1903d3f
commit b91a7e4f0d
15 changed files with 293 additions and 232 deletions

View File

@@ -1,8 +1,8 @@
<template>
<div>
<el-form :model="queryParams" inline class="query-form" ref="queryForm">
<el-form-item label="数据名称" prop="dsName">
<el-input v-model="queryParams.dsName" placeholder="请输入数据名称" clearable></el-input>
<el-form-item label="数据模型名称" prop="dsName">
<el-input v-model="queryParams.dsName" placeholder="请输入数据模型名称" clearable></el-input>
</el-form-item>
<el-form-item label="数据库名称" prop="dbName">
<el-input v-model="queryParams.dbName" placeholder="请输入数据库名称" clearable></el-input>
@@ -20,9 +20,8 @@
</el-form>
<div class="query-btn">
<el-button type="primary" v-perm="['query:source:add']" @click="handleAdd" :icon="Plus" plain>新增</el-button>
<el-button type="danger" v-perm="['query:source:del']" @click="handleDelete" :icon="Delete" plain
:disabled="disabled">删除
</el-button>
<popover-delete :name="sourceName" btn-type="danger" :type="'数据模型'" :is-plain="true" :btn-icon="Delete" :is-disabled="disabled" :perm="['query:source:del']"
@delete="handleDelete(sourceId)"/>
<el-button type="warning" v-perm="['query:source:export']" @click="handleExport" :icon="Download" plain>导出
</el-button>
</div>
@@ -37,27 +36,23 @@
>
<el-table-column type="selection" width="55"/>
<el-table-column label="序号" type="index" width="60" align="center"/>
<el-table-column prop="dsName" label="数据名称" align="center"/>
<el-table-column prop="dsName" label="数据模型名称" align="center"/>
<el-table-column prop="dbName" label="数据库名称" align="center"/>
<el-table-column prop="username" label="数据用户名" align="center"/>
<el-table-column prop="type" label="数据类型" align="center"/>
<el-table-column prop="confType" label="数据配置类型" align="center">
<el-table-column prop="username" label="数据模型用户名" align="center"/>
<el-table-column prop="type" label="数据模型类型" align="center"/>
<el-table-column prop="confType" label="数据模型配置类型" align="center">
<template #default="scope">
<el-tag :type="scope.row.configType === 1? '':'warning'">{{
scope.row.configType === 1 ? '主机' : 'JDBC'
}}
</el-tag>
<tag dict-type="data_source_config" :value="scope.row.configType"/>
</template>
</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">
<template #default="scope">
<el-button type="text" size="mini" v-perm="['query:source:edit']"
@click="handleEdit(scope.row.id)" :icon="Edit">编辑
</el-button>
<el-button type="text" size="mini" v-perm="['query:source:del']" @click="handleDelete(scope.row)"
:icon="Delete">删除
@click="handleEdit(scope.row.id)" >编辑
</el-button>
<popover-delete :name="scope.row.dsName" :type="'数据模型'" :perm="['query:source:del']"
@delete="handleDelete(scope.row.id)"/>
</template>
</el-table-column>
</el-table>
@@ -68,23 +63,23 @@
<el-form :model="form" ref="formInstance" :rules="formRules" class="dialog-form" :validate-on-rule-change="false">
<el-row>
<el-col :span="11">
<el-form-item label="数据名称" prop="dsName">
<el-input v-model="form.dsName" placeholder="请输入数据名称"></el-input>
<el-form-item label="数据模型名称" prop="dsName">
<el-input v-model="form.dsName" placeholder="请输入数据模型名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
<el-form-item label="数据用户名" prop="username">
<el-input v-model="form.username" placeholder="请输入数据用户名"></el-input>
<el-form-item label="数据模型用户名" prop="username">
<el-input v-model="form.username" placeholder="请输入数据模型用户名"></el-input>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="数据密码" prop="password">
<el-input v-model="form.password" placeholder="请输入数据密码"></el-input>
<el-form-item label="数据模型密码" prop="password">
<el-input v-model="form.password" placeholder="请输入数据模型密码"></el-input>
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
<el-form-item label="数据类型" prop="type">
<el-select v-model="form.type" placeholder="请选择数据类型" filterable @change="handleTypeChange(form.type)">
<el-form-item label="数据模型类型" prop="type">
<el-select v-model="form.type" placeholder="请选择数据模型类型" filterable @change="handleTypeChange(form.type)">
<el-option
v-for="typeItem in typeList"
:key="typeItem.value"
@@ -103,13 +98,13 @@
</el-form-item>
</el-col>
<el-col :span="11" :offset="2" v-if="form.configType === 1">
<el-form-item label="数据端口" prop="port">
<el-form-item label="数据模型端口" prop="port">
<el-input-number v-model="form.port"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="11" v-if="form.configType === 1">
<el-form-item label="数据服务地址" prop="host">
<el-input v-model="form.host" placeholder="请输入数据服务地址"></el-input>
<el-form-item label="数据模型服务地址" prop="host">
<el-input v-model="form.host" placeholder="请输入数据模型服务地址"></el-input>
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
@@ -118,14 +113,14 @@
</el-form-item>
</el-col>
<el-col :span="24" v-if="form.configType === 2">
<el-form-item label="数据连接地址" prop="url">
<el-input v-model="form.url" :rows="2"
type="textarea" placeholder="请输入数据连接地址"></el-input>
<el-form-item label="数据模型连接地址" prop="url">
<el-input v-model="form.url" :rows="4"
type="textarea" placeholder="请输入数据模型连接地址"></el-input>
</el-form-item>
</el-col>
<el-col :span="24" v-if="form.configType === 1">
<el-form-item label="配置参数" prop="args">
<el-input v-model="form.args" :rows="2"
<el-input v-model="form.args" :rows="4"
type="textarea" placeholder="请输入配置参数"></el-input>
</el-form-item>
</el-col>
@@ -142,10 +137,8 @@
</el-row>
</el-form>
<template #footer>
<span>
<el-button @click="handleCancel">取消</el-button>
<el-button type="primary" @click="handleSubmit(formInstance)">确定</el-button>
</span>
</template>
</el-dialog>
</div>
@@ -183,21 +176,22 @@ const queryForm = ref([])
const loading = ref(true)
const total = ref()
const sourceId = ref()
const sourceName = ref()
const singleTable = ref()
const title = ref('')
const isVisited = ref(false)
const form = ref()
const formInstance = ref()
const formRules = ref({
dsName: [{required: true, message: '请输入数据名称', trigger: 'blur'}],
username: [{required: true, message: '请输入数据用户名', trigger: 'blur'}],
password: [{required: true, message: '请输入数据密码', trigger: 'blur'}],
type: [{required: true, message: '请选择数据类型', trigger: 'blur'}],
dsName: [{required: true, message: '请输入数据模型名称', trigger: 'blur'}],
username: [{required: true, message: '请输入数据模型用户名', trigger: 'blur'}],
password: [{required: true, message: '请输入数据模型密码', trigger: 'blur'}],
type: [{required: true, message: '请选择数据模型类型', trigger: 'blur'}],
configType: [{required: true, message: '请选择配置类型', trigger: 'blur'}],
port: [{required: true, message: '请输入数据端口', trigger: 'blur'}],
host: [{required: true, message: '请输入数据服务地址', trigger: 'blur'}],
port: [{required: true, message: '请输入数据模型端口', trigger: 'blur'}],
host: [{required: true, message: '请输入数据模型服务地址', trigger: 'blur'}],
dbName: [{required: true, message: '请输入数据库名称', trigger: 'blur'}],
url: [{required: true, message: '请输入数据连接地址', trigger: 'blur'}],
url: [{required: true, message: '请输入数据模型连接地址', trigger: 'blur'}],
params:{
serviceName: [{required: true, message: '请输入服务名称', trigger: 'blur'}],
namespace: [{required: true, message: '请输入命名空间', trigger: 'blur'}]
@@ -278,7 +272,7 @@ const handleSubmit = async (instance) => {
if (!instance) return
instance.validate(async (valid) => {
if (!valid) return
if (title.value === '新增数据管理') {
if (title.value === '新增数据模型管理') {
addDataSourceManage(form.value).then(res => {
if (res.code === 1000) {
ElMessage.success(res.msg)
@@ -305,7 +299,7 @@ const handleSubmit = async (instance) => {
const handleAdd = async () => {
formRules.value.password[0].required = true
restFrom()
title.value = "新增数据管理"
title.value = "新增数据模型管理"
isVisited.value = true
nextTick(()=>{
// 清空校验
@@ -320,7 +314,7 @@ const handleEdit = async (id) => {
console.log('res', res.data)
formRules.value.password[0].required = false
form.value = res.data
title.value = "编辑数据管理"
title.value = "编辑数据模型管理"
isVisited.value = true
nextTick(()=>{
// 清空校验
@@ -341,6 +335,7 @@ const handleSelect = async (selection, row) => {
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);
@@ -362,13 +357,8 @@ const handleCurrentChange = async (val) => {
await getList()
}
//删除
const handleDelete = async (row) => {
ElMessageBox.confirm(`确认删除名称为${row.dsName}的数据源管理吗?`, '系统提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
delDataSourceManage(row.id).then(res => {
const handleDelete = async (id) => {
delDataSourceManage(id).then(res => {
if (res.code === 1000) {
ElMessage.success(res.msg)
getList()
@@ -376,7 +366,6 @@ const handleDelete = async (row) => {
ElMessage.error(res.msg)
}
})
})
}
getTypeOption()