diff --git a/package.json b/package.json index d90fb14..dc52788 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "@jiaminghi/data-view": "^2.7.3", "@types/echarts": "^4.4.3", "core-js": "^3.6.4", - "echarts": "^4.6.0", + "echarts": "^5.4.0", "element-ui": "2.15.13", "js-cookie": "3.0.1", "vue": "^2.6.11", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 478f6f7..d557a22 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,8 +15,8 @@ dependencies: specifier: ^3.6.4 version: 3.6.4 echarts: - specifier: ^4.6.0 - version: 4.6.0 + specifier: ^5.4.0 + version: 5.4.0 element-ui: specifier: 2.15.13 version: 2.15.13(vue@2.6.11) @@ -4401,10 +4401,11 @@ packages: safer-buffer: 2.1.2 dev: true - /echarts@4.6.0: - resolution: {integrity: sha512-xKkcr6v9UVOSF+PMuj7Ngt3bnzLwN1sSXWCvpvX+jYb3mePYsZnABq7wGkPac/m0nV653uGHXoHK8DCKCprdNg==} + /echarts@5.4.0: + resolution: {integrity: sha512-uPsO9VRUIKAdFOoH3B0aNg7NRVdN7aM39/OjovjO9MwmWsAkfGyeXJhK+dbRi51iDrQWliXV60/XwLA7kg3z0w==} dependencies: - zrender: 4.2.0 + tslib: 2.3.0 + zrender: 5.4.0 dev: false /ee-first@1.1.1: @@ -8824,6 +8825,10 @@ packages: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} dev: true + /tslib@2.3.0: + resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==} + dev: false + /tslib@2.6.3: resolution: {integrity: sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==} dev: true @@ -9633,6 +9638,8 @@ packages: strip-indent: 2.0.0 dev: true - /zrender@4.2.0: - resolution: {integrity: sha512-YJ9hxt5uFincYYU3KK31+Ce+B6PJmYYK0Q9fQ6jOUAoC/VHbe4kCKAPkxKeT7jGTxrK5wYu18R0TLGqj2zbEOA==} + /zrender@5.4.0: + resolution: {integrity: sha512-rOS09Z2HSVGFs2dn/TuYk5BlCaZcVe8UDLLjj1ySYF828LATKKdxuakSZMvrDz54yiKPDYVfjdKqcX8Jky3BIA==} + dependencies: + tslib: 2.3.0 dev: false diff --git a/src/assets/image/env-img/air-A.png b/src/assets/image/env-img/air-A.png new file mode 100644 index 0000000..316ff99 Binary files /dev/null and b/src/assets/image/env-img/air-A.png differ diff --git a/src/assets/image/env-img/air-B.png b/src/assets/image/env-img/air-B.png new file mode 100644 index 0000000..19848c7 Binary files /dev/null and b/src/assets/image/env-img/air-B.png differ diff --git a/src/assets/image/env-img/air-C.png b/src/assets/image/env-img/air-C.png new file mode 100644 index 0000000..0193680 Binary files /dev/null and b/src/assets/image/env-img/air-C.png differ diff --git a/src/assets/image/env-img/dz_big.png b/src/assets/image/env-img/dz_big.png new file mode 100644 index 0000000..0e6a83f Binary files /dev/null and b/src/assets/image/env-img/dz_big.png differ diff --git a/src/assets/image/env-img/dz_sm.png b/src/assets/image/env-img/dz_sm.png new file mode 100644 index 0000000..6a98a67 Binary files /dev/null and b/src/assets/image/env-img/dz_sm.png differ diff --git a/src/assets/image/env-img/env-1.png b/src/assets/image/env-img/env-1.png new file mode 100644 index 0000000..b625193 Binary files /dev/null and b/src/assets/image/env-img/env-1.png differ diff --git a/src/assets/image/env-img/env-2.png b/src/assets/image/env-img/env-2.png new file mode 100644 index 0000000..ed70f84 Binary files /dev/null and b/src/assets/image/env-img/env-2.png differ diff --git a/src/assets/image/env-img/env-3.png b/src/assets/image/env-img/env-3.png new file mode 100644 index 0000000..febef95 Binary files /dev/null and b/src/assets/image/env-img/env-3.png differ diff --git a/src/assets/image/env-img/env-4.png b/src/assets/image/env-img/env-4.png new file mode 100644 index 0000000..da0308b Binary files /dev/null and b/src/assets/image/env-img/env-4.png differ diff --git a/src/assets/image/env-img/levelA.png b/src/assets/image/env-img/levelA.png new file mode 100644 index 0000000..7b16c58 Binary files /dev/null and b/src/assets/image/env-img/levelA.png differ diff --git a/src/assets/image/env-img/levelB.png b/src/assets/image/env-img/levelB.png new file mode 100644 index 0000000..a7ec496 Binary files /dev/null and b/src/assets/image/env-img/levelB.png differ diff --git a/src/assets/image/env-img/levelC.png b/src/assets/image/env-img/levelC.png new file mode 100644 index 0000000..e2bdf10 Binary files /dev/null and b/src/assets/image/env-img/levelC.png differ diff --git a/src/assets/image/env-img/levelD.png b/src/assets/image/env-img/levelD.png new file mode 100644 index 0000000..1b5e699 Binary files /dev/null and b/src/assets/image/env-img/levelD.png differ diff --git a/src/assets/image/env-img/levelE.png b/src/assets/image/env-img/levelE.png new file mode 100644 index 0000000..db29591 Binary files /dev/null and b/src/assets/image/env-img/levelE.png differ diff --git a/src/assets/image/env-img/levelF.png b/src/assets/image/env-img/levelF.png new file mode 100644 index 0000000..2610fbe Binary files /dev/null and b/src/assets/image/env-img/levelF.png differ diff --git a/src/assets/image/env-img/line.png b/src/assets/image/env-img/line.png new file mode 100644 index 0000000..24db37f Binary files /dev/null and b/src/assets/image/env-img/line.png differ diff --git a/src/assets/image/env-img/line_big.png b/src/assets/image/env-img/line_big.png new file mode 100644 index 0000000..5251818 Binary files /dev/null and b/src/assets/image/env-img/line_big.png differ diff --git a/src/assets/image/env-img/offline.png b/src/assets/image/env-img/offline.png new file mode 100644 index 0000000..85eae8d Binary files /dev/null and b/src/assets/image/env-img/offline.png differ diff --git a/src/assets/image/env-img/offline_big.png b/src/assets/image/env-img/offline_big.png new file mode 100644 index 0000000..24a4b5e Binary files /dev/null and b/src/assets/image/env-img/offline_big.png differ diff --git a/src/assets/image/env-img/round.png b/src/assets/image/env-img/round.png new file mode 100644 index 0000000..3b89b5c Binary files /dev/null and b/src/assets/image/env-img/round.png differ diff --git a/src/components/ChartsBox/index.vue b/src/components/ChartsBox/index.vue index ccc7044..014ee20 100644 --- a/src/components/ChartsBox/index.vue +++ b/src/components/ChartsBox/index.vue @@ -28,18 +28,19 @@ export default { height: 100%; .title_bg { width: 100%; - height: 38px; + height: 32px; background: url('@/assets/image/common/box_title_bg.png') no-repeat; background-size: 100% 100%; color: #fff; - line-height: 38px; + line-height: 32px; padding-left: 40px; letter-spacing: 2px; + font-size: 16px; } .charts-content { width: 100%; - height: calc(100% - 38px); + height: calc(100% - 32px); } } diff --git a/src/views/home-env-monitor/components/center-four-model.vue b/src/views/home-env-monitor/components/center-four-model.vue new file mode 100644 index 0000000..989338d --- /dev/null +++ b/src/views/home-env-monitor/components/center-four-model.vue @@ -0,0 +1,224 @@ + + + + + + + + + + + + diff --git a/src/views/home-env-monitor/components/center-one-model.vue b/src/views/home-env-monitor/components/center-one-model.vue new file mode 100644 index 0000000..cd3ddcc --- /dev/null +++ b/src/views/home-env-monitor/components/center-one-model.vue @@ -0,0 +1,90 @@ + + + + + + + + + + + {{ item.count }} + + {{ item.code }} + + + {{ item.name }} + + + + + + + + + + + diff --git a/src/views/home-env-monitor/components/center-three-model.vue b/src/views/home-env-monitor/components/center-three-model.vue new file mode 100644 index 0000000..f2aafc5 --- /dev/null +++ b/src/views/home-env-monitor/components/center-three-model.vue @@ -0,0 +1,402 @@ + + + + + + + + + PM2.5 + + + + 空气质量 + + + + PM2.5 + + + + + + + + + + + {{ item }} + + + + + + + + + + + diff --git a/src/views/home-env-monitor/components/center-two-model.vue b/src/views/home-env-monitor/components/center-two-model.vue new file mode 100644 index 0000000..81813c4 --- /dev/null +++ b/src/views/home-env-monitor/components/center-two-model.vue @@ -0,0 +1,207 @@ + + + + + + + + + + + + diff --git a/src/views/home-env-monitor/components/left-one-model.vue b/src/views/home-env-monitor/components/left-one-model.vue new file mode 100644 index 0000000..968bb2f --- /dev/null +++ b/src/views/home-env-monitor/components/left-one-model.vue @@ -0,0 +1,90 @@ + + + + + + + + + {{ item.name }} + + + {{ item.code }} + + + + + + + + 在线 + + 离线 + + + + + + + diff --git a/src/views/home-env-monitor/components/left-three-model.vue b/src/views/home-env-monitor/components/left-three-model.vue new file mode 100644 index 0000000..edfd21e --- /dev/null +++ b/src/views/home-env-monitor/components/left-three-model.vue @@ -0,0 +1,291 @@ + + + + + + + + + + + + diff --git a/src/views/home-env-monitor/components/left-two-model.vue b/src/views/home-env-monitor/components/left-two-model.vue new file mode 100644 index 0000000..93f23b3 --- /dev/null +++ b/src/views/home-env-monitor/components/left-two-model.vue @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + diff --git a/src/views/home-env-monitor/components/right-one-model.vue b/src/views/home-env-monitor/components/right-one-model.vue new file mode 100644 index 0000000..435642a --- /dev/null +++ b/src/views/home-env-monitor/components/right-one-model.vue @@ -0,0 +1,28 @@ + + + + + + + + + + + + diff --git a/src/views/home-env-monitor/components/right-two-model.vue b/src/views/home-env-monitor/components/right-two-model.vue new file mode 100644 index 0000000..a017b49 --- /dev/null +++ b/src/views/home-env-monitor/components/right-two-model.vue @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + diff --git a/src/views/home-env-monitor/index.vue b/src/views/home-env-monitor/index.vue index f4130bd..445b79b 100644 --- a/src/views/home-env-monitor/index.vue +++ b/src/views/home-env-monitor/index.vue @@ -1,20 +1,59 @@ - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/home/index.vue b/src/views/home/index.vue index e1c142b..aa48211 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -377,6 +377,8 @@ export default { center center; background-size: cover; position: relative; + + z-index: 99; // background-position: center; .nav-box { @@ -389,6 +391,15 @@ export default { display: flex; align-items: center; cursor: pointer; + transition: transform 0.5s ease-in-out !important; /* 柔和缓慢的过渡效果 */ + transform-origin: center !important; /* 从中心点开始缩放 */ + } + + .nav-item:hover { + transform: scale( + 1.05 + ) !important; /* 放大5%,可以根据需要调整 */ + box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1) !important; /* 可选:添加阴影增强立体感 */ } .nav-icon { @@ -430,6 +441,22 @@ export default { } } + .left-nav::before { + content: ''; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: rgba(0, 0, 0, 0.5); + transition: background-color 0.3s ease; /* 悬停动画 */ + } + + /* 鼠标悬停时加深遮罩 */ + .left-nav:hover::before { + background-color: rgba(0, 0, 0, 0.5); + } + .floating-box { position: absolute; top: 50%;