diff --git a/src/App.vue b/src/App.vue
index 11b5c9e..2eff07c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -22,7 +22,7 @@
diff --git a/src/layout/index.vue b/src/layout/index.vue
index b435fb0..7349121 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -2,9 +2,9 @@
import { onBeforeMount } from 'vue';
import { useRoute } from 'vue-router';
-import CommonHeader from '@/components/CommonHeader/CommonHeader.vue';
-import LayoutHeader from '@/components/CommonHeader/LayoutHeader.vue';
import { HeaderTypeEnum } from '@/enums/HeaderTypeEnum';
+import LayoutHeaderCommon from '@/layout/layout-header/components/LayoutHeaderCommon.vue';
+import LayoutHeaderHome from '@/layout/layout-header/components/LayoutHeaderHome.vue';
import { useAppStore } from '@/store/app';
const route = useRoute();
@@ -17,9 +17,9 @@ onBeforeMount(() => {
-
-
-
+
+
+
diff --git a/src/components/CommonHeader/CommonHeader.vue b/src/layout/layout-header/components/LayoutHeaderCommon.vue
similarity index 82%
rename from src/components/CommonHeader/CommonHeader.vue
rename to src/layout/layout-header/components/LayoutHeaderCommon.vue
index 50db6a3..31572e7 100644
--- a/src/components/CommonHeader/CommonHeader.vue
+++ b/src/layout/layout-header/components/LayoutHeaderCommon.vue
@@ -2,7 +2,7 @@
import { onMounted, ref } from 'vue';
import { useRoute, useRouter } from 'vue-router';
-import BarOp from '@/components/CommonHeader/HeaderBarOp.vue';
+import LayoutHeaderNav from '@/layout/layout-header/components/LayoutHeaderNav.vue';
import dayjs from '@/plugins/dayjs';
import { resetRouter } from '@/router';
@@ -34,13 +34,13 @@ onMounted(() => {
-
+
-
+
@@ -48,7 +48,7 @@ onMounted(() => {
header {
position: relative;
height: 108px;
- background: url('@/assets/images/common/header/bg-parking-header.png') no-repeat center;
+ background: url('@/layout/layout-header/images/layout-header-2.png') no-repeat center;
background-size: cover;
}
diff --git a/src/components/CommonHeader/LayoutHeader.vue b/src/layout/layout-header/components/LayoutHeaderHome.vue
similarity index 68%
rename from src/components/CommonHeader/LayoutHeader.vue
rename to src/layout/layout-header/components/LayoutHeaderHome.vue
index 24f9fc5..818e196 100644
--- a/src/components/CommonHeader/LayoutHeader.vue
+++ b/src/layout/layout-header/components/LayoutHeaderHome.vue
@@ -1,7 +1,7 @@
@@ -10,7 +10,7 @@ const route = useRoute();
@@ -19,7 +19,7 @@ const route = useRoute();
.header-title {
width: 100%;
height: 108px;
- background: url('@/assets/images/common/header/bg-layout-header.png') no-repeat center;
+ background: url('@/layout/layout-header/images/layout-header-1.png') no-repeat center;
background-size: cover;
h1 {
diff --git a/src/components/CommonHeader/HeaderBarOp.vue b/src/layout/layout-header/components/LayoutHeaderNav.vue
similarity index 70%
rename from src/components/CommonHeader/HeaderBarOp.vue
rename to src/layout/layout-header/components/LayoutHeaderNav.vue
index a402fc4..33c8331 100644
--- a/src/components/CommonHeader/HeaderBarOp.vue
+++ b/src/layout/layout-header/components/LayoutHeaderNav.vue
@@ -3,9 +3,9 @@
diff --git a/src/assets/images/common/icon/icon-1.png b/src/layout/layout-header/images/icon/icon-1.png
similarity index 100%
rename from src/assets/images/common/icon/icon-1.png
rename to src/layout/layout-header/images/icon/icon-1.png
diff --git a/src/assets/images/common/icon/icon-2.png b/src/layout/layout-header/images/icon/icon-2.png
similarity index 100%
rename from src/assets/images/common/icon/icon-2.png
rename to src/layout/layout-header/images/icon/icon-2.png
diff --git a/src/assets/images/common/icon/icon-3.png b/src/layout/layout-header/images/icon/icon-3.png
similarity index 100%
rename from src/assets/images/common/icon/icon-3.png
rename to src/layout/layout-header/images/icon/icon-3.png
diff --git a/src/assets/images/common/icon/icon-home.png b/src/layout/layout-header/images/icon/icon-home.png
similarity index 100%
rename from src/assets/images/common/icon/icon-home.png
rename to src/layout/layout-header/images/icon/icon-home.png
diff --git a/src/assets/images/common/icon/icon-setting.png b/src/layout/layout-header/images/icon/icon-setting.png
similarity index 100%
rename from src/assets/images/common/icon/icon-setting.png
rename to src/layout/layout-header/images/icon/icon-setting.png
diff --git a/src/assets/images/common/header/bg-layout-header.png b/src/layout/layout-header/images/layout-header-1.png
similarity index 100%
rename from src/assets/images/common/header/bg-layout-header.png
rename to src/layout/layout-header/images/layout-header-1.png
diff --git a/src/assets/images/common/header/bg-parking-header.png b/src/layout/layout-header/images/layout-header-2.png
similarity index 100%
rename from src/assets/images/common/header/bg-parking-header.png
rename to src/layout/layout-header/images/layout-header-2.png
diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts
index 6106a00..5347e97 100644
--- a/src/router/modules/home.ts
+++ b/src/router/modules/home.ts
@@ -48,8 +48,8 @@ const routes: RouteConfigsTable[] = [
subtitle: '社区可视化中心',
headerType: HeaderTypeEnum.subtitle,
transition: {
- enter: 'animate__bounceIn animate__faster',
- leave: 'animate__bounceOut',
+ enter: 'animate__backInLeft animate__faster',
+ leave: 'animate__backOutRight animate__faster',
},
},
},
diff --git a/src/views/big-data/charts/content-bottom.tsx b/src/views/big-data/charts/content-footer.tsx
similarity index 97%
rename from src/views/big-data/charts/content-bottom.tsx
rename to src/views/big-data/charts/content-footer.tsx
index 25758e9..b93f624 100644
--- a/src/views/big-data/charts/content-bottom.tsx
+++ b/src/views/big-data/charts/content-footer.tsx
@@ -78,7 +78,7 @@ const option = {
};
/** 渲染图表 */
-export const renderEcharts = (element: Ref) => {
+export const renderFooterChart = (element: Ref) => {
myChart = echarts.init(element.value, null, {
renderer: 'canvas',
devicePixelRatio: window.devicePixelRatio,
diff --git a/src/views/big-data/charts/left-middle.tsx b/src/views/big-data/charts/left-body.tsx
similarity index 100%
rename from src/views/big-data/charts/left-middle.tsx
rename to src/views/big-data/charts/left-body.tsx
diff --git a/src/views/big-data/charts/left-bottom.tsx b/src/views/big-data/charts/left-footer.tsx
similarity index 93%
rename from src/views/big-data/charts/left-bottom.tsx
rename to src/views/big-data/charts/left-footer.tsx
index 0dc78d9..50dcdcc 100644
--- a/src/views/big-data/charts/left-bottom.tsx
+++ b/src/views/big-data/charts/left-footer.tsx
@@ -59,7 +59,7 @@ const option = {
};
/** 渲染图表 */
-export const renderEcharts = (element: Ref) => {
+export const renderFooterChart = (element: Ref) => {
myChart = echarts.init(element.value, null, {
renderer: 'canvas',
devicePixelRatio: window.devicePixelRatio,
@@ -71,7 +71,7 @@ export const renderEcharts = (element: Ref) => {
};
/** 更新图表数据 */
-export const updateChart = (option: Array>) => {
+export const updateFooterChart = (option: Array>) => {
const series = myChart.getOption().series;
series[0].data = option[0];
series[1].data = option[1];
diff --git a/src/views/big-data/charts/right-top.ts b/src/views/big-data/charts/right-header.ts
similarity index 100%
rename from src/views/big-data/charts/right-top.ts
rename to src/views/big-data/charts/right-header.ts
diff --git a/src/views/big-data/components/big-data-content/components/content-bottom.vue b/src/views/big-data/components/big-data-content/components/content-bottom.vue
deleted file mode 100644
index 2944104..0000000
--- a/src/views/big-data/components/big-data-content/components/content-bottom.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/views/big-data/components/big-data-content/components/content-middle.vue b/src/views/big-data/components/big-data-content/components/content-middle.vue
deleted file mode 100644
index c888443..0000000
--- a/src/views/big-data/components/big-data-content/components/content-middle.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-
-
-

-
-
工作台
-
-

-
-
-
-
-
diff --git a/src/views/big-data/components/big-data-content/components/content-top.vue b/src/views/big-data/components/big-data-content/components/content-top.vue
deleted file mode 100644
index 58bae3f..0000000
--- a/src/views/big-data/components/big-data-content/components/content-top.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-
- -
-
- {{ item.title }}
-
-
-
-
-
diff --git a/src/views/big-data/components/big-data-content/index.vue b/src/views/big-data/components/big-data-content/index.vue
index 9b82c94..8c47848 100644
--- a/src/views/big-data/components/big-data-content/index.vue
+++ b/src/views/big-data/components/big-data-content/index.vue
@@ -1,15 +1,154 @@
-
-
-
+
+
+
+
+

+
工作台
+

+
+
+
+
-
+
diff --git a/src/views/big-data/components/big-data-left/components/left-bottom.vue b/src/views/big-data/components/big-data-left/components/left-bottom.vue
deleted file mode 100644
index 1c1d43e..0000000
--- a/src/views/big-data/components/big-data-left/components/left-bottom.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/views/big-data/components/big-data-left/components/left-middle.vue b/src/views/big-data/components/big-data-left/components/left-middle.vue
deleted file mode 100644
index 6c04988..0000000
--- a/src/views/big-data/components/big-data-left/components/left-middle.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/views/big-data/components/big-data-left/components/left-top.vue b/src/views/big-data/components/big-data-left/components/left-top.vue
deleted file mode 100644
index ce32ab5..0000000
--- a/src/views/big-data/components/big-data-left/components/left-top.vue
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/views/big-data/components/big-data-left/index.vue b/src/views/big-data/components/big-data-left/index.vue
index 98571fa..750e024 100644
--- a/src/views/big-data/components/big-data-left/index.vue
+++ b/src/views/big-data/components/big-data-left/index.vue
@@ -1,13 +1,231 @@
+
+
diff --git a/src/views/big-data/components/big-data-right/components/right-bottom.vue b/src/views/big-data/components/big-data-right/components/right-bottom.vue
index 528d137..901365a 100644
--- a/src/views/big-data/components/big-data-right/components/right-bottom.vue
+++ b/src/views/big-data/components/big-data-right/components/right-bottom.vue
@@ -13,7 +13,7 @@ const list = [
-