From a52ce4c9a594e78b5931d487e05d0dd54ac8cd36 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 07 十月 2024 22:38:28 +0800
Subject: [PATCH] Merge branch 'release' of http://122.9.151.159:9090/r/smart-web into release
---
src/views/console/basic-data/tpm-data.vue | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/views/console/basic-data/tpm-data.vue b/src/views/console/basic-data/tpm-data.vue
index 5645e48..b72de24 100644
--- a/src/views/console/basic-data/tpm-data.vue
+++ b/src/views/console/basic-data/tpm-data.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-06-16 19:47:41
* @LastEditors: Sneed
- * @LastEditTime: 2024-06-23 19:59:13
+ * @LastEditTime: 2024-06-23 21:32:29
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/basic-data/tpm-data.vue
-->
<template>
@@ -42,7 +42,7 @@
</el-container>
</el-tab-pane>
<el-tab-pane label="鏈哄櫒绫诲瀷" name="4">
-
+ <tpmComp2 />
</el-tab-pane>
</el-tabs>
</el-card>
@@ -54,11 +54,13 @@
import Header from './tpm-data-header.vue'
import TpmData1 from './tpm-data1.vue'
import tpmComp1 from './tpmComp1.vue'
+import tpmComp2 from './tpmComp2.vue'
export default {
components: {
Header,
TpmData1,
- tpmComp1
+ tpmComp1,
+ tpmComp2
},
data() {
return {
--
Gitblit v1.9.3