diff --git a/package-lock.json b/package-lock.json index 5b36661..62cdef3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -467,6 +467,7 @@ "node": ">=6.9.0" } }, +<<<<<<< HEAD "node_modules/@ctrl/tinycolor": { "version": "3.6.1", "resolved": "https://registry.npmmirror.com/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz", @@ -483,6 +484,8 @@ "vue": "^3.2.0" } }, +======= +>>>>>>> 897d91a9c6208a60428d9db9f9bd4745e1233705 "node_modules/@esbuild/win32-x64": { "version": "0.24.0", "resolved": "https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.24.0.tgz", @@ -499,6 +502,7 @@ "node": ">=18" } }, +<<<<<<< HEAD "node_modules/@floating-ui/core": { "version": "1.6.8", "resolved": "https://registry.npmmirror.com/@floating-ui/core/-/core-1.6.8.tgz", @@ -521,6 +525,8 @@ "resolved": "https://registry.npmmirror.com/@floating-ui/utils/-/utils-0.2.8.tgz", "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==" }, +======= +>>>>>>> 897d91a9c6208a60428d9db9f9bd4745e1233705 "node_modules/@jiaminghi/color": { "version": "1.1.3", "resolved": "https://registry.npmmirror.com/@jiaminghi/color/-/color-1.1.3.tgz", @@ -694,6 +700,7 @@ "integrity": "sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==", "dev": true }, +<<<<<<< HEAD "node_modules/@popperjs/core": { "name": "@sxzz/popperjs-es", "version": "2.11.7", @@ -704,6 +711,8 @@ "url": "https://opencollective.com/popperjs" } }, +======= +>>>>>>> 897d91a9c6208a60428d9db9f9bd4745e1233705 "node_modules/@rollup/pluginutils": { "version": "5.1.3", "resolved": "https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-5.1.3.tgz", @@ -1566,7 +1575,8 @@ "node_modules/countup.js": { "version": "2.8.0", "resolved": "https://registry.npmmirror.com/countup.js/-/countup.js-2.8.0.tgz", - "integrity": "sha512-f7xEhX0awl4NOElHulrl4XRfKoNH3rB+qfNSZZyjSZhaAoUk6elvhH+MNxMmlmuUJ2/QNTWPSA7U4mNtIAKljQ==" + "integrity": "sha512-f7xEhX0awl4NOElHulrl4XRfKoNH3rB+qfNSZZyjSZhaAoUk6elvhH+MNxMmlmuUJ2/QNTWPSA7U4mNtIAKljQ==", + "license": "MIT" }, "node_modules/cross-spawn": { "version": "7.0.6", @@ -2037,20 +2047,6 @@ "node": ">=14.14" } }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/gensync": { "version": "1.0.0-beta.2", "resolved": "https://registry.npmmirror.com/gensync/-/gensync-1.0.0-beta.2.tgz", @@ -3827,6 +3823,10 @@ "version": "1.4.2", "resolved": "https://registry.npmmirror.com/vue-countup-v3/-/vue-countup-v3-1.4.2.tgz", "integrity": "sha512-nRC65jBcdgwybxqztgd/WaK8ZN5T9ECPyiCFGYFMewCsvqdRVo1CtpT7JREcPNF837Fgu/izTSFiuzrIGD6w0A==", +<<<<<<< HEAD +======= + "license": "MIT", +>>>>>>> 897d91a9c6208a60428d9db9f9bd4745e1233705 "dependencies": { "countup.js": "^2.6.2" }, diff --git a/src/assets/images/four-t-1.png b/src/assets/images/four-t-1.png new file mode 100644 index 0000000..3457822 Binary files /dev/null and b/src/assets/images/four-t-1.png differ diff --git a/src/assets/images/four-t-2.png b/src/assets/images/four-t-2.png new file mode 100644 index 0000000..456c26b Binary files /dev/null and b/src/assets/images/four-t-2.png differ diff --git a/src/assets/images/four-t-3.png b/src/assets/images/four-t-3.png new file mode 100644 index 0000000..f059b46 Binary files /dev/null and b/src/assets/images/four-t-3.png differ diff --git a/src/assets/images/four-t-4.png b/src/assets/images/four-t-4.png new file mode 100644 index 0000000..2173f94 Binary files /dev/null and b/src/assets/images/four-t-4.png differ diff --git a/src/assets/images/header-top-bg.png b/src/assets/images/header-top-bg.png new file mode 100644 index 0000000..f0c5f15 Binary files /dev/null and b/src/assets/images/header-top-bg.png differ diff --git a/src/assets/images/i-data-bg-1.png b/src/assets/images/i-data-bg-1.png new file mode 100644 index 0000000..2e5494d Binary files /dev/null and b/src/assets/images/i-data-bg-1.png differ diff --git a/src/assets/images/m-nav-bg-1.png b/src/assets/images/m-nav-bg-1.png new file mode 100644 index 0000000..219910e Binary files /dev/null and b/src/assets/images/m-nav-bg-1.png differ diff --git a/src/assets/images/m-nav-bg-2.png b/src/assets/images/m-nav-bg-2.png new file mode 100644 index 0000000..d02a94b Binary files /dev/null and b/src/assets/images/m-nav-bg-2.png differ diff --git a/src/assets/images/m-t-1.png b/src/assets/images/m-t-1.png new file mode 100644 index 0000000..95ce1e8 Binary files /dev/null and b/src/assets/images/m-t-1.png differ diff --git a/src/assets/images/m-t-2.png b/src/assets/images/m-t-2.png new file mode 100644 index 0000000..b9483dc Binary files /dev/null and b/src/assets/images/m-t-2.png differ diff --git a/src/assets/images/m-t-3.png b/src/assets/images/m-t-3.png new file mode 100644 index 0000000..6b47129 Binary files /dev/null and b/src/assets/images/m-t-3.png differ diff --git a/src/assets/images/monotir-bg-1.png b/src/assets/images/monotir-bg-1.png new file mode 100644 index 0000000..e3d4b6d Binary files /dev/null and b/src/assets/images/monotir-bg-1.png differ diff --git a/src/assets/images/monotir-bg.png b/src/assets/images/monotir-bg.png new file mode 100644 index 0000000..53aed5b Binary files /dev/null and b/src/assets/images/monotir-bg.png differ diff --git a/src/assets/images/nav-l-t-bg.png b/src/assets/images/nav-l-t-bg.png new file mode 100644 index 0000000..d599543 Binary files /dev/null and b/src/assets/images/nav-l-t-bg.png differ diff --git a/src/assets/images/nav-t-1.png b/src/assets/images/nav-t-1.png new file mode 100644 index 0000000..ee1a972 Binary files /dev/null and b/src/assets/images/nav-t-1.png differ diff --git a/src/assets/images/nav-t-2.png b/src/assets/images/nav-t-2.png new file mode 100644 index 0000000..9bff09d Binary files /dev/null and b/src/assets/images/nav-t-2.png differ diff --git a/src/assets/images/r-icon-1.png b/src/assets/images/r-icon-1.png new file mode 100644 index 0000000..ed575ad Binary files /dev/null and b/src/assets/images/r-icon-1.png differ diff --git a/src/assets/images/r-icon-2.png b/src/assets/images/r-icon-2.png new file mode 100644 index 0000000..d2c4986 Binary files /dev/null and b/src/assets/images/r-icon-2.png differ diff --git a/src/assets/images/r-icon-3.png b/src/assets/images/r-icon-3.png new file mode 100644 index 0000000..2218dd5 Binary files /dev/null and b/src/assets/images/r-icon-3.png differ diff --git a/src/assets/images/r-icon-4.png b/src/assets/images/r-icon-4.png new file mode 100644 index 0000000..d43d820 Binary files /dev/null and b/src/assets/images/r-icon-4.png differ diff --git a/src/assets/images/r-icon-5.png b/src/assets/images/r-icon-5.png new file mode 100644 index 0000000..30902ae Binary files /dev/null and b/src/assets/images/r-icon-5.png differ diff --git a/src/assets/images/r-icon-6.png b/src/assets/images/r-icon-6.png new file mode 100644 index 0000000..38699da Binary files /dev/null and b/src/assets/images/r-icon-6.png differ diff --git a/src/assets/images/rk-1.png b/src/assets/images/rk-1.png new file mode 100644 index 0000000..bf0d0af Binary files /dev/null and b/src/assets/images/rk-1.png differ diff --git a/src/assets/images/rk-2.png b/src/assets/images/rk-2.png new file mode 100644 index 0000000..dce1f04 Binary files /dev/null and b/src/assets/images/rk-2.png differ diff --git a/src/assets/images/rk-3.png b/src/assets/images/rk-3.png new file mode 100644 index 0000000..cff2946 Binary files /dev/null and b/src/assets/images/rk-3.png differ diff --git a/src/assets/images/rk-4.png b/src/assets/images/rk-4.png new file mode 100644 index 0000000..a0dc1f4 Binary files /dev/null and b/src/assets/images/rk-4.png differ diff --git a/src/assets/images/rt-bg.png b/src/assets/images/rt-bg.png new file mode 100644 index 0000000..28896ea Binary files /dev/null and b/src/assets/images/rt-bg.png differ diff --git a/src/assets/images/t-ico-0.png b/src/assets/images/t-ico-0.png new file mode 100644 index 0000000..7a41ed0 Binary files /dev/null and b/src/assets/images/t-ico-0.png differ diff --git a/src/assets/images/v-item-bg.png b/src/assets/images/v-item-bg.png new file mode 100644 index 0000000..e87d93d Binary files /dev/null and b/src/assets/images/v-item-bg.png differ diff --git a/src/router/index.js b/src/router/index.js index 58a6611..b878a5e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,7 +7,12 @@ const router = createRouter({ path: '/', name: 'home', component: () => import('../views/home/index.vue') - } + }, + { + path: '/monitor', + name: 'monitor', + component: () => import('../views/monitor/index.vue') + } ] }) diff --git a/src/views/home/components/box-3.vue b/src/views/home/components/box-3.vue index d6f97e3..c18403c 100644 --- a/src/views/home/components/box-3.vue +++ b/src/views/home/components/box-3.vue @@ -1,4 +1,5 @@ + + + +>>>>>>> 897d91a9c6208a60428d9db9f9bd4745e1233705 diff --git a/src/views/home/index.vue b/src/views/home/index.vue index f947c3c..3cd269e 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -1,6 +1,6 @@