From abe3a86c15105f215992d78bcaaf9b51efa1d565 Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期四, 28 七月 2022 10:22:41 +0800
Subject: [PATCH] 解决冲突
---
src/views/hashrate/hashrateDetail/index.vue | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/views/hashrate/hashrateDetail/index.vue b/src/views/hashrate/hashrateDetail/index.vue
index bbe5c9d..7e69296 100644
--- a/src/views/hashrate/hashrateDetail/index.vue
+++ b/src/views/hashrate/hashrateDetail/index.vue
@@ -6,7 +6,9 @@
<div class="fullScreenheart">
<!-- 闈㈠寘灞� -->
<el-breadcrumb separator=">">
- <el-breadcrumb-item>绠＄悊涓績</el-breadcrumb-item>
+ <el-breadcrumb-item :to="{ path: '/manageCenter' }"
+ >绠＄悊涓績</el-breadcrumb-item
+ >
<el-breadcrumb-item>绠楀姏绠＄悊</el-breadcrumb-item>
</el-breadcrumb>
@@ -35,9 +37,9 @@
<script>
import IndexHeader from "@/components/IndexHeader";
-import AlgManage from "@/views/hashrate/components/AlgManage";
-import HashManage from "@/views/hashrate/components/HashManage";
-import CameraManage from "@/views/hashrate/components/CameraManage";
+import AlgManage from "@/views/hashrate/AlgManage";
+import HashManage from "@/views/hashrate/HashManage";
+import CameraManage from "@/views/hashrate/CameraManage";
import Footer from "@/components/Footer";
export default {
components: {
@@ -64,6 +66,10 @@
min-width: 1346px;
background-color: rgb(243, 245, 248);
+ .fullScreenheart {
+ min-height: calc(100vh - 210px);
+ }
+
.el-breadcrumb {
margin-top: 48px;
margin-bottom: 24px;
@@ -71,10 +77,6 @@
::v-deep span {
color: #666;
}
- }
-
- .fullScreenheart {
- margin: 0 24px;
}
.tabs {
--
Gitblit v1.8.0