From 23e081053f069de550f3d488eeadda941c0dc0ac Mon Sep 17 00:00:00 2001
From: wangqiujuan0808 <578331299@qq.com>
Date: Tue, 5 Dec 2023 19:28:55 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/styles/sidebar.scss | 2 +-
src/layout/components/Navbar.vue | 4 +-
src/layoutMain/components/Navbar.vue | 11 +++-
src/views/bim/bimHome/components/3DChart.js | 2 +-
.../bim/bimHome/components/BuildInfo.vue | 2 +-
.../bim/bimHome/components/DeviceEvent.vue | 3 +-
.../bim/bimHome/components/DevicePie.vue | 18 +++---
.../bim/bimHome/components/EquipmentInfo.vue | 2 +-
src/views/bim/bimHome/components/RealData.vue | 5 +-
.../bim/bimHome/components/ThreeView.vue | 58 ++++++++++++++-----
10 files changed, 72 insertions(+), 35 deletions(-)
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index c765daf..581f211 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -1,7 +1,7 @@
#app {
margin: 0;
padding: 0;
- background: url(../image/bg1.jpg) no-repeat;
+ // background: url(../image/bg1.jpg) no-repeat;
background-size: 100% 100%;
background-attachment: fixed;
background-size: cover;
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 05e15af..a87dbfb 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -8,13 +8,13 @@
-
+
diff --git a/src/layoutMain/components/Navbar.vue b/src/layoutMain/components/Navbar.vue
index d7927cd..7ab94cd 100644
--- a/src/layoutMain/components/Navbar.vue
+++ b/src/layoutMain/components/Navbar.vue
@@ -19,7 +19,7 @@
{{ week }}
-
+
+
@@ -74,6 +74,7 @@ import useAppStore from '@/store/modules/app'
import useUserStore from '@/store/modules/user'
import useSettingsStore from '@/store/modules/settings'
import dayjs from "dayjs";
+const router = useRouter();
const appStore = useAppStore()
const userStore = useUserStore()
@@ -121,6 +122,10 @@ function logout() {
})
}).catch(() => { });
}
+
+function goHome() {
+ router.push('/index');
+}
const updateTime = () => {
currentTime.value = dayjs().format("YYYY年 MM月 DD日");
time.value = dayjs().format("HH:mm");
diff --git a/src/views/bim/bimHome/components/3DChart.js b/src/views/bim/bimHome/components/3DChart.js
index 5509cfe..d80f77a 100644
--- a/src/views/bim/bimHome/components/3DChart.js
+++ b/src/views/bim/bimHome/components/3DChart.js
@@ -113,7 +113,7 @@ const getPie3D = (pieData, internalDiameterRatio, rateName) => {
}
},
formatter: data => {
- return data.value ? `{title|${data.data.name}:}
+ return data.value ? `{title|${data.data.name}}
{rich|${data.data.rate}%}` : ''
} // 值为0的就不展示默认的示例
},
diff --git a/src/views/bim/bimHome/components/BuildInfo.vue b/src/views/bim/bimHome/components/BuildInfo.vue
index 1d6196f..cdd2d34 100644
--- a/src/views/bim/bimHome/components/BuildInfo.vue
+++ b/src/views/bim/bimHome/components/BuildInfo.vue
@@ -43,7 +43,7 @@ const { buildInfo } = toRefs(data);
right: 10px;
// background: #0a1f2e;
// border: 1px solid red;
- width: 320px;
+ width: 360px;
height: 340px;
display: flex;
flex-direction: column;
diff --git a/src/views/bim/bimHome/components/DeviceEvent.vue b/src/views/bim/bimHome/components/DeviceEvent.vue
index 971a841..8ba3b0f 100644
--- a/src/views/bim/bimHome/components/DeviceEvent.vue
+++ b/src/views/bim/bimHome/components/DeviceEvent.vue
@@ -67,7 +67,8 @@ const openDialog = () => {