diff --git a/package-lock.json b/package-lock.json index e5faf7d..a8e65a1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,10 @@ "version": "0.0.0", "dependencies": { "echarts": "^5.4.3", + "echarts-gl": "^2.0.9", "stylus": "^0.61.0", - "vue": "^3.3.8" + "vue": "^3.3.8", + "vue3-seamless-scroll": "^2.0.1" }, "devDependencies": { "@vitejs/plugin-vue": "^4.5.0", @@ -675,6 +677,11 @@ "concat-map": "0.0.1" } }, + "node_modules/claygl": { + "version": "1.3.0", + "resolved": "https://registry.npmmirror.com/claygl/-/claygl-1.3.0.tgz", + "integrity": "sha512-+gGtJjT6SSHD2l2yC3MCubW/sCV40tZuSs5opdtn79vFSGUgp/lH139RNEQ6Jy078/L0aV8odCw8RSrUcMfLaQ==" + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -710,6 +717,18 @@ "zrender": "5.4.4" } }, + "node_modules/echarts-gl": { + "version": "2.0.9", + "resolved": "https://registry.npmmirror.com/echarts-gl/-/echarts-gl-2.0.9.tgz", + "integrity": "sha512-oKeMdkkkpJGWOzjgZUsF41DOh6cMsyrGGXimbjK2l6Xeq/dBQu4ShG2w2Dzrs/1bD27b2pLTGSaUzouY191gzA==", + "dependencies": { + "claygl": "^1.2.1", + "zrender": "^5.1.1" + }, + "peerDependencies": { + "echarts": "^5.1.2" + } + }, "node_modules/esbuild": { "version": "0.19.5", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.5.tgz", @@ -966,6 +985,14 @@ "url": "https://opencollective.com/stylus" } }, + "node_modules/throttle-debounce": { + "version": "5.0.0", + "resolved": "https://registry.npmmirror.com/throttle-debounce/-/throttle-debounce-5.0.0.tgz", + "integrity": "sha512-2iQTSgkkc1Zyk0MeVrt/3BvuOXYPl/R8Z0U2xxo9rjwNciaHDG3R+Lm6dh4EeUci49DanvBnuqI6jshoQQRGEg==", + "engines": { + "node": ">=12.22" + } + }, "node_modules/tslib": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", @@ -1046,6 +1073,14 @@ } } }, + "node_modules/vue3-seamless-scroll": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/vue3-seamless-scroll/-/vue3-seamless-scroll-2.0.1.tgz", + "integrity": "sha512-mI3BaDU3pjcPUhVSw3/xNKdfPBDABTi/OdZaZqKysx4cSdNfGRbVvGNDzzptBbJ5S7imv5T55l6x/SqgnxKreg==", + "dependencies": { + "throttle-debounce": "5.0.0" + } + }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -1434,6 +1469,11 @@ "concat-map": "0.0.1" } }, + "claygl": { + "version": "1.3.0", + "resolved": "https://registry.npmmirror.com/claygl/-/claygl-1.3.0.tgz", + "integrity": "sha512-+gGtJjT6SSHD2l2yC3MCubW/sCV40tZuSs5opdtn79vFSGUgp/lH139RNEQ6Jy078/L0aV8odCw8RSrUcMfLaQ==" + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -1461,6 +1501,15 @@ "zrender": "5.4.4" } }, + "echarts-gl": { + "version": "2.0.9", + "resolved": "https://registry.npmmirror.com/echarts-gl/-/echarts-gl-2.0.9.tgz", + "integrity": "sha512-oKeMdkkkpJGWOzjgZUsF41DOh6cMsyrGGXimbjK2l6Xeq/dBQu4ShG2w2Dzrs/1bD27b2pLTGSaUzouY191gzA==", + "requires": { + "claygl": "^1.2.1", + "zrender": "^5.1.1" + } + }, "esbuild": { "version": "0.19.5", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.5.tgz", @@ -1637,6 +1686,11 @@ "source-map": "^0.7.3" } }, + "throttle-debounce": { + "version": "5.0.0", + "resolved": "https://registry.npmmirror.com/throttle-debounce/-/throttle-debounce-5.0.0.tgz", + "integrity": "sha512-2iQTSgkkc1Zyk0MeVrt/3BvuOXYPl/R8Z0U2xxo9rjwNciaHDG3R+Lm6dh4EeUci49DanvBnuqI6jshoQQRGEg==" + }, "tslib": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", @@ -1666,6 +1720,14 @@ "@vue/shared": "3.3.8" } }, + "vue3-seamless-scroll": { + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/vue3-seamless-scroll/-/vue3-seamless-scroll-2.0.1.tgz", + "integrity": "sha512-mI3BaDU3pjcPUhVSw3/xNKdfPBDABTi/OdZaZqKysx4cSdNfGRbVvGNDzzptBbJ5S7imv5T55l6x/SqgnxKreg==", + "requires": { + "throttle-debounce": "5.0.0" + } + }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", diff --git a/package.json b/package.json index f043fe6..8cdc21f 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,10 @@ }, "dependencies": { "echarts": "^5.4.3", + "echarts-gl": "^2.0.9", "stylus": "^0.61.0", - "vue": "^3.3.8" + "vue": "^3.3.8", + "vue3-seamless-scroll": "^2.0.1" }, "devDependencies": { "@vitejs/plugin-vue": "^4.5.0", diff --git a/public/assets/imgs/card/bg8.png b/public/assets/imgs/card/bg8.png index 0ab6e78..435f16f 100644 Binary files a/public/assets/imgs/card/bg8.png and b/public/assets/imgs/card/bg8.png differ diff --git a/public/assets/imgs/icon/mxl.png b/public/assets/imgs/icon/mxl.png new file mode 100644 index 0000000..9286a91 Binary files /dev/null and b/public/assets/imgs/icon/mxl.png differ diff --git a/public/assets/imgs/icon/wsq.png b/public/assets/imgs/icon/wsq.png new file mode 100644 index 0000000..8f9af9a Binary files /dev/null and b/public/assets/imgs/icon/wsq.png differ diff --git a/public/assets/imgs/icon/xtl.png b/public/assets/imgs/icon/xtl.png new file mode 100644 index 0000000..1aa20cf Binary files /dev/null and b/public/assets/imgs/icon/xtl.png differ diff --git a/public/assets/imgs/icon/资源 14@3x-998地图上图标.png b/public/assets/imgs/icon/资源 14@3x-998地图上图标.png new file mode 100644 index 0000000..dde4a1b Binary files /dev/null and b/public/assets/imgs/icon/资源 14@3x-998地图上图标.png differ diff --git a/public/assets/imgs/title-bg.png b/public/assets/imgs/title-bg.png new file mode 100644 index 0000000..7ea72dc Binary files /dev/null and b/public/assets/imgs/title-bg.png differ diff --git a/src/App.vue b/src/App.vue index 4d82be1..afb6b9a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -12,35 +12,11 @@ - - + + \ No newline at end of file diff --git a/src/components/scroll/ScrollPanel.vue b/src/components/scroll/ScrollPanel.vue new file mode 100644 index 0000000..1f72ae9 --- /dev/null +++ b/src/components/scroll/ScrollPanel.vue @@ -0,0 +1,110 @@ + + + + + \ No newline at end of file diff --git a/src/components/table/ScrollTable.vue b/src/components/table/ScrollTable.vue deleted file mode 100644 index e69de29..0000000 diff --git a/src/module/ModuleBottom.vue b/src/module/ModuleBottom.vue index df3ff2c..a5b3323 100644 --- a/src/module/ModuleBottom.vue +++ b/src/module/ModuleBottom.vue @@ -34,7 +34,7 @@ import CircleWave from '../components/circle/CircleWave.vue'; display flex background-image url(assets/imgs/card/bg9.png) .left - width 350px + width 550px height 200px position relative .circle-container diff --git a/src/module/ModuleCenter.vue b/src/module/ModuleCenter.vue index 72b5d49..5718dee 100644 --- a/src/module/ModuleCenter.vue +++ b/src/module/ModuleCenter.vue @@ -1,12 +1,15 @@ 1 @@ -20,7 +23,6 @@ import CardTwoCount from '../components/card/CardTwoCount.vue'; .module-center width 800px height 600px - border 1px solid #ccc background-image url(assets/imgs/center-map-bg.png) background-size 100% 400px background-repeat no-repeat @@ -29,6 +31,32 @@ import CardTwoCount from '../components/card/CardTwoCount.vue'; position absolute top 0 left 0 + .stree-icon + position absolute + top 0 + left 0 + width 25px + #totalCount + top 280px + left 300px + #xtlIcon + top 30px + left 300px + #xtlCount + top 20px + left 330px + #mxlIcon + top 140px + left 60px + #mxlCount + top 180px + left 10px + #wsqIcon + top 220px + left 560px + #wsqCount + top 220px + left 600px #manPercent top 400px left 210px @@ -40,4 +68,5 @@ import CardTwoCount from '../components/card/CardTwoCount.vue'; top 400px left 320px transform scale(0.8) + \ No newline at end of file diff --git a/src/module/ModuleLeft1.vue b/src/module/ModuleLeft1.vue index 70f294e..f47b7c8 100644 --- a/src/module/ModuleLeft1.vue +++ b/src/module/ModuleLeft1.vue @@ -20,5 +20,7 @@ const barChart = reactive({ \ No newline at end of file diff --git a/src/module/ModuleLeft3.vue b/src/module/ModuleLeft3.vue index e0369df..6955ce8 100644 --- a/src/module/ModuleLeft3.vue +++ b/src/module/ModuleLeft3.vue @@ -1,6 +1,7 @@ @@ -8,6 +9,7 @@ diff --git a/src/module/ModuleRight1.vue b/src/module/ModuleRight1.vue index a9ac373..a96f9d1 100644 --- a/src/module/ModuleRight1.vue +++ b/src/module/ModuleRight1.vue @@ -19,5 +19,7 @@ const barChart = reactive({ \ No newline at end of file diff --git a/src/module/ModuleRight3.vue b/src/module/ModuleRight3.vue index 044b27e..6e01d9c 100644 --- a/src/module/ModuleRight3.vue +++ b/src/module/ModuleRight3.vue @@ -1,6 +1,7 @@ @@ -8,9 +9,12 @@ \ No newline at end of file diff --git a/src/module/card/ModuleCard3.vue b/src/module/card/ModuleCard3.vue index b09454d..c3287f8 100644 --- a/src/module/card/ModuleCard3.vue +++ b/src/module/card/ModuleCard3.vue @@ -15,7 +15,7 @@ import { ref, defineProps } from 'vue' const props = defineProps({ w: { type: Number, - default: 600 + default: 800 }, title: { type: String, @@ -23,10 +23,10 @@ const props = defineProps({ } }) const width = ref(`${props.w}px`); -const height = ref(`${props.w / 2}px`); -const titleH = ref(`${props.w / 6}px`); -const bodyT = ref(`${props.w / 8}px`) -const bodyH = ref(`${props.w / 3}px`); +const height = ref(`300px`); +const titleH = ref(`${props.w / 8}px`); +const bodyT = ref(`${props.w / 10}px`) +const bodyH = ref(`${props.w / 4}px`);