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/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 0dee11e..99fcc5a 100644 --- a/src/router.js +++ b/src/router.js @@ -24,5 +24,10 @@ export default new Router({ name: 'index', component: () => import ('./view/index.vue') }, + { + path: '/smartPage', + name: 'smartPage', + component: () => import ('./view/smartPage.vue') + }, ] }) diff --git a/src/view/index.vue b/src/view/index.vue index 94964d5..a7bc825 100644 --- a/src/view/index.vue +++ b/src/view/index.vue @@ -21,8 +21,8 @@
- - + +
@@ -204,14 +204,17 @@
- -
-
+ +
+
+ +
+
@@ -370,7 +373,7 @@ export default { num: '在线' } ], - menu:[ + menu: [ { icon: require("@/assets/images/zongti.png") }, @@ -393,23 +396,23 @@ export default { this.handelBtn(0) }, methods: { - //菜单切换 - handelBtn(index){ + //菜单切换 + handelBtn(index) { this.menuAc = index - if (index == 0) { + if (index == 0) { this.menu[0].icon = require("@/assets/images/zongtiAc.png") this.menu[1].icon = require("@/assets/images/zhihui.png") this.menu[2].icon = require("@/assets/images/shebei.png") - }else if (index == 1) { + } else if (index == 1) { this.menu[0].icon = require("@/assets/images/zongti.png") this.menu[1].icon = require("@/assets/images/zhihuiAc.png") this.menu[2].icon = require("@/assets/images/shebei.png") - }else if (index == 2) { + } else if (index == 2) { this.menu[0].icon = require("@/assets/images/zongti.png") this.menu[1].icon = require("@/assets/images/zhihui.png") this.menu[2].icon = require("@/assets/images/shebeiAc.png") } - + }, drawHallChart() { let myChart = this.$echarts.getInstanceByDom(this.$refs.hallChart); @@ -1605,46 +1608,50 @@ export default { .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; + } } /* 内容板块背景 */ @@ -1683,17 +1690,20 @@ 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%; @@ -2221,11 +2231,13 @@ export default { margin-top: 7px; color: #4bbfde } - .item-value3{ + + .item-value3 { color: #ebad22; } - .item-value4{ - color:#2c6e43 + + .item-value4 { + color: #2c6e43 } } 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