diff --git a/package.json b/package.json index be218cf..529f902 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "@amap/amap-jsapi-loader": "^1.0.1", "axios": "^1.3.5", "echarts": "^5.4.2", - "element-plus": "^2.3.2", + "element-plus": "^2.3.7", "gsap": "^3.11.5", "swiper": "^9.2.0", "three": "^0.151.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 352f7f1..1311c6e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,7 +7,7 @@ specifiers: axios: ^1.3.5 black-knight: 1.3.30 echarts: ^5.4.2 - element-plus: ^2.3.2 + element-plus: ^2.3.7 gsap: ^3.11.5 less: ^4.1.3 less-loader: ~7.3.0 @@ -26,7 +26,7 @@ dependencies: '@amap/amap-jsapi-loader': 1.0.1 axios: 1.3.5 echarts: 5.4.2 - element-plus: 2.3.2_vue@3.2.47 + element-plus: registry.npmmirror.com/element-plus/2.3.7_vue@3.2.47 gsap: 3.11.5 swiper: 9.2.0 three: 0.151.3 @@ -760,31 +760,6 @@ packages: resolution: {integrity: sha512-uxMa/Dt7PQsLBVXwH+t6JvpHJnrsYBaxWKi/J6HE+/nBtoHENhwBoNkgkm226/Kfxeg0z1eMQLBRPPKcDH8xWA==} dev: true - /element-plus/2.3.2_vue@3.2.47: - resolution: {integrity: sha512-NIK0QckKKagdlMm3eLoVoD4Lkfj5ECzpZAxwrRLdm1Yi5qiTU9Guor33+IbIa52z4gHMuhMxgSVS2xAGmjLHsw==} - peerDependencies: - vue: ^3.2.0 - dependencies: - '@ctrl/tinycolor': 3.4.1 - '@element-plus/icons-vue': 2.0.6_vue@3.2.47 - '@floating-ui/dom': 1.0.10 - '@popperjs/core': registry.npmmirror.com/@sxzz/popperjs-es/2.11.7 - '@types/lodash': 4.14.182 - '@types/lodash-es': 4.17.6 - '@vueuse/core': 9.6.0_vue@3.2.47 - async-validator: 4.2.5 - dayjs: 1.11.4 - escape-html: 1.0.3 - lodash: 4.17.21 - lodash-es: 4.17.21 - lodash-unified: 1.0.2_3ib2ivapxullxkx3xftsimdk7u - memoize-one: 6.0.0 - normalize-wheel-es: 1.2.0 - vue: 3.2.47 - transitivePeerDependencies: - - '@vue/composition-api' - dev: false - /emojis-list/3.0.0: resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==} engines: {node: '>= 4'} @@ -998,11 +973,11 @@ packages: tslib: 2.4.0 optionalDependencies: errno: registry.npmmirror.com/errno/0.1.8 - graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10 + graceful-fs: registry.npmmirror.com/graceful-fs/4.2.11 image-size: registry.npmmirror.com/image-size/0.5.5 make-dir: registry.npmmirror.com/make-dir/2.1.0 mime: registry.npmmirror.com/mime/1.6.0 - needle: registry.npmmirror.com/needle/3.1.0 + needle: registry.npmmirror.com/needle/3.2.0 source-map: registry.npmmirror.com/source-map/0.6.1 transitivePeerDependencies: - supports-color @@ -1409,7 +1384,7 @@ packages: dependencies: '@jridgewell/set-array': registry.npmmirror.com/@jridgewell/set-array/1.1.2 '@jridgewell/sourcemap-codec': registry.npmmirror.com/@jridgewell/sourcemap-codec/1.4.14 - '@jridgewell/trace-mapping': registry.npmmirror.com/@jridgewell/trace-mapping/0.3.14 + '@jridgewell/trace-mapping': registry.npmmirror.com/@jridgewell/trace-mapping/0.3.18 dev: true registry.npmmirror.com/@jridgewell/resolve-uri/3.1.0: @@ -1441,15 +1416,6 @@ packages: version: 1.4.14 dev: true - registry.npmmirror.com/@jridgewell/trace-mapping/0.3.14: - resolution: {integrity: sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz} - name: '@jridgewell/trace-mapping' - version: 0.3.14 - dependencies: - '@jridgewell/resolve-uri': registry.npmmirror.com/@jridgewell/resolve-uri/3.1.0 - '@jridgewell/sourcemap-codec': registry.npmmirror.com/@jridgewell/sourcemap-codec/1.4.14 - dev: true - registry.npmmirror.com/@jridgewell/trace-mapping/0.3.18: resolution: {integrity: sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz} name: '@jridgewell/trace-mapping' @@ -1740,13 +1706,41 @@ packages: version: 1.4.196 dev: true + registry.npmmirror.com/element-plus/2.3.7_vue@3.2.47: + resolution: {integrity: sha512-h6TxclbaLUJxg/Bv5j/ZKsK+K5yadQliw5+R30HWyE69pXlqXTX24oYx+yw3pA4Dy+lqEDi5501FQ0CORk3OSA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/element-plus/-/element-plus-2.3.7.tgz} + id: registry.npmmirror.com/element-plus/2.3.7 + name: element-plus + version: 2.3.7 + peerDependencies: + vue: ^3.2.0 + dependencies: + '@ctrl/tinycolor': 3.4.1 + '@element-plus/icons-vue': 2.0.6_vue@3.2.47 + '@floating-ui/dom': 1.0.10 + '@popperjs/core': registry.npmmirror.com/@sxzz/popperjs-es/2.11.7 + '@types/lodash': 4.14.182 + '@types/lodash-es': 4.17.6 + '@vueuse/core': 9.6.0_vue@3.2.47 + async-validator: 4.2.5 + dayjs: 1.11.4 + escape-html: 1.0.3 + lodash: 4.17.21 + lodash-es: 4.17.21 + lodash-unified: 1.0.2_3ib2ivapxullxkx3xftsimdk7u + memoize-one: 6.0.0 + normalize-wheel-es: 1.2.0 + vue: 3.2.47 + transitivePeerDependencies: + - '@vue/composition-api' + dev: false + registry.npmmirror.com/enhanced-resolve/5.15.0: resolution: {integrity: sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz} name: enhanced-resolve version: 5.15.0 engines: {node: '>=10.13.0'} dependencies: - graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10 + graceful-fs: registry.npmmirror.com/graceful-fs/4.2.11 tapable: registry.npmmirror.com/tapable/2.2.1 dev: true @@ -2062,10 +2056,10 @@ packages: version: 0.4.1 dev: true - registry.npmmirror.com/graceful-fs/4.2.10: - resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.10.tgz} + registry.npmmirror.com/graceful-fs/4.2.11: + resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz} name: graceful-fs - version: 4.2.10 + version: 4.2.11 requiresBuild: true dev: true @@ -2160,10 +2154,10 @@ packages: dev: true optional: true - registry.npmmirror.com/needle/3.1.0: - resolution: {integrity: sha512-gCE9weDhjVGCRqS8dwDR/D3GTAeyXLXuqp7I8EzH6DllZGXSUyxuqqLh+YX9rMAWaaTFyVAg6rHGL25dqvczKw==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/needle/-/needle-3.1.0.tgz} + registry.npmmirror.com/needle/3.2.0: + resolution: {integrity: sha512-oUvzXnyLiVyVGoianLijF9O/RecZUf7TkBfimjGrLM4eQhXyeJwM6GeAWccwfQ9aa4gMCZKqhAOuLaMIcQxajQ==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/needle/-/needle-3.2.0.tgz} name: needle - version: 3.1.0 + version: 3.2.0 engines: {node: '>= 4.4.x'} hasBin: true requiresBuild: true @@ -2248,6 +2242,7 @@ packages: name: source-map version: 0.6.1 engines: {node: '>=0.10.0'} + requiresBuild: true dev: true registry.npmmirror.com/supports-color/8.1.1: @@ -2335,7 +2330,7 @@ packages: engines: {node: '>=10.13.0'} dependencies: glob-to-regexp: registry.npmmirror.com/glob-to-regexp/0.4.1 - graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10 + graceful-fs: registry.npmmirror.com/graceful-fs/4.2.11 dev: true registry.npmmirror.com/webpack-sources/3.2.3: @@ -2371,7 +2366,7 @@ packages: eslint-scope: registry.npmmirror.com/eslint-scope/5.1.1 events: registry.npmmirror.com/events/3.3.0 glob-to-regexp: registry.npmmirror.com/glob-to-regexp/0.4.1 - graceful-fs: registry.npmmirror.com/graceful-fs/4.2.10 + graceful-fs: registry.npmmirror.com/graceful-fs/4.2.11 json-parse-even-better-errors: registry.npmmirror.com/json-parse-even-better-errors/2.3.1 loader-runner: registry.npmmirror.com/loader-runner/4.3.0 mime-types: registry.npmmirror.com/mime-types/2.1.35 diff --git a/src/assets/img/bg.png b/src/assets/img/bg.png index 1e0ddca..17c0b4a 100644 Binary files a/src/assets/img/bg.png and b/src/assets/img/bg.png differ diff --git a/src/assets/img/down_bg.png b/src/assets/img/down_bg.png new file mode 100644 index 0000000..4be87d1 Binary files /dev/null and b/src/assets/img/down_bg.png differ diff --git a/src/assets/img/icon.png b/src/assets/img/icon.png new file mode 100644 index 0000000..d1ac3f3 Binary files /dev/null and b/src/assets/img/icon.png differ diff --git a/src/assets/img/info_bg.png b/src/assets/img/info_bg.png new file mode 100644 index 0000000..0fc30b5 Binary files /dev/null and b/src/assets/img/info_bg.png differ diff --git a/src/assets/img/result.png b/src/assets/img/result.png new file mode 100644 index 0000000..81012b8 Binary files /dev/null and b/src/assets/img/result.png differ diff --git a/src/assets/img/up_bg.png b/src/assets/img/up_bg.png new file mode 100644 index 0000000..f315bf5 Binary files /dev/null and b/src/assets/img/up_bg.png differ diff --git a/src/assets/style/index.less b/src/assets/style/index.less index 5aff62a..618c79f 100644 --- a/src/assets/style/index.less +++ b/src/assets/style/index.less @@ -67,7 +67,7 @@ input{ font-size:18px; height:40px!important; - width:60px; + width:var(--w, 66px); font-weight: bold!important; &::-webkit-input-placeholder{ color:#fff; @@ -127,6 +127,7 @@ --el-text-color-regular:#999; --el-color-primary:#179795; .el-date-range-picker{ + --el-datepicker-icon-color:#03FAF6; --el-datepicker-off-text-color:#999!important; --el-datepicker-inrange-bg-color:#19a7a4; --el-datepicker-active-color:#03FAF6; @@ -159,4 +160,10 @@ 100%{ transform: rotate(360deg); } +} + +.over{ + overflow: hidden; + text-overflow: ellipsis; + word-break: break-all; } \ No newline at end of file diff --git a/src/config/request.js b/src/config/request.js index 9f199ef..c052127 100644 --- a/src/config/request.js +++ b/src/config/request.js @@ -1,10 +1,11 @@ import axios from 'axios' import store from "@/store" -export const host=function(host="default", suffix='plant_manage'){ +export const host=function(host="default", suffix='Time'){ var url=process.env.NODE_ENV === 'development'?{ // default:`http://i5skii.natappfree.cc` - default:"http://127.0.0.1:7000" + // default:"http://127.0.0.1:7000" + default:"http://218.206.53.232:10927" }:{ default:`` } @@ -27,7 +28,7 @@ service.interceptors.request.use( config => { if(config.proxy){ config.baseURL=`/${config.proxy}` }else{ - config.baseURL=host(config.host) + config.baseURL=host(config.host,config.suffix) } if (typeof config.pathData === 'object') { diff --git a/src/view/home.vue b/src/view/home.vue index f56abb6..b895f0c 100644 --- a/src/view/home.vue +++ b/src/view/home.vue @@ -3,21 +3,12 @@ .content{ height:100%; position:relative; - &>.search{ - position:absolute; - top:100px; - left:40px; - display:flex; - align-items: center; - &>div{ - margin-right:20px; - } - } + &>.time{ position:absolute; display:flex; align-items: center; - top:50%; + top:calc(50% + 24px); left:40px; &:before{ content:""; @@ -33,6 +24,88 @@ transform: translateX(-5px); } } + &>.info{ + position:absolute; + top:240px; + left:40px; + width:276px; + height:213px; + background-image:url(@/assets/img/info_bg.png); + background-size:100% 100%; + .title{ + font-size:16px; + font-weight: bold; + color:#fff; + text-align: center; + padding-bottom:5px; + margin-top:20px; + background-image:linear-gradient(#067276,#067276); + background-repeat: no-repeat; + background-size:90px 12px; + background-position:center 10px; + } + &>.dv-scroll-board{ + height: 97px; + margin-top: 10px; + &:deep .ceil:first-child{ + color:#03FAF6; + } + } + } + &>.result{ + height:244px; + width:383px; + position:absolute; + bottom: 122px; + right: 42px; + background-image:url(@/assets/img/result.png); + .title{ + font-size:16px; + font-weight: bold; + color:#fff; + text-align: center; + padding-bottom:5px; + margin-top:40px; + background-image:linear-gradient(#067276,#067276); + background-repeat: no-repeat; + background-size:90px 12px; + background-position:center 10px; + } + span{ + position:absolute; + width: 155px; + height: 92px; + display:flex; + flex-direction: column; + justify-content: space-between; + padding:20px; + color:#fff; + font-weight: bold; + text-shadow: 0 0 5px #fff; + &:before{ + content:attr(data-title); + color:#03FAF6; + font-size:16px; + font-weight: normal; + text-shadow: none; + } + &.amount{ + top:98px; + left:28px; + } + &.num{ + top:98px; + left:203px; + } + } + } + &>.echarts{ + position:absolute; + top: 216px; + left: 125px; + width: 1650px; + height: 757px; + } } } @@ -40,19 +113,18 @@ @@ -60,15 +132,253 @@ \ No newline at end of file diff --git a/src/view/search.vue b/src/view/search.vue new file mode 100644 index 0000000..2489f15 --- /dev/null +++ b/src/view/search.vue @@ -0,0 +1,194 @@ + + + \ No newline at end of file