From e741b70fc22dc65e4a40595c50bb9057bed15667 Mon Sep 17 00:00:00 2001
From: litian <2804272236@qq.com>
Date: 星期二, 18 三月 2025 11:43:01 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/modelLibrary
---
index.html | 3 ++-
src/layout/components/header.vue | 10 ++++++++++
src/views/model/children/landerModel.vue | 9 ++++-----
src/views/model/children/roverModel.vue | 2 ++
src/styles/global.less | 1 +
5 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/index.html b/index.html
index 1be5058..2bde3be 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,8 @@
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <title>Vite</title>
+ <title>鍩轰簬鐘舵�侀┍鍔ㄧ殑鏈烘瀯娴嬭瘯绯荤粺
+ </title>
</head>
<body>
<div id="app"></div>
diff --git a/src/layout/components/header.vue b/src/layout/components/header.vue
index 38dcd1c..6bd80f4 100644
--- a/src/layout/components/header.vue
+++ b/src/layout/components/header.vue
@@ -21,6 +21,12 @@
>{{ item.name }}</el-menu-item
>
</el-menu>
+ <div class="header-right">
+ <div class="user-info" @click="handleUserClick">
+ <el-avatar src="path/to/avatar.png"></el-avatar>
+ <span>鐢ㄦ埛鍚�</span>
+ </div>
+ </div>
</div>
</template>
@@ -50,6 +56,10 @@
activeIndex.value = path;
router.push(path);
};
+
+const handleUserClick = () => {
+ router.push("/user/profile");
+};
</script>
<style lang="less" scoped>
diff --git a/src/styles/global.less b/src/styles/global.less
index 3950f8c..d798770 100644
--- a/src/styles/global.less
+++ b/src/styles/global.less
@@ -140,6 +140,7 @@
background-color: #fff;
color: #333;
line-height: 60px;
+ border-bottom: 1px solid #ebeef5;
}
.el-main {
diff --git a/src/views/model/children/landerModel.vue b/src/views/model/children/landerModel.vue
index 1ddc270..e8d3bae 100644
--- a/src/views/model/children/landerModel.vue
+++ b/src/views/model/children/landerModel.vue
@@ -104,8 +104,6 @@
name: "Tom",
address: "No. 189, Grove St, Los Angeles",
},
-
-
];
const handleCurrentChange = (val: number) => {
@@ -121,7 +119,7 @@
.landerBox {
width: 100%;
height: 100%;
-
+
.landerTopBox {
display: flex;
justify-content: space-between;
@@ -131,8 +129,10 @@
box-sizing: border-box;
}
.landerContentBox {
- width: 100%;
max-height: calc(100% - 120px);
+ padding: 0 10px;
+ box-sizing: border-box;
+
.landerTable {
height: 750px;
}
@@ -143,7 +143,6 @@
justify-content: flex-end;
padding: 0 20px;
background-color: #fff;
-
}
}
</style>
diff --git a/src/views/model/children/roverModel.vue b/src/views/model/children/roverModel.vue
index c0313d6..981afb0 100644
--- a/src/views/model/children/roverModel.vue
+++ b/src/views/model/children/roverModel.vue
@@ -215,6 +215,8 @@
}
.roverContentBox {
max-height: calc(100% - 120px);
+ padding: 0 10px;
+ box-sizing: border-box;
.roverTable {
height: 750px;
--
Gitblit v1.9.1