diff --git a/package.json b/package.json
index 6747448..904ef56 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,7 @@
{
"private": true,
"scripts": {
+ "server": "nodemon --watch websocket --exec ts-node websocket/server.ts",
"start": "umi dev",
"build": "umi build",
"postinstall": "umi generate tmp",
@@ -22,18 +23,24 @@
"dependencies": {
"@ant-design/icons": "^4.7.0",
"@jiaminghi/data-view-react": "^1.2.5",
+ "@types/node": "^20.6.0",
+ "@types/ws": "^8.5.5",
"antd": "^4.20.6",
"echarts": "^5.3.2",
"echarts-for-react": "^3.0.2",
"framer-motion": "^6.3.3",
"less": "^4.1.3",
"less-loader": "^11.0.0",
+ "moment": "^2.29.4",
+ "nodemon": "^3.0.1",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-router-dom": "^6.3.0",
"style-components": "^0.1.0",
"styled-components": "^5.3.5",
- "umi": "^3.5.23"
+ "ts-node": "^10.9.1",
+ "umi": "^3.5.23",
+ "ws": "^8.14.1"
},
"devDependencies": {
"@babel/runtime": "^7.18.0",
@@ -43,7 +50,7 @@
"@umijs/test": "^3.5.23",
"lint-staged": "^10.0.7",
"prettier": "^2.2.0",
- "typescript": "^4.1.2",
+ "typescript": "^5.2.2",
"yorkie": "^2.0.0"
}
}
diff --git a/src/assets/3D.png b/src/assets/3D.png
index 2f3fde0..604c2d9 100644
Binary files a/src/assets/3D.png and b/src/assets/3D.png differ
diff --git a/src/assets/yx-dark/bg.png b/src/assets/yx-dark/bg.png
new file mode 100644
index 0000000..b521cd4
Binary files /dev/null and b/src/assets/yx-dark/bg.png differ
diff --git a/src/assets/yx-dark/company.png b/src/assets/yx-dark/company.png
new file mode 100644
index 0000000..ae1b137
Binary files /dev/null and b/src/assets/yx-dark/company.png differ
diff --git a/src/assets/yx-dark/date.png b/src/assets/yx-dark/date.png
new file mode 100644
index 0000000..7513cea
Binary files /dev/null and b/src/assets/yx-dark/date.png differ
diff --git a/src/assets/yx-dark/header.png b/src/assets/yx-dark/header.png
new file mode 100644
index 0000000..14d0cf2
Binary files /dev/null and b/src/assets/yx-dark/header.png differ
diff --git a/src/assets/yx-dark/logo.png b/src/assets/yx-dark/logo.png
new file mode 100644
index 0000000..2791ff2
Binary files /dev/null and b/src/assets/yx-dark/logo.png differ
diff --git a/src/components/yx-dark/Header.jsx b/src/components/yx-dark/Header.jsx
new file mode 100644
index 0000000..4228652
--- /dev/null
+++ b/src/components/yx-dark/Header.jsx
@@ -0,0 +1,26 @@
+import React, { useEffect, useState, useRef } from 'react';
+import './header.module.css';
+import moment from 'moment';
+
+export default (props) => {
+ let [today, setToday] = useState(new Date());
+ moment.locale('zh-cn');
+ setTimeout(() => {
+ setToday(new Date());
+ }, 1000);
+
+ return (
+
+ );
+};
diff --git a/src/components/yx-dark/header.module.css b/src/components/yx-dark/header.module.css
new file mode 100644
index 0000000..d088d95
--- /dev/null
+++ b/src/components/yx-dark/header.module.css
@@ -0,0 +1,53 @@
+header {
+ height: 121px;
+ width: 100%;
+ position: relative;
+ z-index: 10000;
+ background: url(../../assets/yx-dark/header.png) 100% 100% / contain no-repeat;
+ display: grid;
+ place-content: center;
+}
+header > div {
+ display: flex;
+ align-items: center;
+ margin-bottom: 0;
+}
+header > div .header--logo {
+ margin-top: 12px;
+ width: 48px;
+ height: 67px;
+ background: url(../../assets/yx-dark/logo.png) center/contain no-repeat;
+}
+
+header h1 {
+ margin-bottom: 0;
+ margin-left: 36px;
+ font-size: 52px;
+ /* line-height: 97px; */
+ user-select: none;
+ letter-spacing: 9px;
+ font-weight: 400;
+ color: #6bf2ff;
+ font-family: '微软雅黑', sans-serif;
+}
+
+.header--wing {
+ left: 0;
+ bottom: -12px;
+ height: 48px;
+ font-size: 28px;
+ line-height: 48px;
+ color: #51f0ff;
+}
+
+.company {
+ margin-left: 960px;
+ letter-spacing: 1px;
+}
+
+.datetime {
+ text-align: center;
+ left: unset;
+ right: 1100px;
+ letter-spacing: 1px;
+}
diff --git a/src/pages/index.jsx b/src/pages/index.jsx
index 080035b..8c51113 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.jsx
@@ -1,7 +1,7 @@
import { useEffect, useState } from 'react';
import './global.less';
import './index.less';
-import Head from '../components/Head';
+import Header from '../components/yx-dark/Header';
import LeftBar from '../components/LeftBar';
import BottomBar from '../components/BottomBar';
import RightBar from '../components/RightBar';
@@ -9,11 +9,8 @@ import CenterTopData from '../components/CenterTopData';
import Slider from '../components/Slider';
import { SocketContextProvider } from '../store/socket-data-provider';
-import V3DBG from '../assets/V3DBG.png';
-// import V3D from './V3D';
-
export default function index() {
- const [value, setValue] = useState(100);
+ const [value, setValue] = useState(50);
const v = (value / 100).toFixed(2);
const styles = {
@@ -24,13 +21,11 @@ export default function index() {
useEffect(() => {
let fn = (e) => {
- console.log('add fn');
if (e.shiftKey && e.key === 'L') {
document.getElementById('slider').classList.toggle('show');
}
};
let fn2 = () => {
- console.log('add fn2');
setTimeout(() => {
document.getElementById('slider').classList.remove('show');
}, 200);
@@ -40,7 +35,6 @@ export default function index() {
document.getElementById('slider').addEventListener('mouseleave', fn2);
return () => {
- console.log('remove fn, fn2');
document.removeEventListener('keydown', fn);
document.getElementById('slider').removeEventListener('mouseleave', fn2);
};
@@ -50,20 +44,19 @@ export default function index() {
//
-
+
-
+ {/*
-
-
{/* */}
+
-
+
*/}