diff --git a/package-lock.json b/package-lock.json index 62cdef3..73fcc81 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,11 +12,13 @@ "axios": "^1.7.9", "echarts": "^5.5.1", "element-plus": "^2.9.0", + "flv.js": "^1.6.2", "pinia": "^2.2.6", "vue": "^3.5.13", "vue-countup-v3": "^1.4.2", "vue-echarts": "^7.0.3", - "vue-router": "^4.4.5" + "vue-router": "^4.4.5", + "vue3-video-play": "^1.3.2" }, "devDependencies": { "@vitejs/plugin-vue": "^5.2.1", @@ -467,7 +469,6 @@ "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", @@ -484,8 +485,6 @@ "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", @@ -502,7 +501,6 @@ "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", @@ -525,8 +523,6 @@ "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", @@ -700,7 +696,6 @@ "integrity": "sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==", "dev": true }, -<<<<<<< HEAD "node_modules/@popperjs/core": { "name": "@sxzz/popperjs-es", "version": "2.11.7", @@ -711,8 +706,6 @@ "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", @@ -1770,6 +1763,12 @@ "dev": true, "peer": true }, + "node_modules/es6-promise": { + "version": "4.2.8", + "resolved": "https://registry.npmmirror.com/es6-promise/-/es6-promise-4.2.8.tgz", + "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==", + "license": "MIT" + }, "node_modules/esbuild": { "version": "0.24.0", "resolved": "https://registry.npmmirror.com/esbuild/-/esbuild-0.24.0.tgz", @@ -2001,6 +2000,16 @@ "node": ">=8" } }, + "node_modules/flv.js": { + "version": "1.6.2", + "resolved": "https://registry.npmmirror.com/flv.js/-/flv.js-1.6.2.tgz", + "integrity": "sha512-xre4gUbX1MPtgQRKj2pxJENp/RnaHaxYvy3YToVVCrSmAWUu85b9mug6pTXF6zakUjNP2lFWZ1rkSX7gxhB/2A==", + "license": "Apache-2.0", + "dependencies": { + "es6-promise": "^4.2.8", + "webworkify-webpack": "^2.1.5" + } + }, "node_modules/follow-redirects": { "version": "1.15.9", "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.9.tgz", @@ -2116,6 +2125,12 @@ "node": ">=8" } }, + "node_modules/hls.js": { + "version": "1.5.17", + "resolved": "https://registry.npmmirror.com/hls.js/-/hls.js-1.5.17.tgz", + "integrity": "sha512-wA66nnYFvQa1o4DO/BFgLNRKnBTVXpNeldGRBJ2Y0SvFtdwvFKCbqa9zhHoZLoxHhZ+jYsj3aIBkWQQCPNOhMw==", + "license": "Apache-2.0" + }, "node_modules/hookable": { "version": "5.5.3", "resolved": "https://registry.npmmirror.com/hookable/-/hookable-5.5.3.tgz", @@ -3369,6 +3384,15 @@ "url": "https://opencollective.com/webpack" } }, + "node_modules/throttle-debounce": { + "version": "3.0.1", + "resolved": "https://registry.npmmirror.com/throttle-debounce/-/throttle-debounce-3.0.1.tgz", + "integrity": "sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==", + "license": "MIT", + "engines": { + "node": ">=10" + } + }, "node_modules/tinyglobby": { "version": "0.2.10", "resolved": "https://registry.npmmirror.com/tinyglobby/-/tinyglobby-0.2.10.tgz", @@ -3823,10 +3847,7 @@ "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" }, @@ -3891,6 +3912,17 @@ "vue": "^3.2.0" } }, + "node_modules/vue3-video-play": { + "version": "1.3.2", + "resolved": "https://registry.npmmirror.com/vue3-video-play/-/vue3-video-play-1.3.2.tgz", + "integrity": "sha512-eEwCJ0NIkfVQgTj0I3Kf9b1E/04Qne8mQQiE8r77BocblHsZ2T6af3q8l8Zzs/OvjlpQAQvkN/ACVUOJC3RSXg==", + "license": "ISC", + "dependencies": { + "hls.js": "^1.0.10", + "throttle-debounce": "^3.0.1", + "vue": "^3.2.2" + } + }, "node_modules/watchpack": { "version": "2.4.2", "resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-2.4.2.tgz", @@ -3987,6 +4019,12 @@ "url": "https://opencollective.com/webpack" } }, + "node_modules/webworkify-webpack": { + "version": "2.1.5", + "resolved": "https://registry.npmmirror.com/webworkify-webpack/-/webworkify-webpack-2.1.5.tgz", + "integrity": "sha512-2akF8FIyUvbiBBdD+RoHpoTbHMQF2HwjcxfDvgztAX5YwbZNyrtfUMgvfgFVsgDhDPVTlkbb5vyasqDHfIDPQw==", + "license": "MIT" + }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz", diff --git a/package.json b/package.json index 33422bc..0884a16 100644 --- a/package.json +++ b/package.json @@ -13,11 +13,13 @@ "axios": "^1.7.9", "echarts": "^5.5.1", "element-plus": "^2.9.0", + "flv.js": "^1.6.2", "pinia": "^2.2.6", "vue": "^3.5.13", "vue-countup-v3": "^1.4.2", "vue-echarts": "^7.0.3", - "vue-router": "^4.4.5" + "vue-router": "^4.4.5", + "vue3-video-play": "^1.3.2" }, "devDependencies": { "@vitejs/plugin-vue": "^5.2.1", diff --git a/src/assets/images/map-img-1.jpg b/src/assets/images/map-img-1.jpg new file mode 100644 index 0000000..1643619 Binary files /dev/null and b/src/assets/images/map-img-1.jpg differ diff --git a/src/assets/images/one-video-bg.png b/src/assets/images/one-video-bg.png new file mode 100644 index 0000000..1e90947 Binary files /dev/null and b/src/assets/images/one-video-bg.png differ diff --git a/src/assets/images/v-item-bg-1.png b/src/assets/images/v-item-bg-1.png new file mode 100644 index 0000000..e787a6e Binary files /dev/null and b/src/assets/images/v-item-bg-1.png differ diff --git a/src/components/Map/marker.vue b/src/components/Map/marker.vue new file mode 100644 index 0000000..7478ff0 --- /dev/null +++ b/src/components/Map/marker.vue @@ -0,0 +1,69 @@ + + + + diff --git a/src/components/Map/t-ico-1.png b/src/components/Map/t-ico-1.png new file mode 100644 index 0000000..f018953 Binary files /dev/null and b/src/components/Map/t-ico-1.png differ diff --git a/src/main.js b/src/main.js index 0be59f0..a7209f1 100644 --- a/src/main.js +++ b/src/main.js @@ -4,9 +4,11 @@ import App from './App.vue' import router from './router' import '@/styles/reset.css' import '@/styles/common.scss' - +import vue3videoPlay from 'vue3-video-play' // 引入组件 +import 'vue3-video-play/dist/style.css' // 引入css const app = createApp(App) +app.use(vue3videoPlay) app.use(createPinia()) app.use(router) diff --git a/src/router/index.js b/src/router/index.js index 1e2e898..d358c44 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -8,11 +8,16 @@ const router = createRouter({ name: 'home', component: () => import('@/views/home/index.vue') }, - { - path: '/monitor', - name: 'monitor', - component: () => import('@/views/monitor/index.vue') - }, + { + path: '/monitor', + name: 'monitor', + component: () => import('../views/monitor/index.vue') + }, + { + path: '/testing', + name: 'testing', + component: () => import('../views/testing/index.vue') + }, { path: '/scenic', name: 'scenic', diff --git a/src/views/home/components/box-3.vue b/src/views/home/components/box-3.vue index 4f733ba..af706af 100644 --- a/src/views/home/components/box-3.vue +++ b/src/views/home/components/box-3.vue @@ -288,3 +288,4 @@ } } + diff --git a/src/views/monitor/components/box-2.vue b/src/views/monitor/components/box-2.vue index e206ce1..6af9fd2 100644 --- a/src/views/monitor/components/box-2.vue +++ b/src/views/monitor/components/box-2.vue @@ -61,7 +61,6 @@
异常告警
-
@@ -151,14 +150,14 @@ diff --git a/src/views/monitor/index.vue b/src/views/monitor/index.vue index bece486..5ed24be 100644 --- a/src/views/monitor/index.vue +++ b/src/views/monitor/index.vue @@ -1,35 +1,19 @@ diff --git a/src/views/testing/components/box-1.vue b/src/views/testing/components/box-1.vue new file mode 100644 index 0000000..fcc2564 --- /dev/null +++ b/src/views/testing/components/box-1.vue @@ -0,0 +1,94 @@ + + + + + diff --git a/src/views/testing/components/box-2.vue b/src/views/testing/components/box-2.vue new file mode 100644 index 0000000..e578304 --- /dev/null +++ b/src/views/testing/components/box-2.vue @@ -0,0 +1,629 @@ + + + + + diff --git a/src/views/testing/components/box-3.vue b/src/views/testing/components/box-3.vue new file mode 100644 index 0000000..3d8e910 --- /dev/null +++ b/src/views/testing/components/box-3.vue @@ -0,0 +1,158 @@ + + + + \ No newline at end of file diff --git a/src/views/testing/components/box-4.vue b/src/views/testing/components/box-4.vue new file mode 100644 index 0000000..d429aeb --- /dev/null +++ b/src/views/testing/components/box-4.vue @@ -0,0 +1,177 @@ + + + + + diff --git a/src/views/testing/components/box-5.vue b/src/views/testing/components/box-5.vue new file mode 100644 index 0000000..63077d9 --- /dev/null +++ b/src/views/testing/components/box-5.vue @@ -0,0 +1,514 @@ + + + + \ No newline at end of file diff --git a/src/views/testing/index.vue b/src/views/testing/index.vue new file mode 100644 index 0000000..63a459d --- /dev/null +++ b/src/views/testing/index.vue @@ -0,0 +1,98 @@ + + + + + diff --git a/t.png b/t.png new file mode 100644 index 0000000..1b82972 Binary files /dev/null and b/t.png differ