luo/one-pipe-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 超时时间改为90s, 分配店铺查询
All checks were successful
构建并部署前端到测试环境 / build-and-deploy (push) Successful in 6m11s
Details

Browse Source
This commit is contained in:
luo
2026-09-09 16:40:40 +08:00
parent 65cc63674e
commit fc01fa2ac9
4 changed files with 125 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/http/index.ts
View File

@@ -7,7 +7,7 @@ import { normalizeApiError } from '@/utils/business/apiError'
import { syncCompatibleIdFields } from '@/utils/business/id'
const axiosInstance = axios.create({
timeout: 15000, // 请求超时时间(毫秒)
timeout: 90000, // 请求超时时间(毫秒)
baseURL: import.meta.env.DEV ? '' : import.meta.env.VITE_API_URL, // 开发服务器使用代理，其他模式使用完整URL
withCredentials: false, // 异步请求携带cookie
transformRequest: [

75
src/views/asset-management/device-list/index.vue
View File

@@ -108,6 +108,7 @@
v-model="allocateForm.target_shop_id"
:options="shopCascadeOptions"
:props="shopCascadeProps"
:before-filter="handleAllocateShopBeforeFilter"
placeholder="请选择目标店铺"
clearable
filterable
@@ -1049,6 +1050,62 @@
const batchRealnamePolicyError = ref('')
const exportDialogVisible = ref(false)
const shopCascadeOptions = ref<any[]>([])
let allocateShopSearchRequestId = 0
const mapShopCascadeNodes = (items: any[]) => {
const seen = new Set<number>()
return items.reduce<any[]>((nodes, item) => {
if (seen.has(item.id)) return nodes
seen.add(item.id)
nodes.push({
value: item.id,
label: item.shop_name,
leaf: !item.has_children
})
return nodes
}, [])
}
const handleAllocateShopBeforeFilter = async (query: string) => {
const keyword = query.trim()
if (!keyword) return true
const requestId = ++allocateShopSearchRequestId
try {
const shopResponse = await ShopService.getShops({
page: 1,
page_size: 20,
shop_name: keyword
})
if (requestId !== allocateShopSearchRequestId) return false
if (shopResponse.code !== 0) {
shopCascadeOptions.value = []
return false
}
const parentIds = Array.from(
new Set((shopResponse.data.items || []).map((shop) => shop.parent_id ?? null))
)
const cascadeResponses = await Promise.all(
parentIds.map((parentId) =>
ShopService.getShopsCascade({
shop_name: keyword,
parent_id: parentId ?? undefined
})
)
)
if (requestId !== allocateShopSearchRequestId) return false
shopCascadeOptions.value = mapShopCascadeNodes(
cascadeResponses.flatMap((response) => (response.code === 0 ? response.data || [] : []))
)
return true
} catch (error) {
if (requestId === allocateShopSearchRequestId) shopCascadeOptions.value = []
console.error('搜索批量分配目标店铺失败:', error)
return false
}
}
const shopCascadeProps = {
lazy: true,
checkStrictly: true,
@@ -1059,12 +1116,7 @@
try {
const res = await ShopService.getShopsCascade({ parent_id: parentId })
if (res.code === 0) {
const nodes = (res.data || []).map((item: any) => ({
value: item.id,
label: item.shop_name,
leaf: !item.has_children
}))
resolve(nodes)
resolve(mapShopCascadeNodes(res.data || []))
} else {
resolve([])
}
@@ -1081,11 +1133,7 @@
try {
const res = await ShopService.getShopsCascade({ parent_id: undefined })
if (res.code === 0) {
shopCascadeOptions.value = (res.data || []).map((item: any) => ({
value: item.id,
label: item.shop_name,
leaf: !item.has_children
}))
shopCascadeOptions.value = mapShopCascadeNodes(res.data || [])
}
} catch (error) {
console.error('加载顶级店铺失败:', error)
@@ -2527,10 +2575,7 @@
const showEnterpriseDeviceAuthorizeDialog = async () => {
resetEnterpriseDeviceAuthorizeForm()
await Promise.all([
handleSearchEnterprise(),
loadTopLevelShopCascadeOptions()
])
await Promise.all([handleSearchEnterprise(), loadTopLevelShopCascadeOptions()])
enterpriseDeviceAuthorizeDialogVisible.value = true
enterpriseDeviceAuthorizeFormRef.value?.clearValidate()
}

9
src/views/asset-management/exchange-management/index.vue
View File

@@ -268,8 +268,8 @@
{{ createNewDeviceEmptyMessage }}
</div>
</ElFormItem>
<ElFormItem v-if="createDirectInheritedShopHint" label="归属提示">
<div class="exchange-shop-hint">{{ createDirectInheritedShopHint }}</div>
<ElFormItem label="归属提示">
<div class="exchange-shop-hint">新资产会继承旧资产店铺</div>
</ElFormItem>
<ElFormItem v-if="createForm.flow_type === 'direct'" label="是否迁移数据">
<ElSwitch v-model="createForm.migrate_data" />
@@ -771,11 +771,6 @@
return undefined
}
const createDirectInheritedShopHint = computed(() => {
const shopName = getShopDisplayName(createSelectedNewAsset.value)
return shopName ? `换货完成后将归属：${shopName}` : ''
})
const shipInheritedShopDisplayText = computed(() => {
const shopName = getShopDisplayName(shipSelectedNewAsset.value)

81
src/views/asset-management/iot-card-management/index.vue
View File

@@ -112,6 +112,7 @@
v-model="allocateForm.to_shop_id"
:options="shopCascadeOptions"
:props="shopCascadeProps"
:before-filter="handleAllocateShopBeforeFilter"
placeholder="请选择目标店铺"
clearable
filterable
@@ -1523,6 +1524,62 @@
// 店铺相关
const shopCascadeOptions = ref<any[]>([])
let allocateShopSearchRequestId = 0
const mapShopCascadeNodes = (items: any[]) => {
const seen = new Set<number>()
return items.reduce<any[]>((nodes, item) => {
if (seen.has(item.id)) return nodes
seen.add(item.id)
nodes.push({
value: item.id,
label: item.shop_name,
leaf: !item.has_children
})
return nodes
}, [])
}
const handleAllocateShopBeforeFilter = async (query: string) => {
const keyword = query.trim()
if (!keyword) return true
const requestId = ++allocateShopSearchRequestId
try {
const shopResponse = await ShopService.getShops({
page: 1,
page_size: 20,
shop_name: keyword
})
if (requestId !== allocateShopSearchRequestId) return false
if (shopResponse.code !== 0) {
shopCascadeOptions.value = []
return false
}
const parentIds = Array.from(
new Set((shopResponse.data.items || []).map((shop) => shop.parent_id ?? null))
)
const cascadeResponses = await Promise.all(
parentIds.map((parentId) =>
ShopService.getShopsCascade({
shop_name: keyword,
parent_id: parentId ?? undefined
})
)
)
if (requestId !== allocateShopSearchRequestId) return false
shopCascadeOptions.value = mapShopCascadeNodes(
cascadeResponses.flatMap((response) => (response.code === 0 ? response.data || [] : []))
)
return true
} catch (error) {
if (requestId === allocateShopSearchRequestId) shopCascadeOptions.value = []
console.error('搜索批量分配目标店铺失败:', error)
return false
}
}
const shopCascadeProps = {
lazy: true,
checkStrictly: true,
@@ -1533,12 +1590,7 @@
try {
const res = await ShopService.getShopsCascade({ parent_id: parentId })
if (res.code === 0) {
const nodes = (res.data || []).map((item: any) => ({
value: item.id,
label: item.shop_name,
leaf: !item.has_children
}))
resolve(nodes)
resolve(mapShopCascadeNodes(res.data || []))
} else {
resolve([])
}
@@ -1555,11 +1607,7 @@
try {
const res = await ShopService.getShopsCascade({ parent_id: undefined })
if (res.code === 0) {
shopCascadeOptions.value = (res.data || []).map((item: any) => ({
value: item.id,
label: item.shop_name,
leaf: !item.has_children
}))
shopCascadeOptions.value = mapShopCascadeNodes(res.data || [])
}
} catch (error) {
console.error('加载顶级店铺失败:', error)
@@ -2486,6 +2534,7 @@
return
}
allocateDialogVisible.value = true
shopCascadeOptions.value = []
Object.assign(allocateForm, {
selection_type: CardSelectionType.LIST,
to_shop_id: undefined,
@@ -2700,10 +2749,7 @@
const showEnterpriseCardRecallDialog = async () => {
resetEnterpriseCardRecallForm()
await Promise.all([
handleSearchEnterprise(),
loadAllocateCarrierOptions()
])
await Promise.all([handleSearchEnterprise(), loadAllocateCarrierOptions()])
enterpriseCardRecallDialogVisible.value = true
enterpriseCardRecallFormRef.value?.clearValidate()
}
@@ -2823,10 +2869,7 @@
selection_type:
selectedCards.value.length > 0 ? CardSelectionType.LIST : CardSelectionType.FILTER
})
await Promise.all([
loadPackageSeriesList(),
loadAllocateCarrierOptions()
])
await Promise.all([loadPackageSeriesList(), loadAllocateCarrierOptions()])
seriesBindingDialogVisible.value = true
seriesBindingFormRef.value?.clearValidate()
}