From 4fedcd16df40859890d8bd73513dd797f9c9b22f Mon Sep 17 00:00:00 2001
From: WUSIJIAN <13825895+wsj0228@user.noreply.gitee.com>
Date: Mon, 22 Dec 2025 15:26:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8resize=E9=80=BB=E8=BE=91=E5=B9=B6=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=8D=B8=E8=BD=BD=E6=97=B6=E7=9A=84=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E6=B8=85=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/asset/index.vue | 168 ++++++++++++++++---------------
 src/views/home/index.vue         |  19 +++-
 2 files changed, 100 insertions(+), 87 deletions(-)

diff --git a/src/views/assets/asset/index.vue b/src/views/assets/asset/index.vue
index 9095131..bb0b360 100644
--- a/src/views/assets/asset/index.vue
+++ b/src/views/assets/asset/index.vue
@@ -1,88 +1,90 @@
 <template>
-	<div class="assets-asset-container">
-		<el-card shadow="hover">
-			<div class="assets-asset-search mb15">
-				<el-form :inline="true" :model="tableData.param">
-					<el-form-item label="资产名称">
-						<el-input size="default" v-model="tableData.param.keyword" placeholder="请输入资产名称" clearable style="width: 200px" />
-					</el-form-item>
-					<el-form-item label="资产类型">
-						<el-select size="default" v-model="tableData.param.type" placeholder="请选择资产类型" clearable style="width: 150px">
-							<el-option label="实物" value="physical" />
-							<el-option label="虚拟" value="virtual" />
-							<el-option label="服务" value="service" />
-						</el-select>
-					</el-form-item>
-					<el-form-item label="状态">
-						<el-select size="default" v-model="tableData.param.status" placeholder="请选择状态" clearable style="width: 120px">
-							<el-option label="启用" :value="1" />
-							<el-option label="禁用" :value="0" />
-						</el-select>
-					</el-form-item>
-					<el-form-item>
-						<el-button size="default" type="primary" @click="getAssetList">
-							<el-icon><ele-Search /></el-icon>
-							查询
-						</el-button>
-						<el-button size="default" @click="onResetQuery">
-							<el-icon><ele-Refresh /></el-icon>
-							重置
-						</el-button>
-						<el-button size="default" type="success" @click="onOpenAdd">
-							<el-icon><ele-Plus /></el-icon>
-							新增
-						</el-button>
-					</el-form-item>
-				</el-form>
-			</div>
-			<el-table :data="tableData.data" style="width: 100%" v-loading="tableData.loading" border>
-				<el-table-column type="index" label="序号" width="60" align="center" />
-				<el-table-column prop="name" label="资产名称" min-width="150" show-overflow-tooltip />
-				<el-table-column prop="type" label="资产类型" width="100" align="center">
-					<template #default="scope">
-						<el-tag :type="getTypeTagType(scope.row.type)">{{ getTypeLabel(scope.row.type) }}</el-tag>
-					</template>
-				</el-table-column>
-				<el-table-column prop="status" label="状态" width="100" align="center">
-					<template #default="scope">
-						<el-switch
-							v-model="scope.row.status"
-							:active-value="1"
-							:inactive-value="0"
-							inline-prompt
-							active-text="启用"
-							inactive-text="禁用"
-							@change="onStatusChange(scope.row)"
-						/>
-					</template>
-				</el-table-column>
-				<el-table-column prop="onlineTime" label="上线时间" width="170" show-overflow-tooltip />
-				<el-table-column prop="offlineTime" label="下线时间" width="170" show-overflow-tooltip />
-				<el-table-column prop="createdAt" label="创建时间" width="170" show-overflow-tooltip />
-				<el-table-column prop="updatedAt" label="修改时间" width="170" show-overflow-tooltip />
-				<el-table-column label="操作" width="200" fixed="right" align="center">
-					<template #default="scope">
-						<el-button size="small" text type="primary" @click="onEdit(scope.row)">修改</el-button>
-						<el-button size="small" text type="success" @click="onAddSku(scope.row)">添加SKU</el-button>
-						<el-button size="small" text type="danger" @click="onRowDel(scope.row)">删除</el-button>
-					</template>
-				</el-table-column>
-			</el-table>
-			<!-- 分页 -->
-			<div class="mt15" style="text-align: right">
-				<el-pagination
-					v-model:current-page="tableData.param.page"
-					v-model:page-size="tableData.param.pageSize"
-					:page-sizes="[10, 20, 50, 100]"
-					:total="tableData.total"
-					layout="total, sizes, prev, pager, next, jumper"
-					@size-change="onSizeChange"
-					@current-change="onCurrentChange"
-				/>
-			</div>
-		</el-card>
+	<div class="assets-asset-page">
+		<div class="assets-asset-container">
+			<el-card shadow="hover">
+				<div class="assets-asset-search mb15">
+					<el-form :inline="true" :model="tableData.param">
+						<el-form-item label="资产名称">
+							<el-input size="default" v-model="tableData.param.keyword" placeholder="请输入资产名称" clearable style="width: 200px" />
+						</el-form-item>
+						<el-form-item label="资产类型">
+							<el-select size="default" v-model="tableData.param.type" placeholder="请选择资产类型" clearable style="width: 150px">
+								<el-option label="实物" value="physical" />
+								<el-option label="虚拟" value="virtual" />
+								<el-option label="服务" value="service" />
+							</el-select>
+						</el-form-item>
+						<el-form-item label="状态">
+							<el-select size="default" v-model="tableData.param.status" placeholder="请选择状态" clearable style="width: 120px">
+								<el-option label="启用" :value="1" />
+								<el-option label="禁用" :value="0" />
+							</el-select>
+						</el-form-item>
+						<el-form-item>
+							<el-button size="default" type="primary" @click="getAssetList">
+								<el-icon><ele-Search /></el-icon>
+								查询
+							</el-button>
+							<el-button size="default" @click="onResetQuery">
+								<el-icon><ele-Refresh /></el-icon>
+								重置
+							</el-button>
+							<el-button size="default" type="success" @click="onOpenAdd">
+								<el-icon><ele-Plus /></el-icon>
+								新增
+							</el-button>
+						</el-form-item>
+					</el-form>
+				</div>
+				<el-table :data="tableData.data" style="width: 100%" v-loading="tableData.loading" border>
+					<el-table-column type="index" label="序号" width="60" align="center" />
+					<el-table-column prop="name" label="资产名称" min-width="150" show-overflow-tooltip />
+					<el-table-column prop="type" label="资产类型" width="100" align="center">
+						<template #default="scope">
+							<el-tag :type="getTypeTagType(scope.row.type)">{{ getTypeLabel(scope.row.type) }}</el-tag>
+						</template>
+					</el-table-column>
+					<el-table-column prop="status" label="状态" width="100" align="center">
+						<template #default="scope">
+							<el-switch
+								v-model="scope.row.status"
+								:active-value="1"
+								:inactive-value="0"
+								inline-prompt
+								active-text="启用"
+								inactive-text="禁用"
+								@change="onStatusChange(scope.row)"
+							/>
+						</template>
+					</el-table-column>
+					<el-table-column prop="onlineTime" label="上线时间" width="170" show-overflow-tooltip />
+					<el-table-column prop="offlineTime" label="下线时间" width="170" show-overflow-tooltip />
+					<el-table-column prop="createdAt" label="创建时间" width="170" show-overflow-tooltip />
+					<el-table-column prop="updatedAt" label="修改时间" width="170" show-overflow-tooltip />
+					<el-table-column label="操作" width="200" fixed="right" align="center">
+						<template #default="scope">
+							<el-button size="small" text type="primary" @click="onEdit(scope.row)">修改</el-button>
+							<el-button size="small" text type="success" @click="onAddSku(scope.row)">添加SKU</el-button>
+							<el-button size="small" text type="danger" @click="onRowDel(scope.row)">删除</el-button>
+						</template>
+					</el-table-column>
+				</el-table>
+				<!-- 分页 -->
+				<div class="mt15" style="text-align: right">
+					<el-pagination
+						v-model:current-page="tableData.param.page"
+						v-model:page-size="tableData.param.pageSize"
+						:page-sizes="[10, 20, 50, 100]"
+						:total="tableData.total"
+						layout="total, sizes, prev, pager, next, jumper"
+						@size-change="onSizeChange"
+						@current-change="onCurrentChange"
+					/>
+				</div>
+			</el-card>
+		</div>
+		<EditAsset ref="editAssetRef" @getAssetList="getAssetList" />
 	</div>
-	<EditAsset ref="editAssetRef" @getAssetList="getAssetList" />
 </template>
 
 <script lang="ts">
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 6475fba..5f3227d 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -66,7 +66,7 @@
 </template>
 
 <script lang="ts">
-import { toRefs, reactive, defineComponent, onMounted, ref, watch, nextTick, onActivated } from 'vue';
+import { toRefs, reactive, defineComponent, onMounted, ref, watch, nextTick, onActivated, onUnmounted } from 'vue';
 import * as echarts from 'echarts';
 import { storeToRefs } from 'pinia';
 import { useThemeConfig } from '/@/stores/themeConfig';
@@ -492,10 +492,17 @@ export default defineComponent({
 		// 批量设置 echarts resize
 		const initEchartsResizeFun = () => {
 			nextTick(() => {
-				for (let i = 0; i < state.myCharts.length; i++) {
+				for (let i = state.myCharts.length - 1; i >= 0; i--) {
+					const chart = state.myCharts[i] as any;
+					if (!chart || (typeof chart.isDisposed === 'function' && chart.isDisposed())) {
+						state.myCharts.splice(i, 1);
+						continue;
+					}
 					setTimeout(() => {
-						(<any>state.myCharts[i]).resize();
-					}, i * 1000);
+						if (chart && typeof chart.resize === 'function' && !(chart.isDisposed && chart.isDisposed())) {
+							chart.resize();
+						}
+					}, (state.myCharts.length - 1 - i) * 200);
 				}
 			});
 		};
@@ -507,6 +514,10 @@ export default defineComponent({
 		onMounted(() => {
 			initEchartsResize();
 		});
+		onUnmounted(() => {
+			window.removeEventListener('resize', initEchartsResizeFun);
+			state.myCharts.length = 0;
+		});
 		// 由于页面缓存原因，keep-alive
 		onActivated(() => {
 			initEchartsResizeFun();