diff --git a/src/assets/img/elli_tray.svg b/src/assets/img/elli_tray.svg new file mode 100644 index 0000000..4ff767a --- /dev/null +++ b/src/assets/img/elli_tray.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/img/tray.svg b/src/assets/img/tray.svg new file mode 100644 index 0000000..037ebd1 --- /dev/null +++ b/src/assets/img/tray.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/router/index.ts b/src/router/index.ts index 58dce72..a82d0db 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -270,8 +270,20 @@ const routes: Array = [ }, { path: "/MicroExhibition", - name: "MicroExhibition", - component: () => import("../views/MicroExhibition/index.vue"), + children: [ + { + path: "/MicroExhibition", + name: "MicroExhibition", + component: () => import("../views/MicroExhibition/index.vue"), + }, + { + path: "/MicroExhibition/:id", + name: "MicroExhibitionChild", + component: () => import("../views/MicroExhibition/child/index.vue"), + }, + ] + + }, diff --git a/src/views/MicroExhibition/child/LineChart.vue b/src/views/MicroExhibition/child/LineChart.vue new file mode 100644 index 0000000..0712c32 --- /dev/null +++ b/src/views/MicroExhibition/child/LineChart.vue @@ -0,0 +1,98 @@ + + + + + diff --git a/src/views/MicroExhibition/child/index.vue b/src/views/MicroExhibition/child/index.vue new file mode 100644 index 0000000..384cafa --- /dev/null +++ b/src/views/MicroExhibition/child/index.vue @@ -0,0 +1,170 @@ + + + + + diff --git a/src/views/MicroExhibition/components/LineChart.vue b/src/views/MicroExhibition/components/LineChart.vue index 0bd837d..cc1920f 100644 --- a/src/views/MicroExhibition/components/LineChart.vue +++ b/src/views/MicroExhibition/components/LineChart.vue @@ -5,6 +5,16 @@ + + diff --git a/src/views/MicroExhibition/index.vue b/src/views/MicroExhibition/index.vue index 6445e7a..b2b9e22 100644 --- a/src/views/MicroExhibition/index.vue +++ b/src/views/MicroExhibition/index.vue @@ -52,12 +52,14 @@
- + + +
- - + +
@@ -73,6 +75,7 @@ import LineChart from './components/LineChart.vue' import BarChart from './components/BarChart.vue' import ringChart from "./components/ringChart.vue"; import DevCard from "./components/DevCard.vue"; +import PbjCard from './components/PbjCard.vue'; import scrollBoard from "./components/scrollBoard.vue"; import { ref, reactive, getCurrentInstance } from 'vue' @@ -92,6 +95,7 @@ let titleTip = [ name: t('messages.disconnection'), }, ]; +document.title = '设备大屏展示系统'; let ringData = ref([]); ringData.value = [ { name: '工作', value: 7 }, @@ -250,6 +254,7 @@ h2 { flex-direction: column; align-items: center; } + .progress-title { margin-top: 20px; font-size: 16px;