bug fix
This commit is contained in:
@ -105,10 +105,10 @@
|
|||||||
:data="tenantList"
|
:data="tenantList"
|
||||||
@selection-change="handleSelectionChange"
|
@selection-change="handleSelectionChange"
|
||||||
>
|
>
|
||||||
<el-table-column align="center" type="selection" width="55" />
|
<el-table-column align="center" type="selection" width="55"/>
|
||||||
<el-table-column align="center" label="公司名称" prop="companyName" />
|
<el-table-column align="center" label="公司名称" prop="companyName"/>
|
||||||
<el-table-column align="center" label="联系人名称" prop="contactName" />
|
<el-table-column align="center" label="联系人名称" prop="contactName"/>
|
||||||
<el-table-column align="center" label="联系人电话" prop="contactPhone" />
|
<el-table-column align="center" label="联系人电话" prop="contactPhone"/>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
align="center"
|
align="center"
|
||||||
label="过期时间"
|
label="过期时间"
|
||||||
@ -119,10 +119,10 @@
|
|||||||
<span>{{ parseTime(scope.row.expireTime, "{y}-{m}-{d}") }}</span>
|
<span>{{ parseTime(scope.row.expireTime, "{y}-{m}-{d}") }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column align="center" label="用户数量" prop="accountCount" />
|
<el-table-column align="center" label="用户数量" prop="accountCount"/>
|
||||||
<el-table-column align="center" label="状态">
|
<el-table-column align="center" label="状态">
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
<dict-tag :options="tenantStatusDict" :value="row.status" />
|
<dict-tag :options="tenantStatusDict" :value="row.status"/>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column align="center" label="初始化状态">
|
<el-table-column align="center" label="初始化状态">
|
||||||
@ -134,7 +134,7 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column align="center" label="模式">
|
<el-table-column align="center" label="模式">
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
<dict-tag :options="tenantModeDict" :value="row.mode" />
|
<dict-tag :options="tenantModeDict" :value="row.mode"/>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
@ -206,10 +206,10 @@
|
|||||||
>
|
>
|
||||||
<el-form ref="tenantRef" :model="form" :rules="rules" label-width="130px">
|
<el-form ref="tenantRef" :model="form" :rules="rules" label-width="130px">
|
||||||
<el-form-item label="公司名称" prop="companyName">
|
<el-form-item label="公司名称" prop="companyName">
|
||||||
<el-input v-model="form.companyName" placeholder="请输入公司名称" />
|
<el-input v-model="form.companyName" placeholder="请输入公司名称"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="联系人名称" prop="contactName">
|
<el-form-item label="联系人名称" prop="contactName">
|
||||||
<el-input v-model="form.contactName" placeholder="请输入联系人名称" />
|
<el-input v-model="form.contactName" placeholder="请输入联系人名称"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="联系人电话" prop="contactPhone">
|
<el-form-item label="联系人电话" prop="contactPhone">
|
||||||
<el-input
|
<el-input
|
||||||
@ -218,7 +218,7 @@
|
|||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="公司地址" prop="address">
|
<el-form-item label="公司地址" prop="address">
|
||||||
<el-input v-model="form.address" placeholder="请输入公司地址" />
|
<el-input v-model="form.address" placeholder="请输入公司地址"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="公司简介" prop="profile">
|
<el-form-item label="公司简介" prop="profile">
|
||||||
<el-input
|
<el-input
|
||||||
@ -244,7 +244,7 @@
|
|||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="用户数量" prop="accountCount">
|
<el-form-item label="用户数量" prop="accountCount">
|
||||||
<el-input v-model="form.accountCount" placeholder="请输入用户数量" />
|
<el-input v-model="form.accountCount" placeholder="请输入用户数量"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="备注" prop="remark">
|
<el-form-item label="备注" prop="remark">
|
||||||
<el-input
|
<el-input
|
||||||
@ -325,7 +325,7 @@
|
|||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="数据库IP" prop="ip">
|
<el-form-item label="数据库IP" prop="ip">
|
||||||
<el-input v-model="dataSourceForm.ip" />
|
<el-input v-model="dataSourceForm.ip"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="数据库端口" prop="port">
|
<el-form-item label="数据库端口" prop="port">
|
||||||
<el-input-number
|
<el-input-number
|
||||||
@ -335,7 +335,7 @@
|
|||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="数据库名称" prop="dbName">
|
<el-form-item label="数据库名称" prop="dbName">
|
||||||
<el-input v-model="dataSourceForm.dbName" />
|
<el-input v-model="dataSourceForm.dbName"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!-- schemaName 模式名称 仅当数据库类型不是Mysql时显示 -->
|
<!-- schemaName 模式名称 仅当数据库类型不是Mysql时显示 -->
|
||||||
<el-form-item
|
<el-form-item
|
||||||
@ -343,13 +343,13 @@
|
|||||||
label="模式名称"
|
label="模式名称"
|
||||||
prop="schemaName"
|
prop="schemaName"
|
||||||
>
|
>
|
||||||
<el-input v-model="dataSourceForm.schemaName" />
|
<el-input v-model="dataSourceForm.schemaName"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="数据库账号" prop="username">
|
<el-form-item label="数据库账号" prop="username">
|
||||||
<el-input v-model="dataSourceForm.username" />
|
<el-input v-model="dataSourceForm.username"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="数据库密码" prop="password">
|
<el-form-item label="数据库密码" prop="password">
|
||||||
<el-input v-model="dataSourceForm.password" />
|
<el-input v-model="dataSourceForm.password"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="使用" prop="isPrimary">
|
<el-form-item label="使用" prop="isPrimary">
|
||||||
<el-switch
|
<el-switch
|
||||||
@ -369,7 +369,7 @@
|
|||||||
showDatasourceAdvanced ? 90 : 0
|
showDatasourceAdvanced ? 90 : 0
|
||||||
}deg);transition: all 0.3s;`"
|
}deg);transition: all 0.3s;`"
|
||||||
>
|
>
|
||||||
<ArrowRight />
|
<ArrowRight/>
|
||||||
</el-icon>
|
</el-icon>
|
||||||
<span>
|
<span>
|
||||||
<!-- 显示或隐藏高级选项 -->
|
<!-- 显示或隐藏高级选项 -->
|
||||||
@ -383,22 +383,19 @@
|
|||||||
<el-form-item label="初始化连接数" prop="initCount">
|
<el-form-item label="初始化连接数" prop="initCount">
|
||||||
<el-input-number
|
<el-input-number
|
||||||
v-model="dataSourceForm.initCount"
|
v-model="dataSourceForm.initCount"
|
||||||
:max="100"
|
:min="0"
|
||||||
:min="1"
|
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="最小连接数" prop="minCount">
|
<el-form-item label="最小连接数" prop="minCount">
|
||||||
<el-input-number
|
<el-input-number
|
||||||
v-model="dataSourceForm.minCount"
|
v-model="dataSourceForm.minCount"
|
||||||
:max="100"
|
:min="0"
|
||||||
:min="1"
|
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="最大连接数" prop="maxCount">
|
<el-form-item label="最大连接数" prop="maxCount">
|
||||||
<el-input-number
|
<el-input-number
|
||||||
v-model="dataSourceForm.maxCount"
|
v-model="dataSourceForm.maxCount"
|
||||||
:max="100"
|
:min="0"
|
||||||
:min="1"
|
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</div>
|
</div>
|
||||||
@ -502,19 +499,15 @@ import {
|
|||||||
updateDatasource,
|
updateDatasource,
|
||||||
updateTenant,
|
updateTenant,
|
||||||
} from "@/api/tenant/tenant";
|
} from "@/api/tenant/tenant";
|
||||||
import { getCurrentInstance, reactive, ref, toRefs } from "vue";
|
import {getCurrentInstance, reactive, ref, toRefs} from "vue";
|
||||||
import { ElMessage, ElMessageBox } from "element-plus";
|
import {ElMessage, ElMessageBox} from "element-plus";
|
||||||
import {
|
import {database_type_dict, tenantModeDict, tenantStatusDict,} from "@/constant/dict";
|
||||||
database_type_dict,
|
|
||||||
tenantModeDict,
|
|
||||||
tenantStatusDict,
|
|
||||||
} from "@/constant/dict";
|
|
||||||
import DictTag from "@/components/DictTag/index.vue";
|
import DictTag from "@/components/DictTag/index.vue";
|
||||||
import { cloneDeep } from "lodash-es";
|
import {cloneDeep} from "lodash-es";
|
||||||
import { ArrowRight } from "@element-plus/icons-vue";
|
import {ArrowRight} from "@element-plus/icons-vue";
|
||||||
import { useRouter } from "vue-router";
|
import {useRouter} from "vue-router";
|
||||||
|
|
||||||
const { proxy } = getCurrentInstance();
|
const {proxy} = getCurrentInstance();
|
||||||
|
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const tenantList = ref([]);
|
const tenantList = ref([]);
|
||||||
@ -553,7 +546,7 @@ const data = reactive({
|
|||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
companyName: [
|
companyName: [
|
||||||
{ required: true, message: "公司名称不能为空", trigger: "blur" },
|
{required: true, message: "公司名称不能为空", trigger: "blur"},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
tenantSettingForm: {},
|
tenantSettingForm: {},
|
||||||
@ -864,7 +857,8 @@ function handleDelete(row) {
|
|||||||
getList();
|
getList();
|
||||||
proxy.$modal.msgSuccess("删除成功");
|
proxy.$modal.msgSuccess("删除成功");
|
||||||
})
|
})
|
||||||
.catch(() => {});
|
.catch(() => {
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 导出按钮操作 */
|
/** 导出按钮操作 */
|
||||||
|
Reference in New Issue
Block a user