From 76f041cfe01793136082b3b21b930690993b7813 Mon Sep 17 00:00:00 2001 From: wjn Date: Tue, 12 Mar 2024 16:01:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/config.js b/src/config.js index d17defe..730edc7 100644 --- a/src/config.js +++ b/src/config.js @@ -24,7 +24,7 @@ const config = { flowServiceHost: "http://120.25.146.51:7188/", hmiUrl: "http://localhost:8060/", webSocketHost: 'ws://localhost:7140/', - picServerHost: 'http://47.122.43.22:7199', + picServerHost: 'http://47.122.43.22:3199', dataVUrl: "http://localhost:8062/home", version:version, guideSeverHost:"http://47.122.43.22/apk/", @@ -39,7 +39,7 @@ const config = { cookieDomain: "", hmiUrl: "http://120.25.146.51:8098/", webSocketHost: 'ws://120.25.146.51:7140/', - picServerHost: 'http://120.25.146.51:7199', + picServerHost: 'http://120.25.146.51:3199', dataVUrl: "http://120.25.146.51:7167/home", version:version, guideSeverHost:"http://www.xmmhe.com/apk/", @@ -54,7 +54,7 @@ const config = { cookieDomain: "", hmiUrl: "http://47.122.43.22:8098/", webSocketHost: 'ws://47.122.43.22:7140/', - picServerHost: 'http://47.122.43.22:7199', + picServerHost: 'http://47.122.43.22:3199', dataVUrl: "http://47.122.43.22:7167/home", version:version, guideSeverHost:"http://47.122.43.22/apk/", From 10bf5828d08a813e315ad29ac593bf4c32256ddc Mon Sep 17 00:00:00 2001 From: yunkexin <760754045@qq.com> Date: Wed, 13 Mar 2024 11:19:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/nowFont/demo_index.html | 484 +---- public/nowFont/iconfont.css | 90 +- public/nowFont/iconfont.js | 2 +- public/nowFont/iconfont.json | 150 +- public/nowFont/iconfont.ttf | Bin 26400 -> 15380 bytes public/nowFont/iconfont.woff | Bin 17232 -> 9988 bytes public/nowFont/iconfont.woff2 | Bin 12292 -> 7252 bytes src/assets/home/4-1.png | Bin 0 -> 4348 bytes src/assets/home/4-2.png | Bin 0 -> 4063 bytes src/assets/home/4-3.png | Bin 0 -> 4287 bytes src/assets/home/avaB.png | Bin 0 -> 5862 bytes src/assets/home/avaG.png | Bin 0 -> 6140 bytes src/assets/home/over.png | Bin 0 -> 5635 bytes src/assets/home/overtime.png | Bin 0 -> 4977 bytes src/assets/home/prepare2.png | Bin 0 -> 3627 bytes src/assets/home/warn.png | Bin 0 -> 3876 bytes src/assets/home/图层_11.png | Bin 0 -> 5627 bytes src/layout/Main.js | 8 +- src/layout/Sider.js | 357 ++-- src/layout/main.less | 171 +- src/layout/sider.less | 939 +++++---- src/routes/Home.js | 3454 ++++++++++++++------------------ src/routes/Login.js | 2 +- src/routes/dashboard.css | 736 +++---- 24 files changed, 2792 insertions(+), 3601 deletions(-) create mode 100644 src/assets/home/4-1.png create mode 100644 src/assets/home/4-2.png create mode 100644 src/assets/home/4-3.png create mode 100644 src/assets/home/avaB.png create mode 100644 src/assets/home/avaG.png create mode 100644 src/assets/home/over.png create mode 100644 src/assets/home/overtime.png create mode 100644 src/assets/home/prepare2.png create mode 100644 src/assets/home/warn.png create mode 100644 src/assets/home/图层_11.png diff --git a/public/nowFont/demo_index.html b/public/nowFont/demo_index.html index 24818f1..6e11478 100644 --- a/public/nowFont/demo_index.html +++ b/public/nowFont/demo_index.html @@ -57,9 +57,27 @@