shiran/ApiServer-Web-admin_dashboard_pc
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修改新增用户商品的配置项逻辑
Build and Deploy Vue3 / build (push) Successful in 4m9s
Details
Build and Deploy Vue3 / deploy (push) Successful in 1m3s
Details

Browse Source
This commit is contained in:
2256907009
2026-04-06 18:44:11 +08:00
parent c07e09c151
commit f0e89695f4
36 changed files with 2078 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/acs/images/ContainerImages.vue
+3 -3
View File
@@ -666,7 +666,7 @@ const toLoad = async (data) => {
})
form.server_id = data
nowserver_id.value = data
let res = await getServerPlan({server_id:data,count:100})
let res = await getServerPlan({server_id:data,count:10})
planlist.value = res.data.data.map(item => {
return {
name: item.name,
@@ -748,7 +748,7 @@ const fetchCategoryList = async (serverId) => {
// 编辑镜像
const handleEdit = async (data) => {
try {
let res = await getServerPlan({server_id: data.server_id,count: 100})
let res = await getServerPlan({server_id: data.server_id,count: 10})
if (res.data && res.data.data) {
planlist.value = res.data.data.map(item => {
return {
@@ -874,7 +874,7 @@ const getit = async () => {
// 选择图片
const picPagin = reactive({
count: 50,
count: 10,
page: 1,
key: '',
user_type: 1
src/views/acs/images/ImageCategories.vue
+1 -1
View File
@@ -262,7 +262,7 @@ const categoryRules = {
// 素材库相关
const picSwitch = ref(false)
const picPagin = reactive({
count: 50,
count: 10,
page: 1,
key: '',
user_type: 1
src/views/acs/images/ImageForm.vue
+2 -2
View File
@@ -244,7 +244,7 @@ const showNewCategoryInput = ref(false)
const picSwitch = ref(false)
const picLoading = ref(false)
const picPagin = reactive({
count: 20,
count: 10,
page: 1,
key: '',
user_type: 1
@@ -314,7 +314,7 @@ const initData = async () => {
// Fallback: fetch list and find item
const listRes = await getUserMirrorList({
server_id: serverId.value,
count: 100,
count: 10,
page: 1
})
if (listRes.data.code === 200) {
src/views/acs/nodes/server.vue
+2 -2
View File
@@ -1901,7 +1901,7 @@ const GetSpecs = async () => {
try {
let plans = await getServerPlan({
server_id: route.query.server_id,
count: 30
count: 10
});
spec_list.value = plans.data.data;
} catch (error) {
@@ -2430,7 +2430,7 @@ const fetchContainerMirrorList = async () => {
containerMirrorLoading.value = true;
try {
const response = await getMirrorList({server_id: route.query.server_id, page: 1, count: 999,key: '',class_id: ''});
const response = await getMirrorList({server_id: route.query.server_id, page: 1, count: 10,key: '',class_id: ''});
console.log("获取镜像列表1111：",response);
if (response && response.data && response.data.code === 200) {
src/views/activity/GroupBuyActivity.vue
+1 -1
View File
@@ -218,7 +218,7 @@ const fetchTags = async () => {
// 根据 tag 获取拼团类型列表
const fetchTypeListByTag = async (tag) => {
try {
const res = await getGroupBuyTypeList({ page: 1, count: 100, tag })
const res = await getGroupBuyTypeList({ page: 1, count: 10, tag })
if (res.code === 200) {
typeList.value = res.data?.data || []
}
src/views/activity/GroupBuyManage.vue
+1 -1
View File
@@ -376,7 +376,7 @@ const fetchTags = async () => {
// 根据 tag 获取拼团类型列表（用于创建对话框）
const fetchCreateTypeListByTag = async (tag) => {
try {
const res = await getGroupBuyTypeList({ page: 1, count: 100, tag })
const res = await getGroupBuyTypeList({ page: 1, count: 10, tag })
if (res.code === 200) {
createTypeList.value = res.data?.data || []
}
src/views/audit/AllSites.vue
+1 -1
View File
@@ -419,7 +419,7 @@ const getFullStatsData = async () => {
// 获取第一页大量数据来进行统计，或者调用专门的统计接口
const statsParams = {
page: 1,
count: 1000, // 获取大量数据进行统计
count: 10, // 获取大量数据进行统计
server_id: '',
user_id: '',
key: queryParams.domain || ''
src/views/dashboard/Dashboard.vue
+4 -4
View File
@@ -412,14 +412,14 @@ const statisticsCards = computed(() => [
const fetchStatistics = async () => {
try {
// 获取用户数量
const userRes = await getUserList({ page: 1, count: 1, key: '' })
const userRes = await getUserList({ page: 1, count: 10, key: '' })
console.log("用户数量，",userRes)
if (userRes.data?.code === 200) {
userCount.value = userRes.data.data.all_count || 0
}
// 获取订单数量
const orderRes = await getOrderList({ page: 1, count: 1 })
const orderRes = await getOrderList({ page: 1, count: 10 })
console.log("订单数量，",orderRes)
if (orderRes.data?.code === 200) {
orderCount.value = orderRes.data.data.all_count || 0
@@ -441,7 +441,7 @@ const fetchRecentLists = async () => {
listLoading.value = true
try {
// 获取最近用户
const userRes = await getUserList({ page: 1, count: 5, key: '' })
const userRes = await getUserList({ page: 1, count: 10, key: '' })
if (userRes.data?.code === 200) {
recentUsers.value = (userRes.data.data.data || []).map(user => ({
id: user.user_id,
@@ -453,7 +453,7 @@ const fetchRecentLists = async () => {
}
// 获取最近订单
const orderRes = await getOrderList({ page: 1, count: 5 })
const orderRes = await getOrderList({ page: 1, count: 10 })
if (orderRes.data?.code === 200) {
recentOrders.value = (orderRes.data.data.list || []).map(order => ({
id: order.id,
src/views/marketing/DiscountGoods.vue
+2 -2
View File
@@ -389,7 +389,7 @@ const fetchVoucherListOptions = async () => {
try {
const res = await getDiscountCodeList({
page: 1,
count: 1000,
count: 10,
discount_type: 'coupon'
})
console.log('获取代金券列表:', res.data)
@@ -407,7 +407,7 @@ const fetchProductList = async () => {
try {
const res = await getProductList({
page: 1,
count: 1000
count: 10
})
console.log('获取商品列表:', res.data)
if (res.data.code === 200) {
src/views/marketing/DiscountUsers.vue
+2 -2
View File
@@ -361,7 +361,7 @@ const fetchVoucherListOptions = async () => {
try {
const res = await getDiscountCodeList({
page: 1,
count: 1000,
count: 10,
discount_type: 'coupon'
})
console.log('获取代金券列表:', res.data)
@@ -397,7 +397,7 @@ const fetchUserGroupList = async () => {
try {
const res = await getUserGroupList({
page: 1,
count: 10000,
count: 10,
key: ''
})
console.log('获取用户组列表:', res.data)
src/views/marketing/GroupBuyManage.vue
+1 -1
View File
@@ -123,7 +123,7 @@ const currentGroupBuy = ref(null)
// 加载拼团列表
const loadGroupBuyList = async () => {
try {
const resp = await getGroupBuyList({ page: 1, pageSize: 20 })
const resp = await getGroupBuyList({ page: 1, pageSize: 10 })
if (resp && resp.code === 200) {
groupBuyList.value = resp.data || []
}
src/views/marketing/UserVoucher.vue
+7 -7
View File
@@ -484,7 +484,7 @@ const fetchVoucherListOptions = async () => {
try {
const res = await getDiscountCodeList({
page: 1,
count: 1000,
count: 10,
discount_type: 'coupon'
})
console.log('获取代金券列表:', res.data)
@@ -502,7 +502,7 @@ const fetchDiscountList = async () => {
try {
const res = await getDiscountCodeList({
page: 1,
count: 100,
count: 10,
discount_type: 'coupon'
})
console.log('获取代金券列表:', res.data)
@@ -513,7 +513,7 @@ const fetchDiscountList = async () => {
}
const res2 = await getDiscountCodeList({
page: 1,
count: 100,
count: 10,
discount_type: 'code'
})
console.log('获取优惠码列表:', res2.data)
@@ -533,7 +533,7 @@ const fetchVoucherOptions = async () => {
const res = await getDiscountCodeList({
discount_type: 'coupon',
page: 1,
count: 100
count: 10
})
if (res.data.code === 200) {
voucherOptions.value = res.data.data?.data || []
@@ -549,7 +549,7 @@ const fetchCodeOptions = async () => {
const res = await getDiscountCodeList({
discount_type: 'code',
page: 1,
count: 100
count: 10
})
if (res.data.code === 200) {
codeOptions.value = res.data.data?.data || []
@@ -566,7 +566,7 @@ const fetchUserList = async () => {
try {
const res = await getUserList({
page: 1,
count: 100,
count: 10,
key: ''
})
console.log('获取用户列表:', res.data)
@@ -588,7 +588,7 @@ const fetchGroupOptions = async () => {
try {
const res = await getUserGroupList({
page: 1,
count: 100
count: 10
})
if (res.data.code === 200) {
groupOptions.value = res.data.data?.data || []
src/views/marketing/VoucherHistory.vue
+2 -2
View File
@@ -397,7 +397,7 @@ const fetchUserList = async () => {
try {
const res = await getUserList({
page: 1,
count: 10000,
count: 10,
key: ''
})
UserOptions.value = res.data.data?.data || []
@@ -412,7 +412,7 @@ const fetchDiscountList = async () => {
const res = await getDiscountCodeList({
discount_type: 'coupon',
page: 1,
count: 1000
count: 10
})
if (res.data.code === 200) {
discountOptions.value = res.data.data?.data || []
src/views/marketing/VoucherHolders.vue
+1 -1
View File
@@ -459,7 +459,7 @@ const fetchDiscountList = async () => {
const res = await getDiscountCodeList({
discount_type: 'coupon',
page: 1,
count: 1000
count: 10
})
if (res.data.code === 200) {
discountOptions.value = res.data.data?.data || []
src/views/product/ProductGroup.vue
+14 -14
View File
@@ -1113,7 +1113,7 @@ const viewMode = ref('tree')
// 查询参数
const queryParams = reactive({
page: 1,
count: 100,
count: 10,
tag: undefined,
level: undefined,
disable: undefined,
@@ -1328,7 +1328,7 @@ const loadProductsForGroup = async (groupId) => {
const res = await getProductList({
good_group_id: groupId,
page: 1,
count: 100,
count: 10,
delete: false
})
@@ -1410,7 +1410,7 @@ const toggleExpand = async (row) => {
const res = await getProductGroupList({
parent_id: group.id,
level: childLevel,
count: 100
count: 10
})
if (res.data.code === 200) {
const children = res.data.data.data || []
@@ -1540,7 +1540,7 @@ const selectedTagName = computed(() => {
const fetchTagOptionsForSelector = async () => {
tagSelectorLoading.value = true
try {
const params = { page: 1, count: 100 }
const params = { page: 1, count: 10 }
if (tagSelectorSearch.value) {
params.key = tagSelectorSearch.value
}
@@ -1571,7 +1571,7 @@ const fetchTagOptionsForSelector = async () => {
// 初始化获取所有标签
const fetchAllTagOptions = async () => {
try {
const res = await getProductGroupTagList({ page: 1, count: 100 })
const res = await getProductGroupTagList({ page: 1, count: 10 })
if (res.data.code === 200) {
const data = res.data.data
if (Array.isArray(data)) {
@@ -1920,10 +1920,10 @@ const handleEditProduct = (product, parentGroupId) => {
Object.assign(productForm, {
id: product.id,
name: product.name,
table: product.table,
tag: product.tag,
content: product.content,
name: product.name || '',
table: product.table || '',
tag: typeof product.tag === 'string' ? product.tag : '',
content: product.content || '',
cover_id: product.coverId,
good_group_id: groupId,
inventory_control: product.inventoryControl,
@@ -1945,10 +1945,10 @@ const submitProductForm = () => {
if (valid) {
try {
const submitData = {
name: productForm.name.trim(),
table: productForm.table.trim(),
tag: productForm.tag.trim(),
content: productForm.content.trim(),
name: (productForm.name || '').trim(),
table: (productForm.table || '').trim(),
tag: (typeof productForm.tag === 'string' ? productForm.tag : '').trim(),
content: (productForm.content || '').trim(),
cover_id: productForm.cover_id,
good_group_id: productForm.good_group_id,
inventory_control: productForm.inventory_control,
@@ -2153,7 +2153,7 @@ const submitForm = () => {
// ==================== 分组标签管理 ====================
const tagQueryParams = reactive({
page: 1,
count: 100,
count: 10,
key: ''
})
src/views/product/ProductList.vue
+3 -3
View File
@@ -981,7 +981,7 @@ const toggleGroupExpand = async (row) => {
const res = await getProductGroupList({
parent_id: row.id,
level: childLevel,
count: 100
count: 10
})
if (res.data.code === 200) {
const children = res.data.data.data || []
@@ -1060,7 +1060,7 @@ const fetchProductList = async () => {
const fetchGroupList = async () => {
try {
// 获取全部分组用于下拉列表
const res = await getProductGroupList({ page: 1, count: 100 })
const res = await getProductGroupList({ page: 1, count: 10 })
if (res.data.code === 200) {
groupOptions.value = res.data.data.data || []
if (groupOptions.value.length === 0) {
@@ -1069,7 +1069,7 @@ const fetchGroupList = async () => {
}
// 获取一级分组用于树形选择器
const treeRes = await getProductGroupList({ level: 1, count: 100 })
const treeRes = await getProductGroupList({ level: 1, count: 10 })
if (treeRes.data.code === 200) {
const rootItems = treeRes.data.data.data || []
groupTreeData.value = rootItems.map(item => ({
src/views/product/UserGoodsList.vue
+269 -11
View File
@@ -57,14 +57,14 @@
</div>
<!-- 新增弹窗 -->
<el-dialog v-model="createVisible" title="新增用户商品" width="560px" destroy-on-close>
<el-dialog v-model="createVisible" title="新增用户商品" width="600px" destroy-on-close class="scrollable-dialog">
<el-form ref="createFormRef" :model="createForm" :rules="createRules" label-width="110px">
<el-form-item label="商品" prop="good_id">
<div class="selector-row">
<el-input :model-value="createForm._goodName || (createForm.good_id ? `商品 #${createForm.good_id}` : '')"
readonly placeholder="请选择商品" style="flex:1" />
<el-button type="primary" @click="showProductSelector = true" style="margin-left:8px">选择</el-button>
<el-button v-if="createForm.good_id" @click="createForm.good_id = 0; createForm._goodName = ''" style="margin-left:4px">清除</el-button>
<el-button v-if="createForm.good_id" @click="createForm.good_id = 0; createForm._goodName = ''; createForm._goodTag = ''; createForm.item_id = 0; createForm._itemName = ''; clearArgsConfig()" style="margin-left:4px">清除</el-button>
</div>
</el-form-item>
<el-form-item label="用户" prop="user_id">
@@ -86,11 +86,37 @@
<el-form-item label="套餐">
<div class="selector-row">
<el-input :model-value="createForm._planName || (createForm.good_plan_id ? `套餐 #${createForm.good_plan_id}` : '')"
readonly placeholder="可选" style="flex:1" />
readonly placeholder="可选，选择后自动填入参数" style="flex:1" />
<el-button type="primary" @click="showPlanSelector = true" style="margin-left:8px">选择</el-button>
<el-button v-if="createForm.good_plan_id" @click="createForm.good_plan_id = 0; createForm._planName = ''" style="margin-left:4px">清除</el-button>
</div>
</el-form-item>
<!-- 订单参数配置 -->
<el-form-item label="订单参数">
<div class="selector-row">
<el-input :model-value="createForm.order_args ? `已配置 ${argsCount} 个参数` : ''"
readonly placeholder="可选，点击配置参数" style="flex:1" />
<el-button type="primary" @click="openArgsDialog" :disabled="!createForm.good_id" style="margin-left:8px">配置</el-button>
<el-button v-if="createForm.order_args" @click="createForm.order_args = ''; clearArgsConfig()" style="margin-left:4px">清除</el-button>
</div>
<div v-if="!createForm.good_id" style="font-size:12px;color:#c0c4cc;margin-top:4px">请先选择商品</div>
</el-form-item>
<el-form-item label="归属项">
<div class="selector-row">
<el-input :model-value="createForm._itemName || (createForm.item_id ? `#${createForm.item_id}` : '')"
readonly placeholder="可选" style="flex:1" />
<el-button type="primary" @click="handleItemSelect" :disabled="!createForm.good_id" style="margin-left:8px">
{{ createForm._goodTag === '云服务器' ? '选择虚拟机' : '使用商品ID' }}
</el-button>
<el-button v-if="createForm.item_id" @click="createForm.item_id = 0; createForm._itemName = ''" style="margin-left:4px">清除</el-button>
</div>
<div v-if="!createForm.good_id" style="font-size:12px;color:#c0c4cc;margin-top:4px">请先选择商品</div>
<div v-else-if="createForm._goodTag === '云服务器'" style="font-size:12px;color:#909399;margin-top:4px">云服务器商品，点击选择用户虚拟机作为归属项</div>
<div v-else style="font-size:12px;color:#909399;margin-top:4px">普通商品，点击将商品ID赋值为归属项</div>
</el-form-item>
<el-form-item label="续费价格(元)">
<el-input-number v-model="createForm._renewYuan" :min="0" :precision="2" controls-position="right" style="width:100%" />
</el-form-item>
@@ -134,21 +160,99 @@
</template>
</el-dialog>
<ProductSelector v-model="showProductSelector" @confirm="p => { createForm.good_id = p.id; createForm._goodName = p.name }" />
<ProductSelector v-model="showProductSelector" @confirm="handleProductSelected" />
<UserSelector v-model:visible="showUserSelector" @select="u => { createForm.user_id = u.user_id; createForm._userName = u.user_name }" />
<OrderSelector v-model="showOrderSelector" @confirm="o => { createForm.order_id = o.id; createForm._orderName = o.name }" />
<PlanSelector v-model="showPlanSelector" :good-id="createForm.good_id" @confirm="p => { createForm.good_plan_id = p.id; createForm._planName = p.name }" />
<PlanSelector v-model="showPlanSelector" :good-id="createForm.good_id" @confirm="handlePlanSelectedForCreate" />
<!-- 用户虚拟机选择弹窗（item_id 为云服务器时使用） -->
<el-dialog v-model="showVmListDialog" title="选择用户虚拟机" width="800px" append-to-body destroy-on-close>
<div class="filter-section" style="margin-bottom:12px">
<el-form :inline="true" size="default">
<el-form-item label="关键词">
<el-input v-model="vmListQuery.key" placeholder="搜索" clearable style="width:180px"
@keyup.enter="loadVmListForItem" @clear="loadVmListForItem" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="loadVmListForItem">搜索</el-button>
</el-form-item>
</el-form>
</div>
<el-table :data="vmListForItem" v-loading="vmListLoading" highlight-current-row
@current-change="r => vmListSelected = r" :height="350" style="width:100%">
<el-table-column prop="id" label="ID" width="80" />
<el-table-column label="用户" min-width="120">
<template #default="{ row }">{{ row.user?.UserName || row.user?.username || '-' }}</template>
</el-table-column>
<el-table-column label="商品" min-width="140" show-overflow-tooltip>
<template #default="{ row }">{{ row.good?.name || '-' }}</template>
</el-table-column>
<el-table-column label="归属项ID" width="100">
<template #default="{ row }">{{ row.itemId || row.item_id || '-' }}</template>
</el-table-column>
<el-table-column label="到期时间" width="170">
<template #default="{ row }">{{ formatExpireTime(row.expireTime || row.expire_time) }}</template>
</el-table-column>
</el-table>
<div style="display:flex;justify-content:flex-end;margin-top:12px">
<el-pagination v-model:current-page="vmListQuery.page" v-model:page-size="vmListQuery.count"
:total="vmListTotal" :page-sizes="[10,20,50]" layout="total,sizes,prev,pager,next"
@size-change="s => { vmListQuery.count = s; vmListQuery.page = 1; loadVmListForItem() }"
@current-change="p => { vmListQuery.page = p; loadVmListForItem() }" />
</div>
<template #footer>
<el-button @click="showVmListDialog = false">取消</el-button>
<el-button type="primary" :disabled="!vmListSelected" @click="confirmVmForItem">确定选择</el-button>
</template>
</el-dialog>
<!-- 订单参数配置弹窗 -->
<el-dialog v-model="showArgsDialog" title="配置订单参数" width="600px" append-to-body destroy-on-close class="scrollable-dialog">
<div v-if="argsSpecLoading" style="text-align:center;padding:20px;color:#909399">加载参数中...</div>
<div v-else-if="argsSpecList.length === 0" style="text-align:center;padding:20px;color:#909399">该商品暂无参数配置</div>
<div v-else>
<div v-for="spec in argsSpecList" :key="spec.id" style="margin-bottom:16px;padding-bottom:16px;border-bottom:1px solid #f0f0f0">
<div style="font-size:14px;font-weight:500;color:#303133;margin-bottom:8px">
{{ spec.name }}
<el-tag v-if="spec.must" size="small" type="danger" style="margin-left:6px">必填</el-tag>
</div>
<template v-if="spec.type === 'select' && spec.attrs && spec.attrs.length > 0">
<el-radio-group v-model="argsValues[spec.id]" size="small" @change="buildArgsJson">
<el-radio-button v-for="attr in spec.attrs" :key="attr.id" :value="attr.id">{{ attr.name }}</el-radio-button>
</el-radio-group>
</template>
<template v-else-if="spec.type === 'number'">
<div style="display:flex;align-items:center;gap:12px">
<el-input-number v-model="argsValues[spec.id]" :min="spec.min || 0" :max="spec.max || 9999" :step="spec.step || 1" :step-strictly="true" @change="buildArgsJson" style="width:200px" />
<span style="font-size:12px;color:#909399">范围: {{ spec.min || 0 }} ~ {{ spec.max || 9999 }}，步长: {{ spec.step || 1 }}</span>
</div>
</template>
<template v-else>
<el-input v-model="argsValues[spec.id]" placeholder="请输入值" style="width:200px" @input="buildArgsJson" />
</template>
</div>
<div v-if="createForm.order_args" style="margin-top:8px">
<div style="font-size:12px;color:#909399;margin-bottom:6px">生成的参数 JSON：</div>
<el-input v-model="createForm.order_args" type="textarea" :rows="4" readonly style="font-family:monospace;font-size:12px" />
</div>
</div>
<template #footer>
<el-button @click="showArgsDialog = false">取消</el-button>
<el-button type="primary" @click="showArgsDialog = false">确定</el-button>
</template>
</el-dialog>
</div>
</template>
<script setup>
import { ref, reactive, onMounted } from 'vue'
import { ref, reactive, computed, onMounted, watch } from 'vue'
import { useRouter } from 'vue-router'
import { ElMessage, ElMessageBox } from 'element-plus'
import { Plus, Refresh, Search } from '@element-plus/icons-vue'
import { getUserGoodsList, createUserGoods, updateUserGoods, deleteUserGoods } from '@/api/admin/userVm'
import { getUserGoodsList, createUserGoods, updateUserGoods, deleteUserGoods, getUserVmList } from '@/api/admin/userVm'
import { extractApiError } from '@/utils/kvmErrorUtil'
import { formatToApiTime } from '@/utils/tool'
import { getProductParameterList, getProductPlanDetail } from '@/api/admin/product'
import ProductSelector from '@/components/admin/ProductSelector.vue'
import UserSelector from '@/components/UserSelector/index.vue'
import OrderSelector from '@/components/admin/OrderSelector.vue'
@@ -188,7 +292,86 @@ const loadList = async () => {
const handleSearch = () => { query.page = 1; loadList() }
// ---- 详情 ----
// ---- 订单参数配置 ----
const argsSpecList = ref([])
const argsSpecLoading = ref(false)
const argsValues = reactive({})
const showArgsDialog = ref(false)
const argsCount = computed(() => {
try { const arr = JSON.parse(createForm.order_args || '[]'); return Array.isArray(arr) ? arr.length : 0 } catch { return 0 }
})
const openArgsDialog = () => {
if (!createForm.good_id) return
showArgsDialog.value = true
if (argsSpecList.value.length === 0) loadArgsSpec(createForm.good_id)
}
const clearArgsConfig = () => {
argsSpecList.value = []
for (const k in argsValues) delete argsValues[k]
createForm.order_args = ''
}
const loadArgsSpec = async (goodId) => {
if (!goodId) return
argsSpecLoading.value = true
try {
const res = await getProductParameterList({ good_id: goodId })
if (res?.data?.code === 200) {
argsSpecList.value = res.data.data || []
// 初始化 number 类型的默认值
for (const spec of argsSpecList.value) {
if (spec.type === 'number' && argsValues[spec.id] === undefined) {
argsValues[spec.id] = spec.min || 0
}
}
}
} catch { argsSpecList.value = [] } finally { argsSpecLoading.value = false }
}
const buildArgsJson = () => {
const result = []
for (const spec of argsSpecList.value) {
const val = argsValues[spec.id]
if (val === undefined || val === null || val === '') continue
if (spec.type === 'select') {
const attr = spec.attrs?.find(a => a.id === val)
if (attr) result.push({ arg_id: spec.id, name: spec.name, attr_id: attr.id, value: attr.value, number: 0 })
} else if (spec.type === 'number') {
result.push({ arg_id: spec.id, name: spec.name, attr_id: 0, value: '', number: val })
} else {
result.push({ arg_id: spec.id, name: spec.name, attr_id: 0, value: String(val), number: 0 })
}
}
createForm.order_args = result.length > 0 ? JSON.stringify(result) : ''
}
// 选择套餐后自动填入参数
const handlePlanSelectedForCreate = async (plan) => {
createForm.good_plan_id = plan.id
createForm._planName = plan.name
// 解析套餐的 args 字段自动填入参数值
if (plan.args) {
try {
const planArgs = typeof plan.args === 'string' ? JSON.parse(plan.args) : plan.args
if (Array.isArray(planArgs)) {
for (const arg of planArgs) {
if (arg.arg_id) {
if (arg.attr_id) argsValues[arg.arg_id] = arg.attr_id
else if (arg.number !== undefined) argsValues[arg.arg_id] = arg.number
else if (arg.value) argsValues[arg.arg_id] = arg.value
}
}
buildArgsJson()
}
} catch { /* */ }
}
}
// 选择商品后加载参数
// watch 在 createForm 声明后定义，见下方
const handleDetail = (row) => {
router.push({ path: '/user-goods/vm-detail', query: { id: row.id } })
}
@@ -202,17 +385,80 @@ const showUserSelector = ref(false)
const showOrderSelector = ref(false)
const showPlanSelector = ref(false)
const createForm = reactive({
good_id: 0, _goodName: '', user_id: 0, _userName: '',
good_id: 0, _goodName: '', _goodTag: '', user_id: 0, _userName: '',
order_id: 0, _orderName: '', good_plan_id: 0, _planName: '',
_renewYuan: 0, _baseYuan: 0, note: '', expire_time: ''
item_id: 0, _itemName: '',
_renewYuan: 0, _baseYuan: 0, note: '', expire_time: '',
order_args: ''
})
const createRules = {
good_id: [{ required: true, validator: (r, v, cb) => v > 0 ? cb() : cb(new Error('请选择商品')), trigger: 'change' }],
user_id: [{ required: true, validator: (r, v, cb) => v > 0 ? cb() : cb(new Error('请选择用户')), trigger: 'change' }]
}
// 商品选择确认处理
const handleProductSelected = (p) => {
createForm.good_id = p.id
createForm._goodName = p.name
createForm._goodTag = p.tag || ''
createForm.item_id = 0
createForm._itemName = ''
}
// ---- 归属项选择（item_id） ----
const showVmListDialog = ref(false)
const vmListForItem = ref([])
const vmListLoading = ref(false)
const vmListTotal = ref(0)
const vmListSelected = ref(null)
const vmListQuery = reactive({ page: 1, count: 10, key: '' })
const handleItemSelect = () => {
if (!createForm.good_id) return
if (createForm._goodTag === '云服务器') {
vmListSelected.value = null
vmListQuery.page = 1
vmListQuery.key = ''
showVmListDialog.value = true
loadVmListForItem()
} else {
createForm.item_id = createForm.good_id
createForm._itemName = `商品 #${createForm.good_id}`
ElMessage.success('已将商品ID赋值为归属项')
}
}
const loadVmListForItem = async () => {
vmListLoading.value = true
try {
const params = { page: vmListQuery.page, count: vmListQuery.count }
if (vmListQuery.key) params.key = vmListQuery.key
const res = await getUserVmList(params)
if (res?.data?.code === 200 && res?.data?.data) {
const d = res.data.data
vmListForItem.value = d.data || (Array.isArray(d) ? d : [])
vmListTotal.value = d.all_count ?? d.total ?? vmListForItem.value.length
} else { vmListForItem.value = []; vmListTotal.value = 0 }
} catch { vmListForItem.value = []; vmListTotal.value = 0 } finally { vmListLoading.value = false }
}
const confirmVmForItem = () => {
if (!vmListSelected.value) return
const vm = vmListSelected.value
createForm.item_id = vm.id
createForm._itemName = `虚拟机 #${vm.id}${vm.good?.name ? ` (${vm.good.name})` : ''}`
showVmListDialog.value = false
}
// 选择商品后加载参数
watch(() => createForm.good_id, (id) => {
if (id) loadArgsSpec(id)
else clearArgsConfig()
})
const handleCreate = () => {
Object.assign(createForm, { good_id: 0, _goodName: '', user_id: 0, _userName: '', order_id: 0, _orderName: '', good_plan_id: 0, _planName: '', _renewYuan: 0, _baseYuan: 0, note: '', expire_time: '' })
Object.assign(createForm, { good_id: 0, _goodName: '', _goodTag: '', user_id: 0, _userName: '', order_id: 0, _orderName: '', good_plan_id: 0, _planName: '', item_id: 0, _itemName: '', _renewYuan: 0, _baseYuan: 0, note: '', expire_time: '', order_args: '' })
clearArgsConfig()
createVisible.value = true
}
@@ -224,10 +470,12 @@ const submitCreate = () => {
const payload = {
good_id: createForm.good_id, user_id: createForm.user_id,
order_id: createForm.order_id, good_plan_id: createForm.good_plan_id,
item_id: createForm.item_id || 0,
note: createForm.note,
renew_price: Math.round((createForm._renewYuan || 0) * 100),
base_price: Math.round((createForm._baseYuan || 0) * 100)
}
if (createForm.order_args) payload.order_args = createForm.order_args
if (createForm.expire_time) payload.expire_time = formatToApiTime(createForm.expire_time)
const res = await createUserGoods(payload)
if (res?.data?.code === 200) { ElMessage.success('新增成功'); createVisible.value = false; loadList() }
@@ -288,4 +536,14 @@ onMounted(loadList)
.toolbar-left, .toolbar-right { display: flex; gap: 8px; align-items: center; }
.pagination-wrapper { display: flex; justify-content: flex-end; margin-top: 16px; }
.selector-row { display: flex; align-items: center; width: 100%; }
:global(.scrollable-dialog .el-dialog__body) {
max-height: 70vh;
overflow-y: auto;
overflow-x: hidden;
scrollbar-width: none;
}
:global(.scrollable-dialog .el-dialog__body::-webkit-scrollbar) {
display: none;
}
</style>
src/views/system/SettingManage.vue
+4 -4
View File
@@ -905,7 +905,7 @@ const loadChildren = async (row) => {
try {
const groupId = row.data.id
console.log('Loading children for group:', groupId)
const res = await getSettingList({ group_id: groupId, page: 1, count: 100 })
const res = await getSettingList({ group_id: groupId, page: 1, count: 10 })
console.log('getSettingList response:', res.data)
if (res.data.code === 200) {
let settings = res.data.data.data || []
@@ -958,7 +958,7 @@ const toggleExpand = async (row) => {
// 初始化加载配置组
const loadGroups = async () => {
try {
const res = await getSettingGroupList({ page: 1, count: 100 })
const res = await getSettingGroupList({ page: 1, count: 10 })
console.log('getSettingGroupList response:', res.data)
if (res.data.code === 200) {
const groups = res.data.data.data || []
@@ -1322,7 +1322,7 @@ const fetchGroupList = async () => {
const fetchAllGroupList = async () => {
try {
const res = await getSettingGroupList({ page: 1, count: 100 })
const res = await getSettingGroupList({ page: 1, count: 10 })
if (res.data.code === 200) {
allGroupList.value = res.data.data.data || []
}
@@ -2560,7 +2560,7 @@ const handleCopyGroupSettings = async (row) => {
if (row._expanded && row._children && row._children.length > 0) {
settings = row._children.map(child => child.data)
} else {
const res = await getSettingList({ group_id: groupId, page: 1, count: 100 })
const res = await getSettingList({ group_id: groupId, page: 1, count: 10 })
if (res.data.code === 200) {
settings = res.data.data.data || []
}
src/views/ticket/TicketList.vue
+1 -1
View File
@@ -363,7 +363,7 @@ const handleUserSearch = () => {
userSearchTimer.value = setTimeout(async () => {
try {
isSearchingUser.value = true
const res = await getUserList({ page: 1, count: 20, key: keyword })
const res = await getUserList({ page: 1, count: 10, key: keyword })
console.log('用户搜索响应:', res)
src/views/user-vm/UserVmDetail.vue
+828 -100
View File
File diff suppressed because it is too large Load Diff
src/views/user-vm/UserVmList.vue
+2 -2
View File
@@ -48,13 +48,13 @@
</el-table-column>
<el-table-column label="续费价" width="90">
<template #default="{ row }">
<span v-if="row.renewPrice">¥{{ (row.renewPrice).toFixed(2) }}</span>
<span v-if="row.renewPrice">¥{{ (row.renewPrice / 100).toFixed(2) }}</span>
<span v-else style="color:#c0c4cc">-</span>
</template>
</el-table-column>
<el-table-column label="基础价" width="90">
<template #default="{ row }">
<span v-if="row.basePrice">¥{{ (row.basePrice ).toFixed(2) }}</span>
<span v-if="row.basePrice">¥{{ (row.basePrice / 100).toFixed(2) }}</span>
<span v-else style="color:#c0c4cc">-</span>
</template>
</el-table-column>
src/views/user/UserBalance.vue
+1 -1
View File
@@ -305,7 +305,7 @@ const currentBalanceDisplay = computed(() => {
// 获取用户列表（用于显示用户名）
const getUserListData = async () => {
try {
const res = await getUserList({ page: 1, count: 1000, key: '' })
const res = await getUserList({ page: 1, count: 10, key: '' })
if (res.data.code === 200) {
userList.value = res.data.data.data || []
}
src/views/user/UserDetail.vue
+2 -2
View File
@@ -866,7 +866,7 @@ const handleGroupManage = () => {
}
const fetchUserGroupList = async () => {
const res = await getUserGroupList({ page: 1, count: 100 })
const res = await getUserGroupList({ page: 1, count: 10 })
if (res.data.code == 200) {
userGroupList.value = res.data.data.data
}
@@ -1276,7 +1276,7 @@ const handleTokenManage = async () => {
const fetchAdminGroupList = async () => {
adminGroupLoading.value = true
try {
const res = await getAdminGroupList({ params: { page: 1, count: 100 } })
const res = await getAdminGroupList({ params: { page: 1, count: 10 } })
if (res.data.code === 200) {
adminGroupList.value = res.data.data?.data || res.data.data || []
}
src/views/virtualization/BackupManage.vue
+1 -1
View File
@@ -125,7 +125,7 @@ const vmOptionsLoading = ref(false)
const loadVmOptions = async () => {
vmOptionsLoading.value = true
try {
const res = await getVmList({ service_id: serviceId.value, page: 1, page_size: 500 })
const res = await getVmList({ service_id: serviceId.value, page: 1, page_size: 10 })
if (res?.data?.code === 200 && res?.data?.data) {
const inner = res.data.data
vmOptions.value = inner.vms || inner.data || inner.list || (Array.isArray(inner) ? inner : [])
src/views/virtualization/SnapshotManage.vue
+1 -1
View File
@@ -125,7 +125,7 @@ const vmOptionsLoading = ref(false)
const loadVmOptions = async () => {
vmOptionsLoading.value = true
try {
const res = await getVmList({ service_id: serviceId.value, page: 1, page_size: 500 })
const res = await getVmList({ service_id: serviceId.value, page: 1, page_size: 10 })
if (res?.data?.code === 200 && res?.data?.data) {
const inner = res.data.data
vmOptions.value = inner.vms || inner.data || inner.list || (Array.isArray(inner) ? inner : [])
src/views/virtualization/UserNetworkingManage.vue
+1 -1
View File
@@ -236,7 +236,7 @@ const getHostLabel = (hid) => {
const loadHostOptions = async () => {
try {
const res = await getRemoteHostList({ service_id: serviceId.value, page: 1, page_size: 200 })
const res = await getRemoteHostList({ service_id: serviceId.value, page: 1, page_size: 10 })
const body = res?.data
if (body?.code === 200 && body?.data) {
const inner = body.data
src/views/virtualization/VmDetail.vue
+164 -11
View File
@@ -34,6 +34,7 @@
<el-dropdown-item command="rescue">救援模式</el-dropdown-item>
<el-dropdown-item command="exitRescue">退出救援</el-dropdown-item>
<el-dropdown-item divided command="migrateVm">迁移虚拟机</el-dropdown-item>
<el-dropdown-item command="dataMigrateVm">数据迁移</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
@@ -225,7 +226,7 @@
</el-table-column> -->
<el-table-column label="状态" width="80">
<template #default="{ row }">
<el-tag :type="row.status === 'ready' ? 'success' : 'info'" size="small">{{ row.status === 'ready' ? '就绪' : (row.status || '-') }}</el-tag>
<el-tag :type="volumeStatusType(row.status)" size="small">{{ volumeStatusLabel(row.status) }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="path" label="路径" min-width="160" show-overflow-tooltip>
@@ -259,7 +260,7 @@
<div style="display: flex; gap: 8px">
<el-button size="small" type="primary" @click="handleSgCreate"><el-icon><Plus /></el-icon>创建安全组</el-button>
<el-button size="small" @click="handleSgBind">绑定安全组</el-button>
<el-button size="small" :icon="Refresh" @click="loadDetail">刷新</el-button>
<el-button size="small" :icon="Refresh" @click="async () => { await loadDetail(); loadSgLockInfo() }">刷新</el-button>
</div>
</div>
<el-table :data="pagedSecurityGroups" size="small" stripe>
@@ -789,8 +790,8 @@
<el-form-item label="上行带宽(Mbps)">
<el-input-number v-model="trafficForm.tx_bandwidth" :min="0" controls-position="right" style="width: 100%" />
</el-form-item>
<el-form-item label="每月最大流量(MB)">
<el-input-number v-model="trafficForm.traffic_max" :min="0" controls-position="right" style="width: 100%" />
<el-form-item label="流量上限(GB)">
<el-input-number v-model="trafficForm._trafficGB" :min="0" :precision="2" controls-position="right" style="width: 100%" />
</el-form-item>
</el-form>
<template #footer>
@@ -841,6 +842,66 @@
</template>
</el-dialog>
<!-- 数据迁移弹窗 -->
<el-dialog v-model="dataMigrateVisible" title="发起虚拟机数据迁移" width="580px" destroy-on-close>
<el-alert type="info" :closable="false" style="margin-bottom:16px">
源服务的虚拟机数据将通过 rsync 传输到目标服务的宿主机上，完成后在目标宿主机上校验并恢复虚拟机。
</el-alert>
<el-form :model="dataMigrateForm" label-width="130px" v-loading="dataMigrateLoading">
<el-form-item label="源主控服务">
<el-input :model-value="`${serviceName} (ID: ${serviceId})`" disabled />
</el-form-item>
<el-form-item label="源虚拟机">
<el-input :model-value="`${detail?.name || ''} (ID: ${vmId})`" disabled />
</el-form-item>
<el-form-item label="目标主控服务" required>
<el-select v-model="dataMigrateForm.target_service_id" placeholder="选择目标主控服务" filterable style="width:100%"
@change="dataMigrateForm.target_host_id = null; loadDataMigrateHosts()">
<el-option v-for="s in dataMigrateServiceOptions" :key="s.id" :label="`${s.name} (ID:${s.id})`" :value="s.id" />
</el-select>
</el-form-item>
<el-form-item label="目标宿主机" required>
<el-select v-model="dataMigrateForm.target_host_id" placeholder="选择目标宿主机" filterable style="width:100%"
:disabled="!dataMigrateForm.target_service_id" :loading="dataMigrateHostsLoading">
<el-option v-for="h in dataMigrateHostOptions" :key="h.id" :label="`${h.name} (${h.ip || h.id})`" :value="h.id" />
</el-select>
</el-form-item>
<el-row :gutter="16">
<el-col :span="12">
<el-form-item label="IPv4数量">
<el-input-number v-model="dataMigrateForm.ipv4_num" :min="0" controls-position="right" style="width:100%" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="IPv6数量">
<el-input-number v-model="dataMigrateForm.ipv6_num" :min="0" controls-position="right" style="width:100%" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<el-button @click="dataMigrateVisible = false">取消</el-button>
<el-button type="primary" :loading="actionLoading" @click="submitDataMigrate">发起迁移</el-button>
</template>
</el-dialog>
<!-- 数据迁移进度弹窗 -->
<el-dialog v-model="dataMigrateProgressVisible" title="数据迁移进度" width="480px" destroy-on-close>
<div v-loading="dataMigrateProgressLoading">
<el-descriptions :column="1" border size="small" v-if="dataMigrateProgressData">
<el-descriptions-item label="迁移ID"><span style="font-family:monospace;font-size:12px">{{ dataMigrateProgressData.migration_id || '-' }}</span></el-descriptions-item>
<el-descriptions-item label="状态"><el-tag :type="taskStatusType(dataMigrateProgressData.status)" size="small">{{ dataMigrateProgressData.status || '-' }}</el-tag></el-descriptions-item>
<el-descriptions-item label="进度" v-if="dataMigrateProgressData.progress != null">{{ dataMigrateProgressData.progress }}%</el-descriptions-item>
<el-descriptions-item label="信息" v-if="dataMigrateProgressData.message">{{ dataMigrateProgressData.message }}</el-descriptions-item>
</el-descriptions>
<el-empty v-else-if="!dataMigrateProgressLoading" description="暂无进度信息" :image-size="60" />
</div>
<template #footer>
<el-button @click="dataMigrateProgressVisible = false">关闭</el-button>
<el-button :icon="Refresh" @click="loadDataMigrateProgress" :loading="dataMigrateProgressLoading">刷新进度</el-button>
</template>
</el-dialog>
<!-- 绑定外网选择器（bridge） -->
<NetworkSelectorPopup v-model="showNetBindBridgeSelector" :service-id="serviceId" :host-id="vmHostId" filter-type="bridge" filter-used="false" @confirm="handleNetBindBridgeConfirm" @create="() => handleNetCreate('bindBridge')" />
<!-- 绑定内网选择器（nat） -->
@@ -1175,10 +1236,13 @@ import {
getVmList, bindSecurityGroup, unbindSecurityGroup,
getSnapshotList, createSnapshot, restoreSnapshot, deleteSnapshot, getSnapshotProgress, getSnapshotCount, setSnapshotLimit,
getBackupList, createBackup, restoreBackup, deleteBackup, getBackupProgress, getBackupCount, setBackupLimit,
migrateVm, getRemoteHostGroupList, getRemoteHostDetail
migrateVm, getRemoteHostGroupList, getRemoteHostDetail,
dataMigrateVm, getDataMigrateProgress,
getKvmServiceList
} from '@/api/admin/kvmService'
import { getUserInfo } from '@/api/admin/user'
import { extractApiError } from '@/utils/kvmErrorUtil'
import { vmStatusLabel as vmStatusLabelUtil, vmStatusType as vmStatusTypeUtil, volumeStatusLabel, volumeStatusType } from '@/utils/tool'
import * as echarts from 'echarts'
import ImageSelectorPopup from '@/components/admin/ImageSelectorPopup.vue'
import NetworkSelectorPopup from '@/components/admin/NetworkSelectorPopup.vue'
@@ -1264,10 +1328,11 @@ const handleMoreCommand = (cmd) => {
migrateVm: handleMigrateVm
}
if (actionMap[cmd]) actionMap[cmd]()
if (cmd === 'dataMigrateVm') handleDataMigrateVm()
}
const vmStatusType = (s) => ({ running: 'success', ready: 'success', creating: 'warning', pending: 'info', stopped: 'danger', stop: 'danger', shutoff: 'danger', error: 'danger', paused: 'warning', reboot: 'warning', poweroff: 'info', unknown: 'info' }[s] || 'info')
const vmStatusLabel = (s) => ({ running: '运行中', ready: '就绪', creating: '创建中', pending: '等待中', stopped: '已停止', stop: '已停止', shutoff: '已关闭', error: '错误', paused: '已暂停', reboot: '重启中', poweroff: '已关机', unknown: '未知' }[s] || s || '-')
const vmStatusType = (s) => vmStatusTypeUtil(s)
const vmStatusLabel = (s) => vmStatusLabelUtil(s)
const imgStatusType = (s) => ({ ready: 'success', downloading: 'warning', pending: 'info', error: 'danger' }[s] || 'info')
const imgStatusLabel = (s) => ({ ready: '就绪', downloading: '下载中', pending: '等待中', error: '错误' }[s] || s || '-')
@@ -1696,14 +1761,14 @@ const submitRefactorVm = async () => {
// ---- 修改带宽 ----
const trafficDialogVisible = ref(false)
const trafficForm = reactive({ rx_bandwidth: 0, tx_bandwidth: 0, traffic_max: 0 })
const trafficForm = reactive({ rx_bandwidth: 0, tx_bandwidth: 0, _trafficGB: 0 })
const handleUpdateTraffic = () => {
if (!detail.value) return
Object.assign(trafficForm, {
rx_bandwidth: detail.value.rx_bandwidth || 0,
tx_bandwidth: detail.value.tx_bandwidth || 0,
traffic_max: detail.value.traffic_max || 0
_trafficGB: ((detail.value.traffic_max || 0) / 1024).toFixed(2) * 1
})
trafficDialogVisible.value = true
}
@@ -1716,7 +1781,7 @@ const submitUpdateTraffic = async () => {
fd.append('vm_id', vmId.value)
fd.append('rx_bandwidth', trafficForm.rx_bandwidth)
fd.append('tx_bandwidth', trafficForm.tx_bandwidth)
if (trafficForm.traffic_max) fd.append('traffic_max', trafficForm.traffic_max)
if (trafficForm._trafficGB) fd.append('traffic_max', Math.round(trafficForm._trafficGB * 1024)) // GB → Mb
const res = await updateVmTraffic(fd)
if (res?.data?.code === 200) { ElMessage.success('带宽修改成功'); trafficDialogVisible.value = false; loadDetail() }
else ElMessage.error(extractApiError(res?.data, '修改失败'))
@@ -1770,6 +1835,78 @@ const submitMigrateVm = async () => {
} catch (e) { ElMessage.error(extractApiError(e?.response?.data, '迁移失败')) } finally { actionLoading.value = false }
}
// ---- 数据迁移 ----
const dataMigrateVisible = ref(false)
const dataMigrateLoading = ref(false)
const dataMigrateHostsLoading = ref(false)
const dataMigrateServiceOptions = ref([])
const dataMigrateHostOptions = ref([])
const dataMigrateProgressVisible = ref(false)
const dataMigrateProgressLoading = ref(false)
const dataMigrateProgressData = ref(null)
const dataMigrationId = ref('')
const dataMigrateForm = reactive({ target_service_id: null, target_host_id: null, ipv4_num: 0, ipv6_num: 0 })
const handleDataMigrateVm = async () => {
Object.assign(dataMigrateForm, { target_service_id: null, target_host_id: null, ipv4_num: 0, ipv6_num: 0 })
dataMigrateVisible.value = true
dataMigrateLoading.value = true
try {
const res = await getKvmServiceList({ page: 1, count: 10 })
if (res?.data?.code === 200 && res?.data?.data) {
const inner = res.data.data
const raw = inner.data || inner.list || (Array.isArray(inner) ? inner : [])
dataMigrateServiceOptions.value = raw.map(s => ({ id: s.id ?? s.Id, name: s.name ?? s.Name }))
}
} catch { /* */ } finally { dataMigrateLoading.value = false }
}
const loadDataMigrateHosts = async () => {
if (!dataMigrateForm.target_service_id) return
dataMigrateHostsLoading.value = true
try {
const res = await getRemoteHostList({ service_id: dataMigrateForm.target_service_id, page: 1, page_size: 10 })
if (res?.data?.code === 200 && res?.data?.data) {
const inner = res.data.data
dataMigrateHostOptions.value = Array.isArray(inner) ? inner : (inner.hosts || inner.data || [])
}
} catch { /* */ } finally { dataMigrateHostsLoading.value = false }
}
const submitDataMigrate = async () => {
if (!dataMigrateForm.target_service_id) { ElMessage.warning('请选择目标主控服务'); return }
if (!dataMigrateForm.target_host_id) { ElMessage.warning('请选择目标宿主机'); return }
actionLoading.value = true
try {
const fd = new FormData()
fd.append('source_service_id', serviceId.value)
fd.append('source_vm_id', vmId.value)
fd.append('target_service_id', dataMigrateForm.target_service_id)
fd.append('target_host_id', dataMigrateForm.target_host_id)
if (dataMigrateForm.ipv4_num) fd.append('ipv4_num', dataMigrateForm.ipv4_num)
if (dataMigrateForm.ipv6_num) fd.append('ipv6_num', dataMigrateForm.ipv6_num)
const res = await dataMigrateVm(fd)
if (res?.data?.code === 200) {
ElMessage.success('数据迁移已发起')
dataMigrationId.value = res.data.data?.migration_id || ''
dataMigrateVisible.value = false
// 自动打开进度弹窗
dataMigrateProgressData.value = res.data.data
dataMigrateProgressVisible.value = true
} else ElMessage.error(extractApiError(res?.data, '发起迁移失败'))
} catch (e) { ElMessage.error(extractApiError(e?.response?.data, '发起迁移失败')) } finally { actionLoading.value = false }
}
const loadDataMigrateProgress = async () => {
if (!dataMigrationId.value) return
dataMigrateProgressLoading.value = true
try {
const res = await getDataMigrateProgress({ migration_id: dataMigrationId.value, service_id: serviceId.value })
if (res?.data?.code === 200) dataMigrateProgressData.value = res.data.data
else ElMessage.warning('暂无进度信息')
} catch { /* */ } finally { dataMigrateProgressLoading.value = false }
}
// ---- VNC 连接 ----
const vncDialogVisible = ref(false)
const vncNodeId = ref(null)
@@ -2048,7 +2185,7 @@ const handleVolUnmount = (row) => {
}
const loadVmListOptions = async () => {
try {
const res = await getVmList({ service_id: serviceId.value, page: 1, page_size: 200 })
const res = await getVmList({ service_id: serviceId.value, page: 1, page_size: 10 })
if (res?.data?.code === 200 && res?.data?.data) {
const inner = res.data.data
vmListOptions.value = inner.vms || inner.data || (Array.isArray(inner) ? inner : [])
@@ -2790,6 +2927,22 @@ const triggerTabLoad = (tab) => {
if (tab === 'snapshot') { loadSnapshots(); loadSnapshotQuota() }
if (tab === 'backup') { loadBackups(); loadBackupQuota() }
if (tab === 'userNetworking') loadVmNetworkingList()
if (tab === 'security') loadSgLockInfo()
}
// 请求安全组详情补充 lock 字段
const loadSgLockInfo = async () => {
const groups = [vmPortGroup.value, vmOutPortGroup.value].filter(Boolean)
for (const sg of groups) {
try {
const res = await getSecurityGroupDetail({ service_id: serviceId.value, id: sg.id })
if (res?.data?.code === 200 && res?.data?.data) {
const d = res.data.data.group || res.data.data.data || res.data.data
if (vmPortGroup.value?.id === sg.id) vmPortGroup.value = { ...vmPortGroup.value, lock: d.lock ?? sg.lock }
if (vmOutPortGroup.value?.id === sg.id) vmOutPortGroup.value = { ...vmOutPortGroup.value, lock: d.lock ?? sg.lock }
}
} catch { /* */ }
}
}
watch(vmId, () => { if (isPageActive) initPage() })
src/views/virtualization/VolumeDetail.vue
+1 -1
View File
@@ -143,7 +143,7 @@ const formatTimestamp = (ts) => {
const loadHostOptions = async () => {
try {
const res = await getRemoteHostList({ service_id: serviceId.value, page: 1, page_size: 100 })
const res = await getRemoteHostList({ service_id: serviceId.value, page: 1, page_size: 10 })
const body = res?.data
if (body?.code === 200 && body?.data) {
const inner = body.data