diff --git a/package-lock.json b/package-lock.json index 194a73a..5b0cf78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", @@ -1080,12 +1081,14 @@ "node_modules/@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "node_modules/@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "dependencies": { "@types/lodash": "*" } @@ -2731,6 +2734,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "node_modules/gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -5401,15 +5409,13 @@ "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/plugin-bem/-/plugin-bem-0.15.10.tgz", "integrity": "sha512-V7b08sM2PWJlXI7BJiVIa0Sg30H3u/jHay4AclNXfF2yRFwwb4ZJjggsMfzwj3WSihAdNf2WTqvOU5qsOD80Dg==", - "dev": true, - "requires": {} + "dev": true }, "@css-render/vue3-ssr": { "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/vue3-ssr/-/vue3-ssr-0.15.10.tgz", "integrity": "sha512-keGKnkB2nyVGoA8GezMKNsmvTGXEzgLOGGlgshwOTSEzd1dsROyZ2m/khJ9jV5zbzDM4rWeAWbWF0zwHemsJcw==", - "dev": true, - "requires": {} + "dev": true }, "@emotion/hash": { "version": "0.8.0", @@ -5841,12 +5847,14 @@ "@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "requires": { "@types/lodash": "*" } @@ -5963,8 +5971,7 @@ "version": "1.10.2", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-1.10.2.tgz", "integrity": "sha512-/QJ0Z9qfhAFtKRY+r57ziY4BSbGUTGsPRMpB/Ron3QPwBZM4OZAZHdTa4a8PafCwU5DTatXG8TMDoP8z+oDqJw==", - "dev": true, - "requires": {} + "dev": true }, "@vitejs/plugin-vue-jsx": { "version": "1.3.10", @@ -6167,32 +6174,27 @@ "@wangeditor/editor-for-vue": { "version": "5.1.12", "resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz", - "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==", - "requires": {} + "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==" }, "@wangeditor/list-module": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.2.tgz", - "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==", - "requires": {} + "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==" }, "@wangeditor/table-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.1.tgz", - "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==", - "requires": {} + "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==" }, "@wangeditor/upload-image-module": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.1.tgz", - "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==", - "requires": {} + "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==" }, "@wangeditor/video-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.1.tgz", - "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==", - "requires": {} + "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==" }, "@xmldom/xmldom": { "version": "0.8.10", @@ -6523,8 +6525,7 @@ "version": "1.3.4", "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.4.tgz", "integrity": "sha512-O47vEyz85F2ax/ZdhMBJo187RivZGjH6V0cPjPzpm/yi6YffJg4upD/8ibezO11ezZwP3QYlBHh/t4JhRNx0Ow==", - "dev": true, - "requires": {} + "dev": true }, "debug": { "version": "4.3.4", @@ -7034,6 +7035,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -7451,8 +7457,7 @@ "lodash-unified": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/lodash-unified/-/lodash-unified-1.0.3.tgz", - "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==", - "requires": {} + "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==" }, "lodash.camelcase": { "version": "4.3.0", @@ -7894,8 +7899,7 @@ "vue-demi": { "version": "0.13.5", "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.5.tgz", - "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==", - "requires": {} + "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==" } } }, diff --git a/package-lock.json b/package-lock.json index 194a73a..5b0cf78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", @@ -1080,12 +1081,14 @@ "node_modules/@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "node_modules/@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "dependencies": { "@types/lodash": "*" } @@ -2731,6 +2734,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "node_modules/gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -5401,15 +5409,13 @@ "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/plugin-bem/-/plugin-bem-0.15.10.tgz", "integrity": "sha512-V7b08sM2PWJlXI7BJiVIa0Sg30H3u/jHay4AclNXfF2yRFwwb4ZJjggsMfzwj3WSihAdNf2WTqvOU5qsOD80Dg==", - "dev": true, - "requires": {} + "dev": true }, "@css-render/vue3-ssr": { "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/vue3-ssr/-/vue3-ssr-0.15.10.tgz", "integrity": "sha512-keGKnkB2nyVGoA8GezMKNsmvTGXEzgLOGGlgshwOTSEzd1dsROyZ2m/khJ9jV5zbzDM4rWeAWbWF0zwHemsJcw==", - "dev": true, - "requires": {} + "dev": true }, "@emotion/hash": { "version": "0.8.0", @@ -5841,12 +5847,14 @@ "@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "requires": { "@types/lodash": "*" } @@ -5963,8 +5971,7 @@ "version": "1.10.2", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-1.10.2.tgz", "integrity": "sha512-/QJ0Z9qfhAFtKRY+r57ziY4BSbGUTGsPRMpB/Ron3QPwBZM4OZAZHdTa4a8PafCwU5DTatXG8TMDoP8z+oDqJw==", - "dev": true, - "requires": {} + "dev": true }, "@vitejs/plugin-vue-jsx": { "version": "1.3.10", @@ -6167,32 +6174,27 @@ "@wangeditor/editor-for-vue": { "version": "5.1.12", "resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz", - "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==", - "requires": {} + "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==" }, "@wangeditor/list-module": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.2.tgz", - "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==", - "requires": {} + "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==" }, "@wangeditor/table-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.1.tgz", - "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==", - "requires": {} + "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==" }, "@wangeditor/upload-image-module": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.1.tgz", - "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==", - "requires": {} + "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==" }, "@wangeditor/video-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.1.tgz", - "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==", - "requires": {} + "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==" }, "@xmldom/xmldom": { "version": "0.8.10", @@ -6523,8 +6525,7 @@ "version": "1.3.4", "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.4.tgz", "integrity": "sha512-O47vEyz85F2ax/ZdhMBJo187RivZGjH6V0cPjPzpm/yi6YffJg4upD/8ibezO11ezZwP3QYlBHh/t4JhRNx0Ow==", - "dev": true, - "requires": {} + "dev": true }, "debug": { "version": "4.3.4", @@ -7034,6 +7035,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -7451,8 +7457,7 @@ "lodash-unified": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/lodash-unified/-/lodash-unified-1.0.3.tgz", - "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==", - "requires": {} + "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==" }, "lodash.camelcase": { "version": "4.3.0", @@ -7894,8 +7899,7 @@ "vue-demi": { "version": "0.13.5", "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.5.tgz", - "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==", - "requires": {} + "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==" } } }, diff --git a/package.json b/package.json index a096642..0f3893d 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", diff --git a/package-lock.json b/package-lock.json index 194a73a..5b0cf78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", @@ -1080,12 +1081,14 @@ "node_modules/@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "node_modules/@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "dependencies": { "@types/lodash": "*" } @@ -2731,6 +2734,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "node_modules/gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -5401,15 +5409,13 @@ "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/plugin-bem/-/plugin-bem-0.15.10.tgz", "integrity": "sha512-V7b08sM2PWJlXI7BJiVIa0Sg30H3u/jHay4AclNXfF2yRFwwb4ZJjggsMfzwj3WSihAdNf2WTqvOU5qsOD80Dg==", - "dev": true, - "requires": {} + "dev": true }, "@css-render/vue3-ssr": { "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/vue3-ssr/-/vue3-ssr-0.15.10.tgz", "integrity": "sha512-keGKnkB2nyVGoA8GezMKNsmvTGXEzgLOGGlgshwOTSEzd1dsROyZ2m/khJ9jV5zbzDM4rWeAWbWF0zwHemsJcw==", - "dev": true, - "requires": {} + "dev": true }, "@emotion/hash": { "version": "0.8.0", @@ -5841,12 +5847,14 @@ "@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "requires": { "@types/lodash": "*" } @@ -5963,8 +5971,7 @@ "version": "1.10.2", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-1.10.2.tgz", "integrity": "sha512-/QJ0Z9qfhAFtKRY+r57ziY4BSbGUTGsPRMpB/Ron3QPwBZM4OZAZHdTa4a8PafCwU5DTatXG8TMDoP8z+oDqJw==", - "dev": true, - "requires": {} + "dev": true }, "@vitejs/plugin-vue-jsx": { "version": "1.3.10", @@ -6167,32 +6174,27 @@ "@wangeditor/editor-for-vue": { "version": "5.1.12", "resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz", - "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==", - "requires": {} + "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==" }, "@wangeditor/list-module": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.2.tgz", - "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==", - "requires": {} + "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==" }, "@wangeditor/table-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.1.tgz", - "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==", - "requires": {} + "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==" }, "@wangeditor/upload-image-module": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.1.tgz", - "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==", - "requires": {} + "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==" }, "@wangeditor/video-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.1.tgz", - "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==", - "requires": {} + "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==" }, "@xmldom/xmldom": { "version": "0.8.10", @@ -6523,8 +6525,7 @@ "version": "1.3.4", "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.4.tgz", "integrity": "sha512-O47vEyz85F2ax/ZdhMBJo187RivZGjH6V0cPjPzpm/yi6YffJg4upD/8ibezO11ezZwP3QYlBHh/t4JhRNx0Ow==", - "dev": true, - "requires": {} + "dev": true }, "debug": { "version": "4.3.4", @@ -7034,6 +7035,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -7451,8 +7457,7 @@ "lodash-unified": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/lodash-unified/-/lodash-unified-1.0.3.tgz", - "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==", - "requires": {} + "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==" }, "lodash.camelcase": { "version": "4.3.0", @@ -7894,8 +7899,7 @@ "vue-demi": { "version": "0.13.5", "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.5.tgz", - "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==", - "requires": {} + "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==" } } }, diff --git a/package.json b/package.json index a096642..0f3893d 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", diff --git a/src/pages/views/WatershedOneMap/OneMapModal.vue b/src/pages/views/WatershedOneMap/OneMapModal.vue index b4f4e48..861db2b 100644 --- a/src/pages/views/WatershedOneMap/OneMapModal.vue +++ b/src/pages/views/WatershedOneMap/OneMapModal.vue @@ -94,13 +94,41 @@ + +
+
+
后湖泵站模型
+ + + +
+ +
+
+
+
+
{{ item.name }}
+
    +
  • + {{ v.pointName }} + {{ v.value }} +
  • +
+
+
+
+
+
+
- diff --git a/package-lock.json b/package-lock.json index 194a73a..5b0cf78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", @@ -1080,12 +1081,14 @@ "node_modules/@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "node_modules/@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "dependencies": { "@types/lodash": "*" } @@ -2731,6 +2734,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "node_modules/gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -5401,15 +5409,13 @@ "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/plugin-bem/-/plugin-bem-0.15.10.tgz", "integrity": "sha512-V7b08sM2PWJlXI7BJiVIa0Sg30H3u/jHay4AclNXfF2yRFwwb4ZJjggsMfzwj3WSihAdNf2WTqvOU5qsOD80Dg==", - "dev": true, - "requires": {} + "dev": true }, "@css-render/vue3-ssr": { "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/vue3-ssr/-/vue3-ssr-0.15.10.tgz", "integrity": "sha512-keGKnkB2nyVGoA8GezMKNsmvTGXEzgLOGGlgshwOTSEzd1dsROyZ2m/khJ9jV5zbzDM4rWeAWbWF0zwHemsJcw==", - "dev": true, - "requires": {} + "dev": true }, "@emotion/hash": { "version": "0.8.0", @@ -5841,12 +5847,14 @@ "@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "requires": { "@types/lodash": "*" } @@ -5963,8 +5971,7 @@ "version": "1.10.2", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-1.10.2.tgz", "integrity": "sha512-/QJ0Z9qfhAFtKRY+r57ziY4BSbGUTGsPRMpB/Ron3QPwBZM4OZAZHdTa4a8PafCwU5DTatXG8TMDoP8z+oDqJw==", - "dev": true, - "requires": {} + "dev": true }, "@vitejs/plugin-vue-jsx": { "version": "1.3.10", @@ -6167,32 +6174,27 @@ "@wangeditor/editor-for-vue": { "version": "5.1.12", "resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz", - "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==", - "requires": {} + "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==" }, "@wangeditor/list-module": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.2.tgz", - "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==", - "requires": {} + "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==" }, "@wangeditor/table-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.1.tgz", - "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==", - "requires": {} + "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==" }, "@wangeditor/upload-image-module": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.1.tgz", - "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==", - "requires": {} + "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==" }, "@wangeditor/video-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.1.tgz", - "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==", - "requires": {} + "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==" }, "@xmldom/xmldom": { "version": "0.8.10", @@ -6523,8 +6525,7 @@ "version": "1.3.4", "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.4.tgz", "integrity": "sha512-O47vEyz85F2ax/ZdhMBJo187RivZGjH6V0cPjPzpm/yi6YffJg4upD/8ibezO11ezZwP3QYlBHh/t4JhRNx0Ow==", - "dev": true, - "requires": {} + "dev": true }, "debug": { "version": "4.3.4", @@ -7034,6 +7035,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -7451,8 +7457,7 @@ "lodash-unified": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/lodash-unified/-/lodash-unified-1.0.3.tgz", - "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==", - "requires": {} + "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==" }, "lodash.camelcase": { "version": "4.3.0", @@ -7894,8 +7899,7 @@ "vue-demi": { "version": "0.13.5", "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.5.tgz", - "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==", - "requires": {} + "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==" } } }, diff --git a/package.json b/package.json index a096642..0f3893d 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", diff --git a/src/pages/views/WatershedOneMap/OneMapModal.vue b/src/pages/views/WatershedOneMap/OneMapModal.vue index b4f4e48..861db2b 100644 --- a/src/pages/views/WatershedOneMap/OneMapModal.vue +++ b/src/pages/views/WatershedOneMap/OneMapModal.vue @@ -94,13 +94,41 @@ + +
+
+
后湖泵站模型
+ + + +
+ +
+
+
+
+
{{ item.name }}
+
    +
  • + {{ v.pointName }} + {{ v.value }} +
  • +
+
+
+
+
+
+
- diff --git a/src/pages/views/WatershedOneMap/modalPart/Popup.vue b/src/pages/views/WatershedOneMap/modalPart/Popup.vue index 77eea0d..46a5863 100644 --- a/src/pages/views/WatershedOneMap/modalPart/Popup.vue +++ b/src/pages/views/WatershedOneMap/modalPart/Popup.vue @@ -102,6 +102,9 @@
查看工艺图
+
+
查看模型
+
降雨历史数据:
@@ -220,6 +223,10 @@ async function checkGyt(popupInfo) { bus.emit('getGongYt', popupInfo); } + + const handlesweath = (data) => { + bus.emit('weather', data); + }; // 降雨历史数据 const echartRain = async () => { let chart = document.getElementById('echartHistory'); @@ -297,6 +304,7 @@ ...toRefs(allData), closepopupdefect, checkGyt, + handlesweath, }; }, }); diff --git a/package-lock.json b/package-lock.json index 194a73a..5b0cf78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", @@ -1080,12 +1081,14 @@ "node_modules/@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "node_modules/@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "dependencies": { "@types/lodash": "*" } @@ -2731,6 +2734,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "node_modules/gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -5401,15 +5409,13 @@ "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/plugin-bem/-/plugin-bem-0.15.10.tgz", "integrity": "sha512-V7b08sM2PWJlXI7BJiVIa0Sg30H3u/jHay4AclNXfF2yRFwwb4ZJjggsMfzwj3WSihAdNf2WTqvOU5qsOD80Dg==", - "dev": true, - "requires": {} + "dev": true }, "@css-render/vue3-ssr": { "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/vue3-ssr/-/vue3-ssr-0.15.10.tgz", "integrity": "sha512-keGKnkB2nyVGoA8GezMKNsmvTGXEzgLOGGlgshwOTSEzd1dsROyZ2m/khJ9jV5zbzDM4rWeAWbWF0zwHemsJcw==", - "dev": true, - "requires": {} + "dev": true }, "@emotion/hash": { "version": "0.8.0", @@ -5841,12 +5847,14 @@ "@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "requires": { "@types/lodash": "*" } @@ -5963,8 +5971,7 @@ "version": "1.10.2", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-1.10.2.tgz", "integrity": "sha512-/QJ0Z9qfhAFtKRY+r57ziY4BSbGUTGsPRMpB/Ron3QPwBZM4OZAZHdTa4a8PafCwU5DTatXG8TMDoP8z+oDqJw==", - "dev": true, - "requires": {} + "dev": true }, "@vitejs/plugin-vue-jsx": { "version": "1.3.10", @@ -6167,32 +6174,27 @@ "@wangeditor/editor-for-vue": { "version": "5.1.12", "resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz", - "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==", - "requires": {} + "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==" }, "@wangeditor/list-module": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.2.tgz", - "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==", - "requires": {} + "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==" }, "@wangeditor/table-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.1.tgz", - "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==", - "requires": {} + "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==" }, "@wangeditor/upload-image-module": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.1.tgz", - "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==", - "requires": {} + "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==" }, "@wangeditor/video-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.1.tgz", - "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==", - "requires": {} + "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==" }, "@xmldom/xmldom": { "version": "0.8.10", @@ -6523,8 +6525,7 @@ "version": "1.3.4", "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.4.tgz", "integrity": "sha512-O47vEyz85F2ax/ZdhMBJo187RivZGjH6V0cPjPzpm/yi6YffJg4upD/8ibezO11ezZwP3QYlBHh/t4JhRNx0Ow==", - "dev": true, - "requires": {} + "dev": true }, "debug": { "version": "4.3.4", @@ -7034,6 +7035,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -7451,8 +7457,7 @@ "lodash-unified": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/lodash-unified/-/lodash-unified-1.0.3.tgz", - "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==", - "requires": {} + "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==" }, "lodash.camelcase": { "version": "4.3.0", @@ -7894,8 +7899,7 @@ "vue-demi": { "version": "0.13.5", "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.5.tgz", - "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==", - "requires": {} + "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==" } } }, diff --git a/package.json b/package.json index a096642..0f3893d 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", diff --git a/src/pages/views/WatershedOneMap/OneMapModal.vue b/src/pages/views/WatershedOneMap/OneMapModal.vue index b4f4e48..861db2b 100644 --- a/src/pages/views/WatershedOneMap/OneMapModal.vue +++ b/src/pages/views/WatershedOneMap/OneMapModal.vue @@ -94,13 +94,41 @@ + +
+
+
后湖泵站模型
+ + + +
+ +
+
+
+
+
{{ item.name }}
+
    +
  • + {{ v.pointName }} + {{ v.value }} +
  • +
+
+
+
+
+
+
- diff --git a/src/pages/views/WatershedOneMap/modalPart/Popup.vue b/src/pages/views/WatershedOneMap/modalPart/Popup.vue index 77eea0d..46a5863 100644 --- a/src/pages/views/WatershedOneMap/modalPart/Popup.vue +++ b/src/pages/views/WatershedOneMap/modalPart/Popup.vue @@ -102,6 +102,9 @@
查看工艺图
+
+
查看模型
+
降雨历史数据:
@@ -220,6 +223,10 @@ async function checkGyt(popupInfo) { bus.emit('getGongYt', popupInfo); } + + const handlesweath = (data) => { + bus.emit('weather', data); + }; // 降雨历史数据 const echartRain = async () => { let chart = document.getElementById('echartHistory'); @@ -297,6 +304,7 @@ ...toRefs(allData), closepopupdefect, checkGyt, + handlesweath, }; }, }); diff --git a/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue b/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue new file mode 100644 index 0000000..993d0af --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue @@ -0,0 +1,599 @@ + + + diff --git a/package-lock.json b/package-lock.json index 194a73a..5b0cf78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", @@ -1080,12 +1081,14 @@ "node_modules/@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "node_modules/@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "dependencies": { "@types/lodash": "*" } @@ -2731,6 +2734,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "node_modules/gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -5401,15 +5409,13 @@ "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/plugin-bem/-/plugin-bem-0.15.10.tgz", "integrity": "sha512-V7b08sM2PWJlXI7BJiVIa0Sg30H3u/jHay4AclNXfF2yRFwwb4ZJjggsMfzwj3WSihAdNf2WTqvOU5qsOD80Dg==", - "dev": true, - "requires": {} + "dev": true }, "@css-render/vue3-ssr": { "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/vue3-ssr/-/vue3-ssr-0.15.10.tgz", "integrity": "sha512-keGKnkB2nyVGoA8GezMKNsmvTGXEzgLOGGlgshwOTSEzd1dsROyZ2m/khJ9jV5zbzDM4rWeAWbWF0zwHemsJcw==", - "dev": true, - "requires": {} + "dev": true }, "@emotion/hash": { "version": "0.8.0", @@ -5841,12 +5847,14 @@ "@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "requires": { "@types/lodash": "*" } @@ -5963,8 +5971,7 @@ "version": "1.10.2", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-1.10.2.tgz", "integrity": "sha512-/QJ0Z9qfhAFtKRY+r57ziY4BSbGUTGsPRMpB/Ron3QPwBZM4OZAZHdTa4a8PafCwU5DTatXG8TMDoP8z+oDqJw==", - "dev": true, - "requires": {} + "dev": true }, "@vitejs/plugin-vue-jsx": { "version": "1.3.10", @@ -6167,32 +6174,27 @@ "@wangeditor/editor-for-vue": { "version": "5.1.12", "resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz", - "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==", - "requires": {} + "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==" }, "@wangeditor/list-module": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.2.tgz", - "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==", - "requires": {} + "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==" }, "@wangeditor/table-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.1.tgz", - "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==", - "requires": {} + "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==" }, "@wangeditor/upload-image-module": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.1.tgz", - "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==", - "requires": {} + "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==" }, "@wangeditor/video-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.1.tgz", - "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==", - "requires": {} + "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==" }, "@xmldom/xmldom": { "version": "0.8.10", @@ -6523,8 +6525,7 @@ "version": "1.3.4", "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.4.tgz", "integrity": "sha512-O47vEyz85F2ax/ZdhMBJo187RivZGjH6V0cPjPzpm/yi6YffJg4upD/8ibezO11ezZwP3QYlBHh/t4JhRNx0Ow==", - "dev": true, - "requires": {} + "dev": true }, "debug": { "version": "4.3.4", @@ -7034,6 +7035,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -7451,8 +7457,7 @@ "lodash-unified": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/lodash-unified/-/lodash-unified-1.0.3.tgz", - "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==", - "requires": {} + "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==" }, "lodash.camelcase": { "version": "4.3.0", @@ -7894,8 +7899,7 @@ "vue-demi": { "version": "0.13.5", "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.5.tgz", - "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==", - "requires": {} + "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==" } } }, diff --git a/package.json b/package.json index a096642..0f3893d 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", diff --git a/src/pages/views/WatershedOneMap/OneMapModal.vue b/src/pages/views/WatershedOneMap/OneMapModal.vue index b4f4e48..861db2b 100644 --- a/src/pages/views/WatershedOneMap/OneMapModal.vue +++ b/src/pages/views/WatershedOneMap/OneMapModal.vue @@ -94,13 +94,41 @@ + +
+
+
后湖泵站模型
+ + + +
+ +
+
+
+
+
{{ item.name }}
+
    +
  • + {{ v.pointName }} + {{ v.value }} +
  • +
+
+
+
+
+
+
- diff --git a/src/pages/views/WatershedOneMap/modalPart/Popup.vue b/src/pages/views/WatershedOneMap/modalPart/Popup.vue index 77eea0d..46a5863 100644 --- a/src/pages/views/WatershedOneMap/modalPart/Popup.vue +++ b/src/pages/views/WatershedOneMap/modalPart/Popup.vue @@ -102,6 +102,9 @@
查看工艺图
+
+
查看模型
+
降雨历史数据:
@@ -220,6 +223,10 @@ async function checkGyt(popupInfo) { bus.emit('getGongYt', popupInfo); } + + const handlesweath = (data) => { + bus.emit('weather', data); + }; // 降雨历史数据 const echartRain = async () => { let chart = document.getElementById('echartHistory'); @@ -297,6 +304,7 @@ ...toRefs(allData), closepopupdefect, checkGyt, + handlesweath, }; }, }); diff --git a/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue b/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue new file mode 100644 index 0000000..993d0af --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue @@ -0,0 +1,599 @@ + + + diff --git a/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue b/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue new file mode 100644 index 0000000..8b4cac2 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue @@ -0,0 +1,652 @@ + + + diff --git a/package-lock.json b/package-lock.json index 194a73a..5b0cf78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", @@ -1080,12 +1081,14 @@ "node_modules/@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "node_modules/@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "dependencies": { "@types/lodash": "*" } @@ -2731,6 +2734,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "node_modules/gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -5401,15 +5409,13 @@ "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/plugin-bem/-/plugin-bem-0.15.10.tgz", "integrity": "sha512-V7b08sM2PWJlXI7BJiVIa0Sg30H3u/jHay4AclNXfF2yRFwwb4ZJjggsMfzwj3WSihAdNf2WTqvOU5qsOD80Dg==", - "dev": true, - "requires": {} + "dev": true }, "@css-render/vue3-ssr": { "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/vue3-ssr/-/vue3-ssr-0.15.10.tgz", "integrity": "sha512-keGKnkB2nyVGoA8GezMKNsmvTGXEzgLOGGlgshwOTSEzd1dsROyZ2m/khJ9jV5zbzDM4rWeAWbWF0zwHemsJcw==", - "dev": true, - "requires": {} + "dev": true }, "@emotion/hash": { "version": "0.8.0", @@ -5841,12 +5847,14 @@ "@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "requires": { "@types/lodash": "*" } @@ -5963,8 +5971,7 @@ "version": "1.10.2", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-1.10.2.tgz", "integrity": "sha512-/QJ0Z9qfhAFtKRY+r57ziY4BSbGUTGsPRMpB/Ron3QPwBZM4OZAZHdTa4a8PafCwU5DTatXG8TMDoP8z+oDqJw==", - "dev": true, - "requires": {} + "dev": true }, "@vitejs/plugin-vue-jsx": { "version": "1.3.10", @@ -6167,32 +6174,27 @@ "@wangeditor/editor-for-vue": { "version": "5.1.12", "resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz", - "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==", - "requires": {} + "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==" }, "@wangeditor/list-module": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.2.tgz", - "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==", - "requires": {} + "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==" }, "@wangeditor/table-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.1.tgz", - "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==", - "requires": {} + "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==" }, "@wangeditor/upload-image-module": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.1.tgz", - "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==", - "requires": {} + "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==" }, "@wangeditor/video-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.1.tgz", - "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==", - "requires": {} + "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==" }, "@xmldom/xmldom": { "version": "0.8.10", @@ -6523,8 +6525,7 @@ "version": "1.3.4", "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.4.tgz", "integrity": "sha512-O47vEyz85F2ax/ZdhMBJo187RivZGjH6V0cPjPzpm/yi6YffJg4upD/8ibezO11ezZwP3QYlBHh/t4JhRNx0Ow==", - "dev": true, - "requires": {} + "dev": true }, "debug": { "version": "4.3.4", @@ -7034,6 +7035,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -7451,8 +7457,7 @@ "lodash-unified": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/lodash-unified/-/lodash-unified-1.0.3.tgz", - "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==", - "requires": {} + "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==" }, "lodash.camelcase": { "version": "4.3.0", @@ -7894,8 +7899,7 @@ "vue-demi": { "version": "0.13.5", "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.5.tgz", - "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==", - "requires": {} + "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==" } } }, diff --git a/package.json b/package.json index a096642..0f3893d 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", diff --git a/src/pages/views/WatershedOneMap/OneMapModal.vue b/src/pages/views/WatershedOneMap/OneMapModal.vue index b4f4e48..861db2b 100644 --- a/src/pages/views/WatershedOneMap/OneMapModal.vue +++ b/src/pages/views/WatershedOneMap/OneMapModal.vue @@ -94,13 +94,41 @@ + +
+
+
后湖泵站模型
+ + + +
+ +
+
+
+
+
{{ item.name }}
+
    +
  • + {{ v.pointName }} + {{ v.value }} +
  • +
+
+
+
+
+
+
- diff --git a/src/pages/views/WatershedOneMap/modalPart/Popup.vue b/src/pages/views/WatershedOneMap/modalPart/Popup.vue index 77eea0d..46a5863 100644 --- a/src/pages/views/WatershedOneMap/modalPart/Popup.vue +++ b/src/pages/views/WatershedOneMap/modalPart/Popup.vue @@ -102,6 +102,9 @@
查看工艺图
+
+
查看模型
+
降雨历史数据:
@@ -220,6 +223,10 @@ async function checkGyt(popupInfo) { bus.emit('getGongYt', popupInfo); } + + const handlesweath = (data) => { + bus.emit('weather', data); + }; // 降雨历史数据 const echartRain = async () => { let chart = document.getElementById('echartHistory'); @@ -297,6 +304,7 @@ ...toRefs(allData), closepopupdefect, checkGyt, + handlesweath, }; }, }); diff --git a/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue b/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue new file mode 100644 index 0000000..993d0af --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue @@ -0,0 +1,599 @@ + + + diff --git a/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue b/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue new file mode 100644 index 0000000..8b4cac2 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue @@ -0,0 +1,652 @@ + + + diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue b/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue index 4383d0d..dd36bc9 100644 --- a/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue +++ b/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue @@ -1,304 +1,374 @@ - - diff --git a/package-lock.json b/package-lock.json index 194a73a..5b0cf78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", @@ -1080,12 +1081,14 @@ "node_modules/@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "node_modules/@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "dependencies": { "@types/lodash": "*" } @@ -2731,6 +2734,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "node_modules/gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -5401,15 +5409,13 @@ "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/plugin-bem/-/plugin-bem-0.15.10.tgz", "integrity": "sha512-V7b08sM2PWJlXI7BJiVIa0Sg30H3u/jHay4AclNXfF2yRFwwb4ZJjggsMfzwj3WSihAdNf2WTqvOU5qsOD80Dg==", - "dev": true, - "requires": {} + "dev": true }, "@css-render/vue3-ssr": { "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/vue3-ssr/-/vue3-ssr-0.15.10.tgz", "integrity": "sha512-keGKnkB2nyVGoA8GezMKNsmvTGXEzgLOGGlgshwOTSEzd1dsROyZ2m/khJ9jV5zbzDM4rWeAWbWF0zwHemsJcw==", - "dev": true, - "requires": {} + "dev": true }, "@emotion/hash": { "version": "0.8.0", @@ -5841,12 +5847,14 @@ "@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "requires": { "@types/lodash": "*" } @@ -5963,8 +5971,7 @@ "version": "1.10.2", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-1.10.2.tgz", "integrity": "sha512-/QJ0Z9qfhAFtKRY+r57ziY4BSbGUTGsPRMpB/Ron3QPwBZM4OZAZHdTa4a8PafCwU5DTatXG8TMDoP8z+oDqJw==", - "dev": true, - "requires": {} + "dev": true }, "@vitejs/plugin-vue-jsx": { "version": "1.3.10", @@ -6167,32 +6174,27 @@ "@wangeditor/editor-for-vue": { "version": "5.1.12", "resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz", - "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==", - "requires": {} + "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==" }, "@wangeditor/list-module": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.2.tgz", - "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==", - "requires": {} + "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==" }, "@wangeditor/table-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.1.tgz", - "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==", - "requires": {} + "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==" }, "@wangeditor/upload-image-module": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.1.tgz", - "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==", - "requires": {} + "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==" }, "@wangeditor/video-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.1.tgz", - "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==", - "requires": {} + "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==" }, "@xmldom/xmldom": { "version": "0.8.10", @@ -6523,8 +6525,7 @@ "version": "1.3.4", "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.4.tgz", "integrity": "sha512-O47vEyz85F2ax/ZdhMBJo187RivZGjH6V0cPjPzpm/yi6YffJg4upD/8ibezO11ezZwP3QYlBHh/t4JhRNx0Ow==", - "dev": true, - "requires": {} + "dev": true }, "debug": { "version": "4.3.4", @@ -7034,6 +7035,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -7451,8 +7457,7 @@ "lodash-unified": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/lodash-unified/-/lodash-unified-1.0.3.tgz", - "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==", - "requires": {} + "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==" }, "lodash.camelcase": { "version": "4.3.0", @@ -7894,8 +7899,7 @@ "vue-demi": { "version": "0.13.5", "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.5.tgz", - "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==", - "requires": {} + "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==" } } }, diff --git a/package.json b/package.json index a096642..0f3893d 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", diff --git a/src/pages/views/WatershedOneMap/OneMapModal.vue b/src/pages/views/WatershedOneMap/OneMapModal.vue index b4f4e48..861db2b 100644 --- a/src/pages/views/WatershedOneMap/OneMapModal.vue +++ b/src/pages/views/WatershedOneMap/OneMapModal.vue @@ -94,13 +94,41 @@ + +
+
+
后湖泵站模型
+ + + +
+ +
+
+
+
+
{{ item.name }}
+
    +
  • + {{ v.pointName }} + {{ v.value }} +
  • +
+
+
+
+
+
+
- diff --git a/src/pages/views/WatershedOneMap/modalPart/Popup.vue b/src/pages/views/WatershedOneMap/modalPart/Popup.vue index 77eea0d..46a5863 100644 --- a/src/pages/views/WatershedOneMap/modalPart/Popup.vue +++ b/src/pages/views/WatershedOneMap/modalPart/Popup.vue @@ -102,6 +102,9 @@
查看工艺图
+
+
查看模型
+
降雨历史数据:
@@ -220,6 +223,10 @@ async function checkGyt(popupInfo) { bus.emit('getGongYt', popupInfo); } + + const handlesweath = (data) => { + bus.emit('weather', data); + }; // 降雨历史数据 const echartRain = async () => { let chart = document.getElementById('echartHistory'); @@ -297,6 +304,7 @@ ...toRefs(allData), closepopupdefect, checkGyt, + handlesweath, }; }, }); diff --git a/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue b/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue new file mode 100644 index 0000000..993d0af --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue @@ -0,0 +1,599 @@ + + + diff --git a/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue b/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue new file mode 100644 index 0000000..8b4cac2 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue @@ -0,0 +1,652 @@ + + + diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue b/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue index 4383d0d..dd36bc9 100644 --- a/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue +++ b/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue @@ -1,304 +1,374 @@ - - diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/HPModal b/src/pages/views/WatershedOneMap/modalPart/modal/HPModal new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/modal/HPModal diff --git a/package-lock.json b/package-lock.json index 194a73a..5b0cf78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", @@ -1080,12 +1081,14 @@ "node_modules/@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "node_modules/@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "dependencies": { "@types/lodash": "*" } @@ -2731,6 +2734,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "node_modules/gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -5401,15 +5409,13 @@ "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/plugin-bem/-/plugin-bem-0.15.10.tgz", "integrity": "sha512-V7b08sM2PWJlXI7BJiVIa0Sg30H3u/jHay4AclNXfF2yRFwwb4ZJjggsMfzwj3WSihAdNf2WTqvOU5qsOD80Dg==", - "dev": true, - "requires": {} + "dev": true }, "@css-render/vue3-ssr": { "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/vue3-ssr/-/vue3-ssr-0.15.10.tgz", "integrity": "sha512-keGKnkB2nyVGoA8GezMKNsmvTGXEzgLOGGlgshwOTSEzd1dsROyZ2m/khJ9jV5zbzDM4rWeAWbWF0zwHemsJcw==", - "dev": true, - "requires": {} + "dev": true }, "@emotion/hash": { "version": "0.8.0", @@ -5841,12 +5847,14 @@ "@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "requires": { "@types/lodash": "*" } @@ -5963,8 +5971,7 @@ "version": "1.10.2", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-1.10.2.tgz", "integrity": "sha512-/QJ0Z9qfhAFtKRY+r57ziY4BSbGUTGsPRMpB/Ron3QPwBZM4OZAZHdTa4a8PafCwU5DTatXG8TMDoP8z+oDqJw==", - "dev": true, - "requires": {} + "dev": true }, "@vitejs/plugin-vue-jsx": { "version": "1.3.10", @@ -6167,32 +6174,27 @@ "@wangeditor/editor-for-vue": { "version": "5.1.12", "resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz", - "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==", - "requires": {} + "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==" }, "@wangeditor/list-module": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.2.tgz", - "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==", - "requires": {} + "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==" }, "@wangeditor/table-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.1.tgz", - "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==", - "requires": {} + "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==" }, "@wangeditor/upload-image-module": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.1.tgz", - "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==", - "requires": {} + "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==" }, "@wangeditor/video-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.1.tgz", - "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==", - "requires": {} + "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==" }, "@xmldom/xmldom": { "version": "0.8.10", @@ -6523,8 +6525,7 @@ "version": "1.3.4", "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.4.tgz", "integrity": "sha512-O47vEyz85F2ax/ZdhMBJo187RivZGjH6V0cPjPzpm/yi6YffJg4upD/8ibezO11ezZwP3QYlBHh/t4JhRNx0Ow==", - "dev": true, - "requires": {} + "dev": true }, "debug": { "version": "4.3.4", @@ -7034,6 +7035,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -7451,8 +7457,7 @@ "lodash-unified": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/lodash-unified/-/lodash-unified-1.0.3.tgz", - "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==", - "requires": {} + "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==" }, "lodash.camelcase": { "version": "4.3.0", @@ -7894,8 +7899,7 @@ "vue-demi": { "version": "0.13.5", "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.5.tgz", - "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==", - "requires": {} + "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==" } } }, diff --git a/package.json b/package.json index a096642..0f3893d 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", diff --git a/src/pages/views/WatershedOneMap/OneMapModal.vue b/src/pages/views/WatershedOneMap/OneMapModal.vue index b4f4e48..861db2b 100644 --- a/src/pages/views/WatershedOneMap/OneMapModal.vue +++ b/src/pages/views/WatershedOneMap/OneMapModal.vue @@ -94,13 +94,41 @@ + +
+
+
后湖泵站模型
+ + + +
+ +
+
+
+
+
{{ item.name }}
+
    +
  • + {{ v.pointName }} + {{ v.value }} +
  • +
+
+
+
+
+
+
- diff --git a/src/pages/views/WatershedOneMap/modalPart/Popup.vue b/src/pages/views/WatershedOneMap/modalPart/Popup.vue index 77eea0d..46a5863 100644 --- a/src/pages/views/WatershedOneMap/modalPart/Popup.vue +++ b/src/pages/views/WatershedOneMap/modalPart/Popup.vue @@ -102,6 +102,9 @@
查看工艺图
+
+
查看模型
+
降雨历史数据:
@@ -220,6 +223,10 @@ async function checkGyt(popupInfo) { bus.emit('getGongYt', popupInfo); } + + const handlesweath = (data) => { + bus.emit('weather', data); + }; // 降雨历史数据 const echartRain = async () => { let chart = document.getElementById('echartHistory'); @@ -297,6 +304,7 @@ ...toRefs(allData), closepopupdefect, checkGyt, + handlesweath, }; }, }); diff --git a/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue b/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue new file mode 100644 index 0000000..993d0af --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue @@ -0,0 +1,599 @@ + + + diff --git a/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue b/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue new file mode 100644 index 0000000..8b4cac2 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue @@ -0,0 +1,652 @@ + + + diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue b/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue index 4383d0d..dd36bc9 100644 --- a/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue +++ b/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue @@ -1,304 +1,374 @@ - - diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/HPModal b/src/pages/views/WatershedOneMap/modalPart/modal/HPModal new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/modal/HPModal diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/nldModal/HPModal.VUE b/src/pages/views/WatershedOneMap/modalPart/modal/nldModal/HPModal.VUE new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/modal/nldModal/HPModal.VUE diff --git a/package-lock.json b/package-lock.json index 194a73a..5b0cf78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", @@ -1080,12 +1081,14 @@ "node_modules/@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "node_modules/@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "dependencies": { "@types/lodash": "*" } @@ -2731,6 +2734,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "node_modules/gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -5401,15 +5409,13 @@ "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/plugin-bem/-/plugin-bem-0.15.10.tgz", "integrity": "sha512-V7b08sM2PWJlXI7BJiVIa0Sg30H3u/jHay4AclNXfF2yRFwwb4ZJjggsMfzwj3WSihAdNf2WTqvOU5qsOD80Dg==", - "dev": true, - "requires": {} + "dev": true }, "@css-render/vue3-ssr": { "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/vue3-ssr/-/vue3-ssr-0.15.10.tgz", "integrity": "sha512-keGKnkB2nyVGoA8GezMKNsmvTGXEzgLOGGlgshwOTSEzd1dsROyZ2m/khJ9jV5zbzDM4rWeAWbWF0zwHemsJcw==", - "dev": true, - "requires": {} + "dev": true }, "@emotion/hash": { "version": "0.8.0", @@ -5841,12 +5847,14 @@ "@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "requires": { "@types/lodash": "*" } @@ -5963,8 +5971,7 @@ "version": "1.10.2", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-1.10.2.tgz", "integrity": "sha512-/QJ0Z9qfhAFtKRY+r57ziY4BSbGUTGsPRMpB/Ron3QPwBZM4OZAZHdTa4a8PafCwU5DTatXG8TMDoP8z+oDqJw==", - "dev": true, - "requires": {} + "dev": true }, "@vitejs/plugin-vue-jsx": { "version": "1.3.10", @@ -6167,32 +6174,27 @@ "@wangeditor/editor-for-vue": { "version": "5.1.12", "resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz", - "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==", - "requires": {} + "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==" }, "@wangeditor/list-module": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.2.tgz", - "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==", - "requires": {} + "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==" }, "@wangeditor/table-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.1.tgz", - "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==", - "requires": {} + "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==" }, "@wangeditor/upload-image-module": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.1.tgz", - "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==", - "requires": {} + "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==" }, "@wangeditor/video-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.1.tgz", - "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==", - "requires": {} + "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==" }, "@xmldom/xmldom": { "version": "0.8.10", @@ -6523,8 +6525,7 @@ "version": "1.3.4", "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.4.tgz", "integrity": "sha512-O47vEyz85F2ax/ZdhMBJo187RivZGjH6V0cPjPzpm/yi6YffJg4upD/8ibezO11ezZwP3QYlBHh/t4JhRNx0Ow==", - "dev": true, - "requires": {} + "dev": true }, "debug": { "version": "4.3.4", @@ -7034,6 +7035,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -7451,8 +7457,7 @@ "lodash-unified": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/lodash-unified/-/lodash-unified-1.0.3.tgz", - "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==", - "requires": {} + "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==" }, "lodash.camelcase": { "version": "4.3.0", @@ -7894,8 +7899,7 @@ "vue-demi": { "version": "0.13.5", "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.5.tgz", - "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==", - "requires": {} + "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==" } } }, diff --git a/package.json b/package.json index a096642..0f3893d 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", diff --git a/src/pages/views/WatershedOneMap/OneMapModal.vue b/src/pages/views/WatershedOneMap/OneMapModal.vue index b4f4e48..861db2b 100644 --- a/src/pages/views/WatershedOneMap/OneMapModal.vue +++ b/src/pages/views/WatershedOneMap/OneMapModal.vue @@ -94,13 +94,41 @@ + +
+
+
后湖泵站模型
+ + + +
+ +
+
+
+
+
{{ item.name }}
+
    +
  • + {{ v.pointName }} + {{ v.value }} +
  • +
+
+
+
+
+
+
- diff --git a/src/pages/views/WatershedOneMap/modalPart/Popup.vue b/src/pages/views/WatershedOneMap/modalPart/Popup.vue index 77eea0d..46a5863 100644 --- a/src/pages/views/WatershedOneMap/modalPart/Popup.vue +++ b/src/pages/views/WatershedOneMap/modalPart/Popup.vue @@ -102,6 +102,9 @@
查看工艺图
+
+
查看模型
+
降雨历史数据:
@@ -220,6 +223,10 @@ async function checkGyt(popupInfo) { bus.emit('getGongYt', popupInfo); } + + const handlesweath = (data) => { + bus.emit('weather', data); + }; // 降雨历史数据 const echartRain = async () => { let chart = document.getElementById('echartHistory'); @@ -297,6 +304,7 @@ ...toRefs(allData), closepopupdefect, checkGyt, + handlesweath, }; }, }); diff --git a/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue b/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue new file mode 100644 index 0000000..993d0af --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue @@ -0,0 +1,599 @@ + + + diff --git a/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue b/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue new file mode 100644 index 0000000..8b4cac2 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue @@ -0,0 +1,652 @@ + + + diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue b/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue index 4383d0d..dd36bc9 100644 --- a/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue +++ b/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue @@ -1,304 +1,374 @@ - - diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/HPModal b/src/pages/views/WatershedOneMap/modalPart/modal/HPModal new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/modal/HPModal diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/nldModal/HPModal.VUE b/src/pages/views/WatershedOneMap/modalPart/modal/nldModal/HPModal.VUE new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/modal/nldModal/HPModal.VUE diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/video.vue b/src/pages/views/WatershedOneMap/modalPart/modal/video.vue new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/modal/video.vue diff --git a/package-lock.json b/package-lock.json index 194a73a..5b0cf78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", @@ -1080,12 +1081,14 @@ "node_modules/@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "node_modules/@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "dependencies": { "@types/lodash": "*" } @@ -2731,6 +2734,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "node_modules/gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -5401,15 +5409,13 @@ "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/plugin-bem/-/plugin-bem-0.15.10.tgz", "integrity": "sha512-V7b08sM2PWJlXI7BJiVIa0Sg30H3u/jHay4AclNXfF2yRFwwb4ZJjggsMfzwj3WSihAdNf2WTqvOU5qsOD80Dg==", - "dev": true, - "requires": {} + "dev": true }, "@css-render/vue3-ssr": { "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/vue3-ssr/-/vue3-ssr-0.15.10.tgz", "integrity": "sha512-keGKnkB2nyVGoA8GezMKNsmvTGXEzgLOGGlgshwOTSEzd1dsROyZ2m/khJ9jV5zbzDM4rWeAWbWF0zwHemsJcw==", - "dev": true, - "requires": {} + "dev": true }, "@emotion/hash": { "version": "0.8.0", @@ -5841,12 +5847,14 @@ "@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "requires": { "@types/lodash": "*" } @@ -5963,8 +5971,7 @@ "version": "1.10.2", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-1.10.2.tgz", "integrity": "sha512-/QJ0Z9qfhAFtKRY+r57ziY4BSbGUTGsPRMpB/Ron3QPwBZM4OZAZHdTa4a8PafCwU5DTatXG8TMDoP8z+oDqJw==", - "dev": true, - "requires": {} + "dev": true }, "@vitejs/plugin-vue-jsx": { "version": "1.3.10", @@ -6167,32 +6174,27 @@ "@wangeditor/editor-for-vue": { "version": "5.1.12", "resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz", - "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==", - "requires": {} + "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==" }, "@wangeditor/list-module": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.2.tgz", - "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==", - "requires": {} + "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==" }, "@wangeditor/table-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.1.tgz", - "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==", - "requires": {} + "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==" }, "@wangeditor/upload-image-module": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.1.tgz", - "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==", - "requires": {} + "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==" }, "@wangeditor/video-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.1.tgz", - "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==", - "requires": {} + "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==" }, "@xmldom/xmldom": { "version": "0.8.10", @@ -6523,8 +6525,7 @@ "version": "1.3.4", "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.4.tgz", "integrity": "sha512-O47vEyz85F2ax/ZdhMBJo187RivZGjH6V0cPjPzpm/yi6YffJg4upD/8ibezO11ezZwP3QYlBHh/t4JhRNx0Ow==", - "dev": true, - "requires": {} + "dev": true }, "debug": { "version": "4.3.4", @@ -7034,6 +7035,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -7451,8 +7457,7 @@ "lodash-unified": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/lodash-unified/-/lodash-unified-1.0.3.tgz", - "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==", - "requires": {} + "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==" }, "lodash.camelcase": { "version": "4.3.0", @@ -7894,8 +7899,7 @@ "vue-demi": { "version": "0.13.5", "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.5.tgz", - "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==", - "requires": {} + "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==" } } }, diff --git a/package.json b/package.json index a096642..0f3893d 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", diff --git a/src/pages/views/WatershedOneMap/OneMapModal.vue b/src/pages/views/WatershedOneMap/OneMapModal.vue index b4f4e48..861db2b 100644 --- a/src/pages/views/WatershedOneMap/OneMapModal.vue +++ b/src/pages/views/WatershedOneMap/OneMapModal.vue @@ -94,13 +94,41 @@ + +
+
+
后湖泵站模型
+ + + +
+ +
+
+
+
+
{{ item.name }}
+
    +
  • + {{ v.pointName }} + {{ v.value }} +
  • +
+
+
+
+
+
+
- diff --git a/src/pages/views/WatershedOneMap/modalPart/Popup.vue b/src/pages/views/WatershedOneMap/modalPart/Popup.vue index 77eea0d..46a5863 100644 --- a/src/pages/views/WatershedOneMap/modalPart/Popup.vue +++ b/src/pages/views/WatershedOneMap/modalPart/Popup.vue @@ -102,6 +102,9 @@
查看工艺图
+
+
查看模型
+
降雨历史数据:
@@ -220,6 +223,10 @@ async function checkGyt(popupInfo) { bus.emit('getGongYt', popupInfo); } + + const handlesweath = (data) => { + bus.emit('weather', data); + }; // 降雨历史数据 const echartRain = async () => { let chart = document.getElementById('echartHistory'); @@ -297,6 +304,7 @@ ...toRefs(allData), closepopupdefect, checkGyt, + handlesweath, }; }, }); diff --git a/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue b/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue new file mode 100644 index 0000000..993d0af --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue @@ -0,0 +1,599 @@ + + + diff --git a/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue b/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue new file mode 100644 index 0000000..8b4cac2 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue @@ -0,0 +1,652 @@ + + + diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue b/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue index 4383d0d..dd36bc9 100644 --- a/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue +++ b/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue @@ -1,304 +1,374 @@ - - diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/HPModal b/src/pages/views/WatershedOneMap/modalPart/modal/HPModal new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/modal/HPModal diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/nldModal/HPModal.VUE b/src/pages/views/WatershedOneMap/modalPart/modal/nldModal/HPModal.VUE new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/modal/nldModal/HPModal.VUE diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/video.vue b/src/pages/views/WatershedOneMap/modalPart/modal/video.vue new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/modal/video.vue diff --git a/src/pages/views/WatershedOneMap/modalPart/rainTz.vue b/src/pages/views/WatershedOneMap/modalPart/rainTz.vue index 96c9f9e..80d3880 100644 --- a/src/pages/views/WatershedOneMap/modalPart/rainTz.vue +++ b/src/pages/views/WatershedOneMap/modalPart/rainTz.vue @@ -3,6 +3,7 @@
+
气象信息
@@ -335,7 +336,9 @@ destination: Cesium.Cartesian3.fromDegrees(row.LNG, row.LAT, 3000.0), }); }; - + const handlesweath = (data) => { + bus.emit('weather', data); + }; onMounted(() => { getRainList(); //获取雨量站列表 getWaterLoging(); //积水点 @@ -380,6 +383,7 @@ getNowImage, getWaterLoging, handleRowClick, + handlesweath, }; }, }; diff --git a/package-lock.json b/package-lock.json index 194a73a..5b0cf78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", @@ -1080,12 +1081,14 @@ "node_modules/@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "node_modules/@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "dependencies": { "@types/lodash": "*" } @@ -2731,6 +2734,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "node_modules/gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -5401,15 +5409,13 @@ "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/plugin-bem/-/plugin-bem-0.15.10.tgz", "integrity": "sha512-V7b08sM2PWJlXI7BJiVIa0Sg30H3u/jHay4AclNXfF2yRFwwb4ZJjggsMfzwj3WSihAdNf2WTqvOU5qsOD80Dg==", - "dev": true, - "requires": {} + "dev": true }, "@css-render/vue3-ssr": { "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/vue3-ssr/-/vue3-ssr-0.15.10.tgz", "integrity": "sha512-keGKnkB2nyVGoA8GezMKNsmvTGXEzgLOGGlgshwOTSEzd1dsROyZ2m/khJ9jV5zbzDM4rWeAWbWF0zwHemsJcw==", - "dev": true, - "requires": {} + "dev": true }, "@emotion/hash": { "version": "0.8.0", @@ -5841,12 +5847,14 @@ "@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "requires": { "@types/lodash": "*" } @@ -5963,8 +5971,7 @@ "version": "1.10.2", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-1.10.2.tgz", "integrity": "sha512-/QJ0Z9qfhAFtKRY+r57ziY4BSbGUTGsPRMpB/Ron3QPwBZM4OZAZHdTa4a8PafCwU5DTatXG8TMDoP8z+oDqJw==", - "dev": true, - "requires": {} + "dev": true }, "@vitejs/plugin-vue-jsx": { "version": "1.3.10", @@ -6167,32 +6174,27 @@ "@wangeditor/editor-for-vue": { "version": "5.1.12", "resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz", - "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==", - "requires": {} + "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==" }, "@wangeditor/list-module": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.2.tgz", - "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==", - "requires": {} + "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==" }, "@wangeditor/table-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.1.tgz", - "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==", - "requires": {} + "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==" }, "@wangeditor/upload-image-module": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.1.tgz", - "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==", - "requires": {} + "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==" }, "@wangeditor/video-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.1.tgz", - "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==", - "requires": {} + "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==" }, "@xmldom/xmldom": { "version": "0.8.10", @@ -6523,8 +6525,7 @@ "version": "1.3.4", "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.4.tgz", "integrity": "sha512-O47vEyz85F2ax/ZdhMBJo187RivZGjH6V0cPjPzpm/yi6YffJg4upD/8ibezO11ezZwP3QYlBHh/t4JhRNx0Ow==", - "dev": true, - "requires": {} + "dev": true }, "debug": { "version": "4.3.4", @@ -7034,6 +7035,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -7451,8 +7457,7 @@ "lodash-unified": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/lodash-unified/-/lodash-unified-1.0.3.tgz", - "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==", - "requires": {} + "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==" }, "lodash.camelcase": { "version": "4.3.0", @@ -7894,8 +7899,7 @@ "vue-demi": { "version": "0.13.5", "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.5.tgz", - "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==", - "requires": {} + "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==" } } }, diff --git a/package.json b/package.json index a096642..0f3893d 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", diff --git a/src/pages/views/WatershedOneMap/OneMapModal.vue b/src/pages/views/WatershedOneMap/OneMapModal.vue index b4f4e48..861db2b 100644 --- a/src/pages/views/WatershedOneMap/OneMapModal.vue +++ b/src/pages/views/WatershedOneMap/OneMapModal.vue @@ -94,13 +94,41 @@ + +
+
+
后湖泵站模型
+ + + +
+ +
+
+
+
+
{{ item.name }}
+
    +
  • + {{ v.pointName }} + {{ v.value }} +
  • +
+
+
+
+
+
+
- diff --git a/src/pages/views/WatershedOneMap/modalPart/Popup.vue b/src/pages/views/WatershedOneMap/modalPart/Popup.vue index 77eea0d..46a5863 100644 --- a/src/pages/views/WatershedOneMap/modalPart/Popup.vue +++ b/src/pages/views/WatershedOneMap/modalPart/Popup.vue @@ -102,6 +102,9 @@
查看工艺图
+
+
查看模型
+
降雨历史数据:
@@ -220,6 +223,10 @@ async function checkGyt(popupInfo) { bus.emit('getGongYt', popupInfo); } + + const handlesweath = (data) => { + bus.emit('weather', data); + }; // 降雨历史数据 const echartRain = async () => { let chart = document.getElementById('echartHistory'); @@ -297,6 +304,7 @@ ...toRefs(allData), closepopupdefect, checkGyt, + handlesweath, }; }, }); diff --git a/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue b/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue new file mode 100644 index 0000000..993d0af --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue @@ -0,0 +1,599 @@ + + + diff --git a/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue b/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue new file mode 100644 index 0000000..8b4cac2 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue @@ -0,0 +1,652 @@ + + + diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue b/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue index 4383d0d..dd36bc9 100644 --- a/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue +++ b/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue @@ -1,304 +1,374 @@ - - diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/HPModal b/src/pages/views/WatershedOneMap/modalPart/modal/HPModal new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/modal/HPModal diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/nldModal/HPModal.VUE b/src/pages/views/WatershedOneMap/modalPart/modal/nldModal/HPModal.VUE new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/modal/nldModal/HPModal.VUE diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/video.vue b/src/pages/views/WatershedOneMap/modalPart/modal/video.vue new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/modal/video.vue diff --git a/src/pages/views/WatershedOneMap/modalPart/rainTz.vue b/src/pages/views/WatershedOneMap/modalPart/rainTz.vue index 96c9f9e..80d3880 100644 --- a/src/pages/views/WatershedOneMap/modalPart/rainTz.vue +++ b/src/pages/views/WatershedOneMap/modalPart/rainTz.vue @@ -3,6 +3,7 @@
+
气象信息
@@ -335,7 +336,9 @@ destination: Cesium.Cartesian3.fromDegrees(row.LNG, row.LAT, 3000.0), }); }; - + const handlesweath = (data) => { + bus.emit('weather', data); + }; onMounted(() => { getRainList(); //获取雨量站列表 getWaterLoging(); //积水点 @@ -380,6 +383,7 @@ getNowImage, getWaterLoging, handleRowClick, + handlesweath, }; }, }; diff --git a/src/pages/views/WatershedOneMap/newPart/Popup.vue b/src/pages/views/WatershedOneMap/newPart/Popup.vue index 6604c45..0dad787 100644 --- a/src/pages/views/WatershedOneMap/newPart/Popup.vue +++ b/src/pages/views/WatershedOneMap/newPart/Popup.vue @@ -73,7 +73,7 @@
-
查看工艺图
+
查看工艺图
diff --git a/package-lock.json b/package-lock.json index 194a73a..5b0cf78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", @@ -1080,12 +1081,14 @@ "node_modules/@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "node_modules/@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "dependencies": { "@types/lodash": "*" } @@ -2731,6 +2734,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "node_modules/gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -5401,15 +5409,13 @@ "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/plugin-bem/-/plugin-bem-0.15.10.tgz", "integrity": "sha512-V7b08sM2PWJlXI7BJiVIa0Sg30H3u/jHay4AclNXfF2yRFwwb4ZJjggsMfzwj3WSihAdNf2WTqvOU5qsOD80Dg==", - "dev": true, - "requires": {} + "dev": true }, "@css-render/vue3-ssr": { "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/vue3-ssr/-/vue3-ssr-0.15.10.tgz", "integrity": "sha512-keGKnkB2nyVGoA8GezMKNsmvTGXEzgLOGGlgshwOTSEzd1dsROyZ2m/khJ9jV5zbzDM4rWeAWbWF0zwHemsJcw==", - "dev": true, - "requires": {} + "dev": true }, "@emotion/hash": { "version": "0.8.0", @@ -5841,12 +5847,14 @@ "@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "requires": { "@types/lodash": "*" } @@ -5963,8 +5971,7 @@ "version": "1.10.2", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-1.10.2.tgz", "integrity": "sha512-/QJ0Z9qfhAFtKRY+r57ziY4BSbGUTGsPRMpB/Ron3QPwBZM4OZAZHdTa4a8PafCwU5DTatXG8TMDoP8z+oDqJw==", - "dev": true, - "requires": {} + "dev": true }, "@vitejs/plugin-vue-jsx": { "version": "1.3.10", @@ -6167,32 +6174,27 @@ "@wangeditor/editor-for-vue": { "version": "5.1.12", "resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz", - "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==", - "requires": {} + "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==" }, "@wangeditor/list-module": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.2.tgz", - "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==", - "requires": {} + "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==" }, "@wangeditor/table-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.1.tgz", - "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==", - "requires": {} + "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==" }, "@wangeditor/upload-image-module": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.1.tgz", - "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==", - "requires": {} + "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==" }, "@wangeditor/video-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.1.tgz", - "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==", - "requires": {} + "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==" }, "@xmldom/xmldom": { "version": "0.8.10", @@ -6523,8 +6525,7 @@ "version": "1.3.4", "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.4.tgz", "integrity": "sha512-O47vEyz85F2ax/ZdhMBJo187RivZGjH6V0cPjPzpm/yi6YffJg4upD/8ibezO11ezZwP3QYlBHh/t4JhRNx0Ow==", - "dev": true, - "requires": {} + "dev": true }, "debug": { "version": "4.3.4", @@ -7034,6 +7035,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -7451,8 +7457,7 @@ "lodash-unified": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/lodash-unified/-/lodash-unified-1.0.3.tgz", - "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==", - "requires": {} + "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==" }, "lodash.camelcase": { "version": "4.3.0", @@ -7894,8 +7899,7 @@ "vue-demi": { "version": "0.13.5", "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.5.tgz", - "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==", - "requires": {} + "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==" } } }, diff --git a/package.json b/package.json index a096642..0f3893d 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", diff --git a/src/pages/views/WatershedOneMap/OneMapModal.vue b/src/pages/views/WatershedOneMap/OneMapModal.vue index b4f4e48..861db2b 100644 --- a/src/pages/views/WatershedOneMap/OneMapModal.vue +++ b/src/pages/views/WatershedOneMap/OneMapModal.vue @@ -94,13 +94,41 @@ + +
+
+
后湖泵站模型
+ + + +
+ +
+
+
+
+
{{ item.name }}
+
    +
  • + {{ v.pointName }} + {{ v.value }} +
  • +
+
+
+
+
+
+
- diff --git a/src/pages/views/WatershedOneMap/modalPart/Popup.vue b/src/pages/views/WatershedOneMap/modalPart/Popup.vue index 77eea0d..46a5863 100644 --- a/src/pages/views/WatershedOneMap/modalPart/Popup.vue +++ b/src/pages/views/WatershedOneMap/modalPart/Popup.vue @@ -102,6 +102,9 @@
查看工艺图
+
+
查看模型
+
降雨历史数据:
@@ -220,6 +223,10 @@ async function checkGyt(popupInfo) { bus.emit('getGongYt', popupInfo); } + + const handlesweath = (data) => { + bus.emit('weather', data); + }; // 降雨历史数据 const echartRain = async () => { let chart = document.getElementById('echartHistory'); @@ -297,6 +304,7 @@ ...toRefs(allData), closepopupdefect, checkGyt, + handlesweath, }; }, }); diff --git a/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue b/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue new file mode 100644 index 0000000..993d0af --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue @@ -0,0 +1,599 @@ + + + diff --git a/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue b/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue new file mode 100644 index 0000000..8b4cac2 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue @@ -0,0 +1,652 @@ + + + diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue b/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue index 4383d0d..dd36bc9 100644 --- a/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue +++ b/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue @@ -1,304 +1,374 @@ - - diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/HPModal b/src/pages/views/WatershedOneMap/modalPart/modal/HPModal new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/modal/HPModal diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/nldModal/HPModal.VUE b/src/pages/views/WatershedOneMap/modalPart/modal/nldModal/HPModal.VUE new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/modal/nldModal/HPModal.VUE diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/video.vue b/src/pages/views/WatershedOneMap/modalPart/modal/video.vue new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/modal/video.vue diff --git a/src/pages/views/WatershedOneMap/modalPart/rainTz.vue b/src/pages/views/WatershedOneMap/modalPart/rainTz.vue index 96c9f9e..80d3880 100644 --- a/src/pages/views/WatershedOneMap/modalPart/rainTz.vue +++ b/src/pages/views/WatershedOneMap/modalPart/rainTz.vue @@ -3,6 +3,7 @@
+
气象信息
@@ -335,7 +336,9 @@ destination: Cesium.Cartesian3.fromDegrees(row.LNG, row.LAT, 3000.0), }); }; - + const handlesweath = (data) => { + bus.emit('weather', data); + }; onMounted(() => { getRainList(); //获取雨量站列表 getWaterLoging(); //积水点 @@ -380,6 +383,7 @@ getNowImage, getWaterLoging, handleRowClick, + handlesweath, }; }, }; diff --git a/src/pages/views/WatershedOneMap/newPart/Popup.vue b/src/pages/views/WatershedOneMap/newPart/Popup.vue index 6604c45..0dad787 100644 --- a/src/pages/views/WatershedOneMap/newPart/Popup.vue +++ b/src/pages/views/WatershedOneMap/newPart/Popup.vue @@ -73,7 +73,7 @@
-
查看工艺图
+
查看工艺图
diff --git a/src/router/index.js b/src/router/index.js index be06e0f..9d6f55a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -42,7 +42,7 @@ path: '/ShugjOneMap', name: 'ShugjOneMap', component: () => import('@/pages/views/WatershedOneMap/OneMapModal.vue'), - },{ + }, { path: '/test', name: 'tileset', component: () => import('@/pages/views/Mapbox.vue'), diff --git a/package-lock.json b/package-lock.json index 194a73a..5b0cf78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", @@ -1080,12 +1081,14 @@ "node_modules/@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "node_modules/@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "dependencies": { "@types/lodash": "*" } @@ -2731,6 +2734,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "node_modules/gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -5401,15 +5409,13 @@ "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/plugin-bem/-/plugin-bem-0.15.10.tgz", "integrity": "sha512-V7b08sM2PWJlXI7BJiVIa0Sg30H3u/jHay4AclNXfF2yRFwwb4ZJjggsMfzwj3WSihAdNf2WTqvOU5qsOD80Dg==", - "dev": true, - "requires": {} + "dev": true }, "@css-render/vue3-ssr": { "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/vue3-ssr/-/vue3-ssr-0.15.10.tgz", "integrity": "sha512-keGKnkB2nyVGoA8GezMKNsmvTGXEzgLOGGlgshwOTSEzd1dsROyZ2m/khJ9jV5zbzDM4rWeAWbWF0zwHemsJcw==", - "dev": true, - "requires": {} + "dev": true }, "@emotion/hash": { "version": "0.8.0", @@ -5841,12 +5847,14 @@ "@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "requires": { "@types/lodash": "*" } @@ -5963,8 +5971,7 @@ "version": "1.10.2", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-1.10.2.tgz", "integrity": "sha512-/QJ0Z9qfhAFtKRY+r57ziY4BSbGUTGsPRMpB/Ron3QPwBZM4OZAZHdTa4a8PafCwU5DTatXG8TMDoP8z+oDqJw==", - "dev": true, - "requires": {} + "dev": true }, "@vitejs/plugin-vue-jsx": { "version": "1.3.10", @@ -6167,32 +6174,27 @@ "@wangeditor/editor-for-vue": { "version": "5.1.12", "resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz", - "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==", - "requires": {} + "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==" }, "@wangeditor/list-module": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.2.tgz", - "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==", - "requires": {} + "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==" }, "@wangeditor/table-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.1.tgz", - "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==", - "requires": {} + "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==" }, "@wangeditor/upload-image-module": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.1.tgz", - "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==", - "requires": {} + "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==" }, "@wangeditor/video-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.1.tgz", - "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==", - "requires": {} + "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==" }, "@xmldom/xmldom": { "version": "0.8.10", @@ -6523,8 +6525,7 @@ "version": "1.3.4", "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.4.tgz", "integrity": "sha512-O47vEyz85F2ax/ZdhMBJo187RivZGjH6V0cPjPzpm/yi6YffJg4upD/8ibezO11ezZwP3QYlBHh/t4JhRNx0Ow==", - "dev": true, - "requires": {} + "dev": true }, "debug": { "version": "4.3.4", @@ -7034,6 +7035,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -7451,8 +7457,7 @@ "lodash-unified": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/lodash-unified/-/lodash-unified-1.0.3.tgz", - "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==", - "requires": {} + "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==" }, "lodash.camelcase": { "version": "4.3.0", @@ -7894,8 +7899,7 @@ "vue-demi": { "version": "0.13.5", "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.5.tgz", - "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==", - "requires": {} + "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==" } } }, diff --git a/package.json b/package.json index a096642..0f3893d 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", diff --git a/src/pages/views/WatershedOneMap/OneMapModal.vue b/src/pages/views/WatershedOneMap/OneMapModal.vue index b4f4e48..861db2b 100644 --- a/src/pages/views/WatershedOneMap/OneMapModal.vue +++ b/src/pages/views/WatershedOneMap/OneMapModal.vue @@ -94,13 +94,41 @@ + +
+
+
后湖泵站模型
+ + + +
+ +
+
+
+
+
{{ item.name }}
+
    +
  • + {{ v.pointName }} + {{ v.value }} +
  • +
+
+
+
+
+
+
- diff --git a/src/pages/views/WatershedOneMap/modalPart/Popup.vue b/src/pages/views/WatershedOneMap/modalPart/Popup.vue index 77eea0d..46a5863 100644 --- a/src/pages/views/WatershedOneMap/modalPart/Popup.vue +++ b/src/pages/views/WatershedOneMap/modalPart/Popup.vue @@ -102,6 +102,9 @@
查看工艺图
+
+
查看模型
+
降雨历史数据:
@@ -220,6 +223,10 @@ async function checkGyt(popupInfo) { bus.emit('getGongYt', popupInfo); } + + const handlesweath = (data) => { + bus.emit('weather', data); + }; // 降雨历史数据 const echartRain = async () => { let chart = document.getElementById('echartHistory'); @@ -297,6 +304,7 @@ ...toRefs(allData), closepopupdefect, checkGyt, + handlesweath, }; }, }); diff --git a/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue b/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue new file mode 100644 index 0000000..993d0af --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue @@ -0,0 +1,599 @@ + + + diff --git a/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue b/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue new file mode 100644 index 0000000..8b4cac2 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue @@ -0,0 +1,652 @@ + + + diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue b/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue index 4383d0d..dd36bc9 100644 --- a/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue +++ b/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue @@ -1,304 +1,374 @@ - - diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/HPModal b/src/pages/views/WatershedOneMap/modalPart/modal/HPModal new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/modal/HPModal diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/nldModal/HPModal.VUE b/src/pages/views/WatershedOneMap/modalPart/modal/nldModal/HPModal.VUE new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/modal/nldModal/HPModal.VUE diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/video.vue b/src/pages/views/WatershedOneMap/modalPart/modal/video.vue new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/modal/video.vue diff --git a/src/pages/views/WatershedOneMap/modalPart/rainTz.vue b/src/pages/views/WatershedOneMap/modalPart/rainTz.vue index 96c9f9e..80d3880 100644 --- a/src/pages/views/WatershedOneMap/modalPart/rainTz.vue +++ b/src/pages/views/WatershedOneMap/modalPart/rainTz.vue @@ -3,6 +3,7 @@
+
气象信息
@@ -335,7 +336,9 @@ destination: Cesium.Cartesian3.fromDegrees(row.LNG, row.LAT, 3000.0), }); }; - + const handlesweath = (data) => { + bus.emit('weather', data); + }; onMounted(() => { getRainList(); //获取雨量站列表 getWaterLoging(); //积水点 @@ -380,6 +383,7 @@ getNowImage, getWaterLoging, handleRowClick, + handlesweath, }; }, }; diff --git a/src/pages/views/WatershedOneMap/newPart/Popup.vue b/src/pages/views/WatershedOneMap/newPart/Popup.vue index 6604c45..0dad787 100644 --- a/src/pages/views/WatershedOneMap/newPart/Popup.vue +++ b/src/pages/views/WatershedOneMap/newPart/Popup.vue @@ -73,7 +73,7 @@
-
查看工艺图
+
查看工艺图
diff --git a/src/router/index.js b/src/router/index.js index be06e0f..9d6f55a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -42,7 +42,7 @@ path: '/ShugjOneMap', name: 'ShugjOneMap', component: () => import('@/pages/views/WatershedOneMap/OneMapModal.vue'), - },{ + }, { path: '/test', name: 'tileset', component: () => import('@/pages/views/Mapbox.vue'), diff --git a/vite.config.js b/vite.config.js index 9182c91..0a120c4 100644 --- a/vite.config.js +++ b/vite.config.js @@ -44,6 +44,16 @@ changeOrigin: true, rewrite: (path) => path.replace(/^\/api/, ''), }, + '/modelFiles': { + target: 'http://192.168.10.48:8869/modelFiles', //陈迁 16.100 + changeOrigin: true, + rewrite: (path) => path.replace(/^\/modelFiles/, ''), + }, + '/modelFilesJson': { + target: 'http://192.168.10.48:8869/modelFilesJson', //陈迁 16.100 + changeOrigin: true, + rewrite: (path) => path.replace(/^\/modelFilesJson/, ''), + }, '/huangji_v1': { // target: 'http://192.168.16.100:6068/huangji_v1/', //陈迁 16.100 target: 'http://192.168.10.48:8869/huangji_v1', //陈迁 16.100 diff --git a/package-lock.json b/package-lock.json index 194a73a..5b0cf78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", @@ -1080,12 +1081,14 @@ "node_modules/@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "node_modules/@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "dependencies": { "@types/lodash": "*" } @@ -2731,6 +2734,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "node_modules/gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -5401,15 +5409,13 @@ "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/plugin-bem/-/plugin-bem-0.15.10.tgz", "integrity": "sha512-V7b08sM2PWJlXI7BJiVIa0Sg30H3u/jHay4AclNXfF2yRFwwb4ZJjggsMfzwj3WSihAdNf2WTqvOU5qsOD80Dg==", - "dev": true, - "requires": {} + "dev": true }, "@css-render/vue3-ssr": { "version": "0.15.10", "resolved": "https://registry.npmjs.org/@css-render/vue3-ssr/-/vue3-ssr-0.15.10.tgz", "integrity": "sha512-keGKnkB2nyVGoA8GezMKNsmvTGXEzgLOGGlgshwOTSEzd1dsROyZ2m/khJ9jV5zbzDM4rWeAWbWF0zwHemsJcw==", - "dev": true, - "requires": {} + "dev": true }, "@emotion/hash": { "version": "0.8.0", @@ -5841,12 +5847,14 @@ "@types/lodash": { "version": "4.14.182", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz", - "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==" + "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==", + "dev": true }, "@types/lodash-es": { "version": "4.17.6", "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "dev": true, "requires": { "@types/lodash": "*" } @@ -5963,8 +5971,7 @@ "version": "1.10.2", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-1.10.2.tgz", "integrity": "sha512-/QJ0Z9qfhAFtKRY+r57ziY4BSbGUTGsPRMpB/Ron3QPwBZM4OZAZHdTa4a8PafCwU5DTatXG8TMDoP8z+oDqJw==", - "dev": true, - "requires": {} + "dev": true }, "@vitejs/plugin-vue-jsx": { "version": "1.3.10", @@ -6167,32 +6174,27 @@ "@wangeditor/editor-for-vue": { "version": "5.1.12", "resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz", - "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==", - "requires": {} + "integrity": "sha512-0Ds3D8I+xnpNWezAeO7HmPRgTfUxHLMd9JKcIw+QzvSmhC5xUHbpCcLU+KLmeBKTR/zffnS5GQo6qi3GhTMJWQ==" }, "@wangeditor/list-module": { "version": "1.0.2", "resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.2.tgz", - "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==", - "requires": {} + "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==" }, "@wangeditor/table-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.1.tgz", - "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==", - "requires": {} + "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==" }, "@wangeditor/upload-image-module": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.1.tgz", - "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==", - "requires": {} + "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==" }, "@wangeditor/video-module": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.1.tgz", - "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==", - "requires": {} + "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==" }, "@xmldom/xmldom": { "version": "0.8.10", @@ -6523,8 +6525,7 @@ "version": "1.3.4", "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.4.tgz", "integrity": "sha512-O47vEyz85F2ax/ZdhMBJo187RivZGjH6V0cPjPzpm/yi6YffJg4upD/8ibezO11ezZwP3QYlBHh/t4JhRNx0Ow==", - "dev": true, - "requires": {} + "dev": true }, "debug": { "version": "4.3.4", @@ -7034,6 +7035,11 @@ "resolved": "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz", "integrity": "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" }, + "gsap": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz", + "integrity": "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -7451,8 +7457,7 @@ "lodash-unified": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/lodash-unified/-/lodash-unified-1.0.3.tgz", - "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==", - "requires": {} + "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==" }, "lodash.camelcase": { "version": "4.3.0", @@ -7894,8 +7899,7 @@ "vue-demi": { "version": "0.13.5", "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.5.tgz", - "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==", - "requires": {} + "integrity": "sha512-tO3K2bML3AwiHmVHeKCq6HLef2st4zBXIV5aEkoJl6HZ+gJWxWv2O8wLH8qrA3SX3lDoTDHNghLX1xZg83MXvw==" } } }, diff --git a/package.json b/package.json index a096642..0f3893d 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "cesium": "^1.117.0", "echarts": "^5.2.2", "esbuild-windows-64": "^0.14.11", + "gsap": "^3.9.1", "highcharts": "^9.3.2", "hls.js": "^1.5.13", "import-three-examples": "^2.2.4", diff --git a/src/pages/views/WatershedOneMap/OneMapModal.vue b/src/pages/views/WatershedOneMap/OneMapModal.vue index b4f4e48..861db2b 100644 --- a/src/pages/views/WatershedOneMap/OneMapModal.vue +++ b/src/pages/views/WatershedOneMap/OneMapModal.vue @@ -94,13 +94,41 @@ + +
+
+
后湖泵站模型
+ + + +
+ +
+
+
+
+
{{ item.name }}
+
    +
  • + {{ v.pointName }} + {{ v.value }} +
  • +
+
+
+
+
+
+
- diff --git a/src/pages/views/WatershedOneMap/modalPart/Popup.vue b/src/pages/views/WatershedOneMap/modalPart/Popup.vue index 77eea0d..46a5863 100644 --- a/src/pages/views/WatershedOneMap/modalPart/Popup.vue +++ b/src/pages/views/WatershedOneMap/modalPart/Popup.vue @@ -102,6 +102,9 @@
查看工艺图
+
+
查看模型
+
降雨历史数据:
@@ -220,6 +223,10 @@ async function checkGyt(popupInfo) { bus.emit('getGongYt', popupInfo); } + + const handlesweath = (data) => { + bus.emit('weather', data); + }; // 降雨历史数据 const echartRain = async () => { let chart = document.getElementById('echartHistory'); @@ -297,6 +304,7 @@ ...toRefs(allData), closepopupdefect, checkGyt, + handlesweath, }; }, }); diff --git a/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue b/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue new file mode 100644 index 0000000..993d0af --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/cbwsc.vue @@ -0,0 +1,599 @@ + + + diff --git a/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue b/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue new file mode 100644 index 0000000..8b4cac2 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/cbwsc1.vue @@ -0,0 +1,652 @@ + + + diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue b/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue index 4383d0d..dd36bc9 100644 --- a/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue +++ b/src/pages/views/WatershedOneMap/modalPart/modal/Bzhk.vue @@ -1,304 +1,374 @@ - - diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/HPModal b/src/pages/views/WatershedOneMap/modalPart/modal/HPModal new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/modal/HPModal diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/nldModal/HPModal.VUE b/src/pages/views/WatershedOneMap/modalPart/modal/nldModal/HPModal.VUE new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/modal/nldModal/HPModal.VUE diff --git a/src/pages/views/WatershedOneMap/modalPart/modal/video.vue b/src/pages/views/WatershedOneMap/modalPart/modal/video.vue new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/pages/views/WatershedOneMap/modalPart/modal/video.vue diff --git a/src/pages/views/WatershedOneMap/modalPart/rainTz.vue b/src/pages/views/WatershedOneMap/modalPart/rainTz.vue index 96c9f9e..80d3880 100644 --- a/src/pages/views/WatershedOneMap/modalPart/rainTz.vue +++ b/src/pages/views/WatershedOneMap/modalPart/rainTz.vue @@ -3,6 +3,7 @@
+
气象信息
@@ -335,7 +336,9 @@ destination: Cesium.Cartesian3.fromDegrees(row.LNG, row.LAT, 3000.0), }); }; - + const handlesweath = (data) => { + bus.emit('weather', data); + }; onMounted(() => { getRainList(); //获取雨量站列表 getWaterLoging(); //积水点 @@ -380,6 +383,7 @@ getNowImage, getWaterLoging, handleRowClick, + handlesweath, }; }, }; diff --git a/src/pages/views/WatershedOneMap/newPart/Popup.vue b/src/pages/views/WatershedOneMap/newPart/Popup.vue index 6604c45..0dad787 100644 --- a/src/pages/views/WatershedOneMap/newPart/Popup.vue +++ b/src/pages/views/WatershedOneMap/newPart/Popup.vue @@ -73,7 +73,7 @@
-
查看工艺图
+
查看工艺图
diff --git a/src/router/index.js b/src/router/index.js index be06e0f..9d6f55a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -42,7 +42,7 @@ path: '/ShugjOneMap', name: 'ShugjOneMap', component: () => import('@/pages/views/WatershedOneMap/OneMapModal.vue'), - },{ + }, { path: '/test', name: 'tileset', component: () => import('@/pages/views/Mapbox.vue'), diff --git a/vite.config.js b/vite.config.js index 9182c91..0a120c4 100644 --- a/vite.config.js +++ b/vite.config.js @@ -44,6 +44,16 @@ changeOrigin: true, rewrite: (path) => path.replace(/^\/api/, ''), }, + '/modelFiles': { + target: 'http://192.168.10.48:8869/modelFiles', //陈迁 16.100 + changeOrigin: true, + rewrite: (path) => path.replace(/^\/modelFiles/, ''), + }, + '/modelFilesJson': { + target: 'http://192.168.10.48:8869/modelFilesJson', //陈迁 16.100 + changeOrigin: true, + rewrite: (path) => path.replace(/^\/modelFilesJson/, ''), + }, '/huangji_v1': { // target: 'http://192.168.16.100:6068/huangji_v1/', //陈迁 16.100 target: 'http://192.168.10.48:8869/huangji_v1', //陈迁 16.100 diff --git a/yarn.lock b/yarn.lock index 2cc9fca..716e8c2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -27,7 +27,7 @@ "resolved" "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz" "version" "7.17.10" -"@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.17.9": +"@babel/core@^7.17.9": "integrity" "sha512-44ODe6O1IVz9s2oJE3rZ4trNNKTX9O7KpQpfAP4t8QII/zwrVRHL7i2pxhqtcY7tqMLrrKfMlBKnm1QlrRFs5w==" "resolved" "https://registry.npmjs.org/@babel/core/-/core-7.17.12.tgz" "version" "7.17.12" @@ -708,7 +708,7 @@ "jest-matcher-utils" "^27.0.0" "pretty-format" "^27.0.0" -"@types/lodash-es@*", "@types/lodash-es@^4.17.6": +"@types/lodash-es@^4.17.6": "integrity" "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==" "resolved" "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz" "version" "4.17.6" @@ -745,7 +745,7 @@ "@uppy/utils" "^4.1.0" "namespace-emitter" "^2.0.1" -"@uppy/core@^2.0.3", "@uppy/core@^2.1.1", "@uppy/core@^2.1.4", "@uppy/core@^2.3.1": +"@uppy/core@^2.1.1": "integrity" "sha512-CHNWn5B9trBw28SWO/BQnQzhKne/U5npSnfK9SZfnAL4A/nTFX9jrznBkmS8wulVarDpavfj8+BA9kjzExFBfg==" "resolved" "https://registry.npmmirror.com/@uppy/core/-/core-2.3.2.tgz" "version" "2.3.2" @@ -771,7 +771,7 @@ dependencies: "lodash.throttle" "^4.1.1" -"@uppy/xhr-upload@^2.0.3", "@uppy/xhr-upload@^2.0.7": +"@uppy/xhr-upload@^2.0.3": "integrity" "sha512-VCsb7J5yHsof49nnUa+Y1n27UMtqHPttQmmoCa5hmjqa9R7ZISpBkXKOQmZo526eopKNuAKSAdkHWfCm8efJTA==" "resolved" "https://registry.npmmirror.com/@uppy/xhr-upload/-/xhr-upload-2.1.2.tgz" "version" "2.1.2" @@ -963,7 +963,7 @@ "resolved" "https://registry.npmjs.org/@vue/shared/-/shared-3.2.33.tgz" "version" "3.2.33" -"@wangeditor/basic-modules@^1.1.3", "@wangeditor/basic-modules@1.x": +"@wangeditor/basic-modules@^1.1.3": "integrity" "sha512-TGJix4UelO46yAgwI946ctx4lSIJbYBwNvjSJ9Tf8mKr0WMCeLVBV+MV85rXPsfcmWtR4wBNwSg648Z+RbqRUg==" "resolved" "https://registry.npmmirror.com/@wangeditor/basic-modules/-/basic-modules-1.1.3.tgz" "version" "1.1.3" @@ -977,7 +977,7 @@ dependencies: "prismjs" "^1.23.0" -"@wangeditor/core@^1.1.11", "@wangeditor/core@1.x": +"@wangeditor/core@^1.1.11": "integrity" "sha512-BwHVRJzESnkjKikTc2U2zsbd06l1pSo7qKy5+SpZLudYWrFxmd85VN+5GxM57FodogkNw/k04DFHcFSUfXcaKA==" "resolved" "https://registry.npmmirror.com/@wangeditor/core/-/core-1.1.11.tgz" "version" "1.1.11" @@ -994,7 +994,7 @@ "resolved" "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-5.1.12.tgz" "version" "5.1.12" -"@wangeditor/editor@^5.1.7", "@wangeditor/editor@>=5.1.0": +"@wangeditor/editor@^5.1.7": "integrity" "sha512-erILPAkpKldyGi4cEwrOW65v12GhZy2qj2A8kPlypU46lE72Y3XowZxWogN1TI/mqMDR84AHr0QWOvygOV1xwQ==" "resolved" "https://registry.npmmirror.com/@wangeditor/editor/-/editor-5.1.14.tgz" "version" "5.1.14" @@ -1302,7 +1302,7 @@ "shebang-command" "^2.0.0" "which" "^2.0.1" -"css-render@^0.15.7", "css-render@^0.15.9", "css-render@~0.15.10": +"css-render@^0.15.7", "css-render@^0.15.9": "integrity" "sha512-6j5acvm81sXTHJiF47FNNICtDpF74YoWk1xEK3qQvdqgW6vc+OXrPqflL6m8f5GE6XuFYrbACNEd17kraCSBAQ==" "resolved" "https://registry.npmjs.org/css-render/-/css-render-0.15.10.tgz" "version" "0.15.10" @@ -1339,7 +1339,7 @@ "resolved" "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.4.tgz" "version" "1.3.4" -"date-fns@^2.28.0", "date-fns@>=2.0.0": +"date-fns@^2.28.0": "integrity" "sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw==" "resolved" "https://registry.npmjs.org/date-fns/-/date-fns-2.28.0.tgz" "version" "2.28.0" @@ -1669,6 +1669,11 @@ "resolved" "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz" "version" "1.1.0" +"gsap@^3.9.1": + "integrity" "sha512-JSGVYoC6da4pIjdF/yxFU6Rz8OojOIDkbooveZlfNg0+JIoFoRruyfWAEi6R/gUeNcuOiTqUIb0gi1nCNrHf8w==" + "resolved" "https://registry.npmjs.org/gsap/-/gsap-3.9.1.tgz" + "version" "3.9.1" + "has-flag@^3.0.0": "integrity" "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" "resolved" "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz" @@ -1924,7 +1929,7 @@ dependencies: "klona" "^2.0.4" -"less@*", "less@^3.5.0 || ^4.0.0", "less@^4.1.1": +"less@^4.1.1": "integrity" "sha512-EoQp/Et7OSOVu0aJknJOtlXZsnr8XE8KwuzTHOLeVSEx8pVWUICc8Q0VYRHgzyjX78nMEyC/oztWFbgyhtNfDA==" "resolved" "https://registry.npmjs.org/less/-/less-4.1.2.tgz" "version" "4.1.2" @@ -1941,7 +1946,7 @@ "needle" "^2.5.2" "source-map" "~0.6.0" -"lodash-es@*", "lodash-es@^4.17.21": +"lodash-es@^4.17.21": "integrity" "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" "resolved" "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz" "version" "4.17.21" @@ -1986,7 +1991,7 @@ "resolved" "https://registry.npmmirror.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz" "version" "4.4.0" -"lodash@*", "lodash@^4.17.21": +"lodash@^4.17.21": "integrity" "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" "resolved" "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" "version" "4.17.21" @@ -2116,7 +2121,7 @@ "resolved" "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz" "version" "3.0.1" -"mockjs@^1.1.0", "mockjs@>=1.1.0": +"mockjs@^1.1.0": "integrity" "sha512-eQsKcWzIaZzEZ07NuEyO4Nw65g0hdWAyurVol1IPl1gahRwY+svqzfgfey8U8dahLwG44d6/RwEzuK52rSa/JQ==" "resolved" "https://registry.npmjs.org/mockjs/-/mockjs-1.1.0.tgz" "version" "1.1.0" @@ -2456,7 +2461,7 @@ "resolved" "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz" "version" "1.0.4" -"rollup@^1.20.0||^2.0.0", "rollup@^2.42.0", "rollup@^2.59.0": +"rollup@^2.59.0": "integrity" "sha512-h/UngC3S4Zt28mB3g0+2YCMegT5yoftnQplwzPqGZcKvlld5e+kT/QRmJiL+qxGyZKOYpgirWGdLyEO1b0dpLQ==" "resolved" "https://registry.npmjs.org/rollup/-/rollup-2.73.0.tgz" "version" "2.73.0" @@ -2552,7 +2557,7 @@ dependencies: "is-plain-object" "^5.0.0" -"slate@^0.72.0", "slate@>=0.65.3": +"slate@^0.72.0": "integrity" "sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==" "resolved" "https://registry.npmmirror.com/slate/-/slate-0.72.8.tgz" "version" "0.72.8" @@ -2771,7 +2776,7 @@ "resolved" "https://registry.npmjs.org/vfonts/-/vfonts-0.1.0.tgz" "version" "0.1.0" -"video.js@^7 || ^8", "video.js@^8", "video.js@^8.12.0": +"video.js@^7 || ^8", "video.js@^8.12.0": "integrity" "sha512-bLjfg3y09CAed1xZ4FujdTW7G9kgL0CJHaBnDKwBUgYuutijCutYPP5yQGCdN6VOi76uEuOpINwmTJSJia6zww==" "resolved" "https://registry.npmmirror.com/video.js/-/video.js-8.12.0.tgz" "version" "8.12.0" @@ -2834,7 +2839,7 @@ "fast-glob" "^3.2.7" "path-to-regexp" "^6.2.0" -"vite@^2.4.4", "vite@^2.5.10", "vite@>=2.0.0": +"vite@^2.4.4": "integrity" "sha512-ffaam+NgHfbEmfw/Vuh6BHKKlI/XIAhxE5QSS7gFLIngxg171mg1P3a4LSRME0z2ZU1ScxoKzphkipcYwSD5Ew==" "resolved" "https://registry.npmjs.org/vite/-/vite-2.9.9.tgz" "version" "2.9.9" @@ -2893,7 +2898,7 @@ dependencies: "@vue/devtools-api" "^6.0.0" -"vue@^2.6.12", "vue@^2.6.14 || ^3.2.0", "vue@^3.0.0", "vue@^3.0.0-0 || ^2.6.0", "vue@^3.0.11", "vue@^3.0.2", "vue@^3.0.5", "vue@^3.2.0", "vue@^3.2.2", "vue@^3.2.47", "vue@3.2.33": +"vue@^3.0.5", "vue@^3.2.2": "integrity" "sha512-si1ExAlDUrLSIg/V7D/GgA4twJwfsfgG+t9w10z38HhL/HA07132pUQ2KuwAo8qbCyMJ9e6OqrmWrOCr+jW7ZQ==" "resolved" "https://registry.npmjs.org/vue/-/vue-3.2.33.tgz" "version" "3.2.33"