diff --git a/.env.development b/.env.development
index 3737274..e909c27 100644
--- a/.env.development
+++ b/.env.development
@@ -1,6 +1,6 @@
# 页面标题
-VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统
-VITE_APP_LOGO_TITLE = RuoYi-Vue-Plus
+VITE_APP_TITLE = RFID中间件监控平台
+VITE_APP_LOGO_TITLE = RFID中间件监控平台
# 开发环境配置
VITE_APP_ENV = 'development'
@@ -33,4 +33,4 @@ VITE_APP_CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e'
VITE_APP_WEBSOCKET = false
# sse 开关
-VITE_APP_SSE = true
+VITE_APP_SSE = false
diff --git a/.env.production b/.env.production
index 883c8f1..77a44c2 100644
--- a/.env.production
+++ b/.env.production
@@ -1,6 +1,6 @@
# 页面标题
-VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统
-VITE_APP_LOGO_TITLE = RuoYi-Vue-Plus
+VITE_APP_TITLE = RFID中间件监控平台
+VITE_APP_LOGO_TITLE = RFID中间件监控平台
# 生产环境配置
VITE_APP_ENV = 'production'
@@ -36,4 +36,4 @@ VITE_APP_CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e'
VITE_APP_WEBSOCKET = false
# sse 开关
-VITE_APP_SSE = true
+VITE_APP_SSE = false
diff --git a/public/fonts/CSD-Block-Bold.ttf b/public/fonts/CSD-Block-Bold.ttf
new file mode 100644
index 0000000..a45fb14
Binary files /dev/null and b/public/fonts/CSD-Block-Bold.ttf differ
diff --git a/src/App.vue b/src/App.vue
index 617a10e..ee3ab43 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -18,3 +18,5 @@ onMounted(() => {
});
});
+
\ No newline at end of file
diff --git a/src/assets/chart/CSD-Block-Bold.ttf b/src/assets/chart/CSD-Block-Bold.ttf
new file mode 100644
index 0000000..a45fb14
Binary files /dev/null and b/src/assets/chart/CSD-Block-Bold.ttf differ
diff --git a/src/assets/chart/csd_bloc1.ttf b/src/assets/chart/csd_bloc1.ttf
new file mode 100644
index 0000000..e1554f8
Binary files /dev/null and b/src/assets/chart/csd_bloc1.ttf differ
diff --git a/src/assets/chart/device1.png b/src/assets/chart/device1.png
new file mode 100644
index 0000000..b77552b
Binary files /dev/null and b/src/assets/chart/device1.png differ
diff --git a/src/assets/chart/device2.png b/src/assets/chart/device2.png
new file mode 100644
index 0000000..93f6ad2
Binary files /dev/null and b/src/assets/chart/device2.png differ
diff --git a/src/assets/chart/highwayLogo.png b/src/assets/chart/highwayLogo.png
new file mode 100644
index 0000000..4be050f
Binary files /dev/null and b/src/assets/chart/highwayLogo.png differ
diff --git a/src/assets/styles/fontStyle.css b/src/assets/styles/fontStyle.css
new file mode 100644
index 0000000..bf986f6
--- /dev/null
+++ b/src/assets/styles/fontStyle.css
@@ -0,0 +1,11 @@
+@font-face {
+ font-family: 'CSD-Block-Bold';
+ src: url('/fonts/CSD-Block-Bold.ttf') format('truetype');
+ font-display: swap;
+}
+
+/*@font-face {*/
+/* font-family: 'CSD-Block-Bold';*/
+/* src: url('../chart/csd_bloc1.ttf') format('truetype');*/
+/* font-display: swap;*/
+/*}*/
\ No newline at end of file
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index efb1ae3..50c5e6d 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -21,42 +21,42 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
diff --git a/src/main.ts b/src/main.ts
index b2ebdd1..0fb4501 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -3,6 +3,7 @@ import { createApp } from 'vue';
import 'virtual:uno.css';
import 'element-plus/theme-chalk/dark/css-vars.css';
import '@/assets/styles/index.scss';
+import '@/assets/styles/fontStyle.css';
// App、router、store
import App from './App.vue';
diff --git a/src/views/chart/chart1.vue b/src/views/chart/chart1.vue
index 9fbda4e..ac431a4 100644
--- a/src/views/chart/chart1.vue
+++ b/src/views/chart/chart1.vue
@@ -1,6 +1,14 @@
+
+
+
{{ time.time }}
+
+
{{ time.week }}
+
{{ time.date }}
+
+
RFID中间件监控平台
设备数量:
在线数量:
@@ -51,10 +59,10 @@
@@ -96,6 +104,24 @@ function findParentsWithLocationType3(arr) {
return result;
}
+const timeFun = () => {
+ const now = new Date();
+
+ const pad = (n) => String(n).padStart(2, '0');
+ const time = `${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(now.getSeconds())}`;
+
+ const weekMap = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
+ const week = weekMap[now.getDay()];
+
+ const date = `${now.getFullYear()}.${pad(now.getMonth() + 1)}.${pad(now.getDate())}`;
+
+ return {
+ time,
+ week,
+ date
+ };
+};
+
const mouseleave = () => {
setTimeout(() => {
hover.value = false;
@@ -109,7 +135,10 @@ const classOptions = ref({
step: 1,
hover: true
});
-
+setInterval(() => {
+ time.value = timeFun();
+}, 1000);
+const time = ref(timeFun());
const masonryRef = ref(null);
const scrollSeamlessRef = ref(null);
const scrollNodeRef = ref(null);
@@ -118,7 +147,7 @@ const hover = ref(false);
const tableData = ref();
const treeData = ref();
const centerData = ref([]);
-const wsData = ref({})
+const wsData = ref({});
const MenuItem = defineComponent({
name: 'MenuItem',
@@ -301,7 +330,7 @@ let data2 = {
'deviceStatus': 2
};
const getSocket = () => {
- const socket = new WebSocket('ws://192.168.100.103:7181/ws');
+ const socket = new WebSocket('ws://192.168.0.16:7181/ws');
socket.addEventListener('open', () => {
// console.log('✅ WebSocket 连接成功');
@@ -324,7 +353,7 @@ const getSocket = () => {
onMounted(() => {
getData();
getSocket();
- wsData.value[data.deviceId] = data
+ wsData.value[data.deviceId] = data;
});