diff --git a/src/App.vue b/src/App.vue
index 4cbad52..b258d06 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,9 +1,17 @@
-
+
-
+
diff --git a/src/assets/images/Group 1342@2x.png b/src/assets/images/Group 1342@2x.png
new file mode 100644
index 0000000..a44ed4e
Binary files /dev/null and b/src/assets/images/Group 1342@2x.png differ
diff --git a/src/assets/images/Mask group@2x.png b/src/assets/images/Mask group@2x.png
new file mode 100644
index 0000000..2e16195
Binary files /dev/null and b/src/assets/images/Mask group@2x.png differ
diff --git a/src/assets/images/count-bg.svg b/src/assets/images/count-bg.svg
new file mode 100644
index 0000000..61275f5
--- /dev/null
+++ b/src/assets/images/count-bg.svg
@@ -0,0 +1,41 @@
+
diff --git a/src/assets/images/dian.svg b/src/assets/images/dian.svg
new file mode 100644
index 0000000..b5b250c
--- /dev/null
+++ b/src/assets/images/dian.svg
@@ -0,0 +1,6 @@
+
diff --git a/src/assets/images/title-2-select.png b/src/assets/images/title-2-select.png
new file mode 100644
index 0000000..f9812cd
Binary files /dev/null and b/src/assets/images/title-2-select.png differ
diff --git a/src/assets/images/title.png b/src/assets/images/title.png
index 1d3b41f..c626ad8 100644
Binary files a/src/assets/images/title.png and b/src/assets/images/title.png differ
diff --git a/src/views/home/components/box-1.vue b/src/components/CoreVideo/index.vue
similarity index 98%
rename from src/views/home/components/box-1.vue
rename to src/components/CoreVideo/index.vue
index 5b3f445..8c3265d 100644
--- a/src/views/home/components/box-1.vue
+++ b/src/components/CoreVideo/index.vue
@@ -1,5 +1,5 @@
-
+
核心景区视频
-
diff --git a/src/components/Header/index.vue b/src/components/Header/index.vue
new file mode 100644
index 0000000..b6d37ee
--- /dev/null
+++ b/src/components/Header/index.vue
@@ -0,0 +1,156 @@
+
+
+
+
+
+
+
diff --git a/src/router/index.js b/src/router/index.js
index 784c7fd..d358c44 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -6,7 +6,7 @@ const router = createRouter({
{
path: '/',
name: 'home',
- component: () => import('../views/home/index.vue')
+ component: () => import('@/views/home/index.vue')
},
{
path: '/monitor',
@@ -17,7 +17,12 @@ const router = createRouter({
path: '/testing',
name: 'testing',
component: () => import('../views/testing/index.vue')
- }
+ },
+ {
+ path: '/scenic',
+ name: 'scenic',
+ component: () => import('@/views/scenic/index.vue')
+ }
]
})
diff --git a/src/styles/common.scss b/src/styles/common.scss
index 3459feb..56dbb20 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -10,6 +10,9 @@
.align-end {
align-items: flex-end;
}
+.justify-center {
+ justify-content: center;
+}
.justify-between {
justify-content: space-between;
}
@@ -28,6 +31,9 @@
.mb-10 {
margin-bottom: vh(10);
}
+.mr-10 {
+ margin-right: vh(10);
+}
.pt-20 {
padding-top: vh(20);
}
diff --git a/src/views/home/components/pie.vue b/src/views/home/components/age-ratio.vue
similarity index 80%
rename from src/views/home/components/pie.vue
rename to src/views/home/components/age-ratio.vue
index d2f0f6a..2ac58a9 100644
--- a/src/views/home/components/pie.vue
+++ b/src/views/home/components/age-ratio.vue
@@ -1,33 +1,22 @@
-
+
\ No newline at end of file
+<<<<<<< HEAD
+
+=======
+
+>>>>>>> 1108aafed493fffba8fdd2e63eae89a9092ef6e5
diff --git a/src/views/home/components/box-4.vue b/src/views/home/components/box-4.vue
index e530809..78f333f 100644
--- a/src/views/home/components/box-4.vue
+++ b/src/views/home/components/box-4.vue
@@ -1,6 +1,6 @@
-
+
-
车牌号
-
车长
-
车速
+
白帝城
+
5辆
+
1辆
+
+
+
@@ -126,12 +136,56 @@
辆
+
@@ -139,8 +193,10 @@
+
+
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 9abe4da..a915696 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -1,4 +1,5 @@
+<<<<<<< HEAD