diff --git a/package-lock.json b/package-lock.json index cabf19f..294fbc2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1122,7 +1122,6 @@ "version": "7.20.1", "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.20.1.tgz", "integrity": "sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==", - "dev": true, "requires": { "regenerator-runtime": "^0.13.10" } @@ -1182,6 +1181,56 @@ "@hapi/hoek": "^9.0.0" } }, + "@jiaminghi/bezier-curve": { + "version": "0.0.9", + "resolved": "https://registry.npmmirror.com/@jiaminghi/bezier-curve/-/bezier-curve-0.0.9.tgz", + "integrity": "sha512-u9xJPOEl6Dri2E9FfmJoGxYQY7vYJkURNX04Vj64tdi535tPrpkuf9Sm0lNr3QTKdHQh0DdNRsaa62FLQNQEEw==", + "requires": { + "@babel/runtime": "^7.5.5" + } + }, + "@jiaminghi/c-render": { + "version": "0.4.3", + "resolved": "https://registry.npmmirror.com/@jiaminghi/c-render/-/c-render-0.4.3.tgz", + "integrity": "sha512-FJfzj5hGj7MLqqqI2D7vEzHKbQ1Ynnn7PJKgzsjXaZpJzTqs2Yw5OSeZnm6l7Qj7jyPAP53lFvEQNH4o4j6s+Q==", + "requires": { + "@babel/runtime": "^7.5.5", + "@jiaminghi/bezier-curve": "*", + "@jiaminghi/color": "*", + "@jiaminghi/transition": "*" + } + }, + "@jiaminghi/charts": { + "version": "0.2.18", + "resolved": "https://registry.npmmirror.com/@jiaminghi/charts/-/charts-0.2.18.tgz", + "integrity": "sha512-K+HXaOOeWG9OOY1VG6M4mBreeeIAPhb9X+khG651AbnwEwL6G2UtcAQ8GWCq6GzhczcLwwhIhuaHqRygwHC0sA==", + "requires": { + "@babel/runtime": "^7.5.5", + "@jiaminghi/c-render": "^0.4.3" + } + }, + "@jiaminghi/color": { + "version": "1.1.3", + "resolved": "https://registry.npmmirror.com/@jiaminghi/color/-/color-1.1.3.tgz", + "integrity": "sha512-ZY3hdorgODk4OSTbxyXBPxAxHPIVf9rPlKJyK1C1db46a50J0reFKpAvfZG8zMG3lvM60IR7Qawgcu4ZDO3+Hg==" + }, + "@jiaminghi/data-view": { + "version": "2.10.0", + "resolved": "https://registry.npmmirror.com/@jiaminghi/data-view/-/data-view-2.10.0.tgz", + "integrity": "sha512-Cud2MTiMcqc5k2KWabR/svuVQmXHANqURo+yj40370/LdI/gyUJ6LG203hWXEnT1nMCeiv/SLVmxv3PXLScCeA==", + "requires": { + "@babel/runtime": "^7.5.5", + "@jiaminghi/charts": "*" + } + }, + "@jiaminghi/transition": { + "version": "1.1.11", + "resolved": "https://registry.npmmirror.com/@jiaminghi/transition/-/transition-1.1.11.tgz", + "integrity": "sha512-owBggipoHMikDHHDW5Gc7RZYlVuvxHADiU4bxfjBVkHDAmmck+fCkm46n2JzC3j33hWvP9nSCAeh37t6stgWeg==", + "requires": { + "@babel/runtime": "^7.5.5" + } + }, "@jridgewell/gen-mapping": { "version": "0.1.1", "resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", @@ -6226,8 +6275,7 @@ "regenerator-runtime": { "version": "0.13.10", "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz", - "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw==", - "dev": true + "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw==" }, "regenerator-transform": { "version": "0.15.0", diff --git a/package.json b/package.json index 06ffd47..9a4b14b 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "lint": "vue-cli-service lint" }, "dependencies": { + "@jiaminghi/data-view": "^2.10.0", "axios": "^1.1.3", "core-js": "^3.8.3", "echarts": "^5.4.0", diff --git a/src/App.vue b/src/App.vue index 692cb78..2e43dc5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -48,6 +48,7 @@ export default { -moz-osx-font-smoothing: grayscale; /* text-align: center; */ background: #040f26; + overflow: hidden; } body{ margin: 0; diff --git a/src/assets/images/itemBtn.png b/src/assets/images/itemBtn.png new file mode 100644 index 0000000..9fa2045 Binary files /dev/null and b/src/assets/images/itemBtn.png differ diff --git a/src/assets/images/itemImg.png b/src/assets/images/itemImg.png new file mode 100644 index 0000000..71aa262 Binary files /dev/null and b/src/assets/images/itemImg.png differ diff --git a/src/assets/images/notice-item.png b/src/assets/images/notice-item.png new file mode 100644 index 0000000..7887f77 Binary files /dev/null and b/src/assets/images/notice-item.png differ diff --git a/src/assets/images/stratHead.png b/src/assets/images/stratHead.png new file mode 100644 index 0000000..9972ddf Binary files /dev/null and b/src/assets/images/stratHead.png differ diff --git a/src/main.js b/src/main.js index 96cf72a..c164039 100644 --- a/src/main.js +++ b/src/main.js @@ -5,6 +5,9 @@ import '../src/assets/font/font.less' import ElementUI from 'element-ui' import 'element-ui/lib/theme-chalk/index.css' Vue.use(ElementUI) +import dataV from '@jiaminghi/data-view' + +Vue.use(dataV) // import Plugin from 'v-fit-cdcolumns'; // Vue.use(Plugin); import * as echarts from 'echarts' diff --git a/src/router.js b/src/router.js index 0d3e64a..0cc80d0 100644 --- a/src/router.js +++ b/src/router.js @@ -29,5 +29,10 @@ export default new Router({ name: 'equipmentAssets', component: () => import ('./view/equipmentAssets.vue') }, + { + path: '/smartPage', + name: 'smartPage', + component: () => import ('./view/smartPage.vue') + } ] }) diff --git a/src/view/equipmentAssets.vue b/src/view/equipmentAssets.vue index 7a05aaa..ad3523c 100644 --- a/src/view/equipmentAssets.vue +++ b/src/view/equipmentAssets.vue @@ -333,7 +333,9 @@ export default { }; }, mounted() { + window.setTimeout(()=>{ this.menuHandelShow() + },3400) }, methods: { handelBtn(index) { diff --git a/src/view/index.vue b/src/view/index.vue index e61061e..e80aafb 100644 --- a/src/view/index.vue +++ b/src/view/index.vue @@ -1,7 +1,8 @@ @@ -1597,56 +1623,61 @@ export default { position: relative; display: flex; justify-content: space-around; + z-index: 100; } .left-content, .right-content { position: absolute; - width: 20.6%; - top: 0; - height: 100%; + width: 20.6%; + top: 0; + height: 100%; } .middle-content { position: absolute; - width: calc(100% - 41.2%); - top: 0; - height: 100%; - position: relative; + width: calc(100% - 41.2%); + top: 0; + height: 100%; + position: relative; + display: flex; + justify-content: center; + + .middleBottom { + width: 52%; + height: 10%; display: flex; - justify-content: center; - .middleBottom{ - width: 52%; - height: 10%; - display: flex; - align-items: center; - justify-content: space-evenly; - position: absolute; - bottom: -26px; - z-index: 999; - .menuBtn{ - width:142px; - height:52px - } - .menuBtn1{ - width:188px; - height:74px - } + align-items: center; + justify-content: space-evenly; + position: absolute; + bottom: -26px; + z-index: 999; + + .menuBtn { + width: 142px; + height: 52px; } - .middleBottomIcon{ - z-index: 100; - width: 1115px; - height: 57px; - background: url('../assets/images/menubottom.png') no-repeat; - background-size: 100% 100%; - position: absolute; - bottom: -37px; + + .menuBtn1 { + width: 188px; + height: 74px; } + } + + .middleBottomIcon { + z-index: 100; + width: 1115px; + height: 57px; + background: url("../assets/images/menubottom.png") no-repeat; + background-size: 100% 100%; + position: absolute; + bottom: -37px; + } } /* 内容板块背景 */ -.left-content>div, -.right-content>div { +.left-content > div, +.right-content > div { background-image: url(../assets/images/border.png); background-size: 100% 100%; margin-bottom: 5px; @@ -1680,17 +1711,19 @@ export default { width: 102px; height: 16px; display: inline-block; - } - .span0{ + + .span0 { background-image: url(../assets/images/select-font.png); background-size: 100% 100%; } - .span1{ + + .span1 { background-image: url(../assets/images/default-font.png); background-size: 100% 100%; margin-left: 6px; } + .hall-icon span { background-size: 100% 100%; @@ -1709,10 +1742,7 @@ export default { height: 16px; margin-left: 7px; } - - } - } .chart-title { @@ -1738,10 +1768,13 @@ export default { z-index: 10; bottom: 0; color: rgb(163, 227, 245); - -webkit-mask: linear-gradient(to top, rgba(163, 227, 245, 0.7), transparent); + -webkit-mask: linear-gradient( + to top, + rgba(163, 227, 245, 0.7), + transparent + ); } - .hall-box .item { width: 48.5%; height: 100%; @@ -1759,7 +1792,7 @@ export default { .hall-time1, .hall-time0 { - font-family: 'maleGod'; + font-family: "maleGod"; font-size: 25px; text-align: center; position: absolute; @@ -1778,8 +1811,8 @@ export default { } /* 标题的样式 */ -.left-content>div>.title, -.right-content>div>.title { +.left-content > div > .title, +.right-content > div > .title { width: 100%; background-image: url(../assets/images/border-title.png); height: 30px; @@ -1788,7 +1821,7 @@ export default { padding-left: 8%; box-sizing: border-box; color: #fff; - font-family: 'maleGod'; + font-family: "maleGod"; align-items: center; letter-spacing: 1px; margin-bottom: 10px; @@ -1804,7 +1837,6 @@ export default { .left-content .business-hall { height: 38.2%; - } .left-content .passenger-flow { @@ -1843,12 +1875,8 @@ export default { font-size: 25px; color: #4bbfde; } - - } - - .flow-right { width: 56%; height: 100%; @@ -1911,8 +1939,6 @@ export default { display: flex; justify-content: center; align-items: center; - - } .flow-item span:nth-child(2) { @@ -1920,7 +1946,6 @@ export default { color: #c0c0c4; } } - } } @@ -1935,11 +1960,11 @@ export default { width: 33%; .img2 { - background-image: url(../assets/images/people-icon.png) + background-image: url(../assets/images/people-icon.png); } .img1 { - background-image: url(../assets/images/paizi.png) + background-image: url(../assets/images/paizi.png); } // display: flex; @@ -1957,20 +1982,18 @@ export default { } .stat-num { - font-family: 'maleGod'; + font-family: "maleGod"; color: #4bbfde !important; font-size: 20px; - } } - } } -@media screen and (min-height:980px) { +@media screen and (min-height: 980px) { .stat-num { font-size: 20px; - font-family: 'maleGod'; + font-family: "maleGod"; // display: inline-block; margin: 4px; position: relative; @@ -1978,7 +2001,6 @@ export default { } } - .right-content .payment { height: 38.3%; @@ -2216,13 +2238,15 @@ export default { font-size: 25px; font-family: maleGod; margin-top: 7px; - color: #4bbfde + color: #4bbfde; } - .item-value3{ + + .item-value3 { color: #ebad22; } - .item-value4{ - color:#2c6e43 + + .item-value4 { + color: #2c6e43; } } @@ -2246,4 +2270,49 @@ export default { background-image: url(../assets/images/content-icon5.png); } } +//left动画 +@keyframes donghua1 { + from { + transform: translateX(0%); + } + + to { + transform: translateX(-100%); + } +} +.left-leave, +.left-leave-active, +.left-leave-to { + animation: donghua1 1s linear; +} + +.left-enter, +.left-enter-active, +.left-enter-to { + animation: donghua1 1s linear reverse; +} +//right动画 +@keyframes donghua2 { + from { + transform: translateX(0%); + } + + to { + transform: translateX(100%); + } +} +.right-leave, +.right-leave-active, +.right-leave-to { + animation: donghua2 1s linear; +} + +.right-enter, +.right-enter-active, +.right-enter-to { + animation: donghua2 1s linear reverse; +} +.equimentAssets { + position: absolute; +} \ No newline at end of file diff --git a/src/view/smartPage.vue b/src/view/smartPage.vue new file mode 100644 index 0000000..3e2d9da --- /dev/null +++ b/src/view/smartPage.vue @@ -0,0 +1,352 @@ + + + \ No newline at end of file