diff --git a/dist.7z b/dist.7z new file mode 100644 index 0000000..13a89f1 Binary files /dev/null and b/dist.7z differ diff --git a/src/views/bim/bimHome/components/DeviceEvent.vue b/src/views/bim/bimHome/components/DeviceEvent.vue index 4ba0bca..4d039d4 100644 --- a/src/views/bim/bimHome/components/DeviceEvent.vue +++ b/src/views/bim/bimHome/components/DeviceEvent.vue @@ -67,8 +67,8 @@ const openDialog = () => { \ No newline at end of file diff --git a/src/views/index.vue b/src/views/index.vue index 5c159ab..72bca72 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -13,6 +13,7 @@ + @@ -23,6 +24,7 @@ import Map from './components/Map.vue'; import Pie from './components/Pie.vue'; import Bar from './components/Bar.vue'; +import xtBar from './components/xtBar.vue'; import Line from './components/Line.vue'; import Device from './components/Device.vue'; import useTagsViewStore from "@/store/modules/tagsView"; @@ -47,11 +49,12 @@ const gotoPage = (item) => { .home { .topMenu { width: 100%; - height: 80px; - border: 1px solid #020c45; + height: 60px; + // border: 1px solid #020c45; display: flex; align-items: center; - background: #3d5d9a; + // background: #3d5d9a; + background: #030e23; color: #fff; > div { width: 260px; @@ -66,7 +69,7 @@ const gotoPage = (item) => { } .home-page { width:100%; - height: calc(100vh - 150px); + height: calc(100vh - 130px); background: #000000; position: relative; .map-div { @@ -85,16 +88,24 @@ const gotoPage = (item) => { .bar-div { position: absolute; width: 400px; - height: 460px; + height: 98%; top: 10px; right: 10px; padding: 15px; } + .xt-bar-div { + position: absolute; + width: 400px; + height: 460px; + top: 370px; + left: 10px; + padding: 15px; + } .device-div { position: absolute; - bottom: 10px; - left: 10px; - width: 930px; + top: 10px; + left: 420px; + width: calc(100% - 840px); height: 200px; padding: 15px; // background: #b2cae0; @@ -102,8 +113,8 @@ const gotoPage = (item) => { .line-div { position: absolute; bottom: 10px; - right: 10px; - width: 930px; + left: 420px; + width: calc(100% - 840px); height: 200px; padding: 15px; // background: #b2cae0;