From 2cd8209171418309770a43cc3354f940529804f9 Mon Sep 17 00:00:00 2001 From: duanxiaohai <1812246227@qq.com> Date: Wed, 25 Sep 2024 13:58:15 +0800 Subject: [PATCH 1/2] gx --- package-lock.json | 15 +++ package.json | 1 + src/view/login/LoginZZD.vue | 175 +++++++++++++++++++++++++++ src/view/sy_map.vue | 9 +- yarn.lock | 233 ++++++++++++------------------------ 5 files changed, 277 insertions(+), 156 deletions(-) create mode 100644 src/view/login/LoginZZD.vue diff --git a/package-lock.json b/package-lock.json index 9f32b46..f8d993f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,7 @@ "echarts-gl": "^2.0.9", "echarts-liquidfill": "^3.1.0", "element-plus": "^2.7.0", + "gdt-jsapi": "^1.9.51", "sass": "^1.60.0", "video.js": "^8.17.3", "videojs-contrib-hls": "^5.15.0", @@ -110,6 +111,11 @@ "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz", "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==" }, + "node_modules/@remax/mini-types": { + "version": "0.1.0", + "resolved": "https://registry.npmmirror.com/@remax/mini-types/-/mini-types-0.1.0.tgz", + "integrity": "sha512-bVDcbUrp6p0PZwfS0xGVQS6k9f8B35BtZaYt/W/IGKh7VALYQ+tS2KcytLRmIJ/Vmohaw5ikIRN89I+frPdh4g==" + }, "node_modules/@types/lodash": { "version": "4.17.1", "resolved": "https://registry.npmmirror.com/@types/lodash/-/lodash-4.17.1.tgz", @@ -736,6 +742,15 @@ "dev": true, "license": "MIT" }, + "node_modules/gdt-jsapi": { + "version": "1.9.51", + "resolved": "https://registry.npmmirror.com/gdt-jsapi/-/gdt-jsapi-1.9.51.tgz", + "integrity": "sha512-VN1iIK7kJU2g2oxY/n8waCREhWxcVwR8qHAE1keVnUJHI6mTdgTelICzq++niRRCaLqUVWC1pYvftEVgk4sq8A==", + "dependencies": { + "@babel/runtime": "^7.10.2", + "@remax/mini-types": "^0.1.0" + } + }, "node_modules/glob-parent": { "version": "5.1.2", "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz", diff --git a/package.json b/package.json index 2deb1d1..7edde68 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "echarts-gl": "^2.0.9", "echarts-liquidfill": "^3.1.0", "element-plus": "^2.7.0", + "gdt-jsapi": "^1.9.51", "sass": "^1.60.0", "video.js": "^8.17.3", "videojs-contrib-hls": "^5.15.0", diff --git a/src/view/login/LoginZZD.vue b/src/view/login/LoginZZD.vue new file mode 100644 index 0000000..6a1b987 --- /dev/null +++ b/src/view/login/LoginZZD.vue @@ -0,0 +1,175 @@ + + + + + \ No newline at end of file diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue index ee1ddf8..6d5d5e5 100644 --- a/src/view/sy_map.vue +++ b/src/view/sy_map.vue @@ -3229,20 +3229,25 @@ const createCustomOverlay = (polygon, indexx) => { function createLabelDOM() { var content = document.createElement("div"); content.style.display = "flex"; + content.style.justifyContent= "end"; content.style.flexDirection = "column"; content.style.alignItems = "center"; content.style.height = "40px"; - content.style.width = "40px"; + content.style.width = "140px"; content.style.zIndex = BMapGL.Overlay.getZIndex(this.point.lat); var div = document.createElement("div"); div.style.color = "#ddd"; div.style.padding = `${polygon.padding}`; - div.style.whiteSpace = "nowrap"; + // div.style.whiteSpace = "nowrap"; div.style.MozUserSelect = "none"; div.style.fontSize = "12px"; div.style.borderRadius = "10px"; div.style.display = "flex"; + + div.style.flexWrap = "wrap" + div.style.maxWidth = "90px" + div.style.justifyContent = "center"; div.style.alignItems = "center"; div.style.background = `url(${polygon.img}) no-repeat 0/100% 100%`; diff --git a/yarn.lock b/yarn.lock index 0ce46f8..00e9111 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,7 +7,7 @@ resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz" integrity sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ== -"@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.5.5": +"@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.5.5": version "7.25.4" resolved "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.25.4.tgz" integrity sha512-DSgLeL/FNcpXuzav5wfYvHCGvynXkJbn3Zvc3823AEe9nPwW9IK4UoCSS5yGymmQzN0pCPvivtgS6/8U2kkm1w== @@ -24,111 +24,6 @@ resolved "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.3.1.tgz" integrity sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg== -"@esbuild/android-arm64@0.17.14": - version "0.17.14" - resolved "https://registry.npmmirror.com/@esbuild/android-arm64/-/android-arm64-0.17.14.tgz#4624cea3c8941c91f9e9c1228f550d23f1cef037" - integrity sha512-eLOpPO1RvtsP71afiFTvS7tVFShJBCT0txiv/xjFBo5a7R7Gjw7X0IgIaFoLKhqXYAXhahoXm7qAmRXhY4guJg== - -"@esbuild/android-arm@0.17.14": - version "0.17.14" - resolved "https://registry.npmmirror.com/@esbuild/android-arm/-/android-arm-0.17.14.tgz#74fae60fcab34c3f0e15cb56473a6091ba2b53a6" - integrity sha512-0CnlwnjDU8cks0yJLXfkaU/uoLyRf9VZJs4p1PskBr2AlAHeEsFEwJEo0of/Z3g+ilw5mpyDwThlxzNEIxOE4g== - -"@esbuild/android-x64@0.17.14": - version "0.17.14" - resolved "https://registry.npmmirror.com/@esbuild/android-x64/-/android-x64-0.17.14.tgz#f002fbc08d5e939d8314bd23bcfb1e95d029491f" - integrity sha512-nrfQYWBfLGfSGLvRVlt6xi63B5IbfHm3tZCdu/82zuFPQ7zez4XjmRtF/wIRYbJQ/DsZrxJdEvYFE67avYXyng== - -"@esbuild/darwin-arm64@0.17.14": - version "0.17.14" - resolved "https://registry.npmmirror.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.14.tgz#b8dcd79a1dd19564950b4ca51d62999011e2e168" - integrity sha512-eoSjEuDsU1ROwgBH/c+fZzuSyJUVXQTOIN9xuLs9dE/9HbV/A5IqdXHU1p2OfIMwBwOYJ9SFVGGldxeRCUJFyw== - -"@esbuild/darwin-x64@0.17.14": - version "0.17.14" - resolved "https://registry.npmmirror.com/@esbuild/darwin-x64/-/darwin-x64-0.17.14.tgz#4b49f195d9473625efc3c773fc757018f2c0d979" - integrity sha512-zN0U8RWfrDttdFNkHqFYZtOH8hdi22z0pFm0aIJPsNC4QQZv7je8DWCX5iA4Zx6tRhS0CCc0XC2m7wKsbWEo5g== - -"@esbuild/freebsd-arm64@0.17.14": - version "0.17.14" - resolved "https://registry.npmmirror.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.14.tgz#480923fd38f644c6342c55e916cc7c231a85eeb7" - integrity sha512-z0VcD4ibeZWVQCW1O7szaLxGsx54gcCnajEJMdYoYjLiq4g1jrP2lMq6pk71dbS5+7op/L2Aod+erw+EUr28/A== - -"@esbuild/freebsd-x64@0.17.14": - version "0.17.14" - resolved "https://registry.npmmirror.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.14.tgz#a6b6b01954ad8562461cb8a5e40e8a860af69cbe" - integrity sha512-hd9mPcxfTgJlolrPlcXkQk9BMwNBvNBsVaUe5eNUqXut6weDQH8whcNaKNF2RO8NbpT6GY8rHOK2A9y++s+ehw== - -"@esbuild/linux-arm64@0.17.14": - version "0.17.14" - resolved "https://registry.npmmirror.com/@esbuild/linux-arm64/-/linux-arm64-0.17.14.tgz#1fe2f39f78183b59f75a4ad9c48d079916d92418" - integrity sha512-FhAMNYOq3Iblcj9i+K0l1Fp/MHt+zBeRu/Qkf0LtrcFu3T45jcwB6A1iMsemQ42vR3GBhjNZJZTaCe3VFPbn9g== - -"@esbuild/linux-arm@0.17.14": - version "0.17.14" - resolved "https://registry.npmmirror.com/@esbuild/linux-arm/-/linux-arm-0.17.14.tgz#18d594a49b64e4a3a05022c005cb384a58056a2a" - integrity sha512-BNTl+wSJ1omsH8s3TkQmIIIQHwvwJrU9u1ggb9XU2KTVM4TmthRIVyxSp2qxROJHhZuW/r8fht46/QE8hU8Qvg== - -"@esbuild/linux-ia32@0.17.14": - version "0.17.14" - resolved "https://registry.npmmirror.com/@esbuild/linux-ia32/-/linux-ia32-0.17.14.tgz#f7f0182a9cfc0159e0922ed66c805c9c6ef1b654" - integrity sha512-91OK/lQ5y2v7AsmnFT+0EyxdPTNhov3y2CWMdizyMfxSxRqHazXdzgBKtlmkU2KYIc+9ZK3Vwp2KyXogEATYxQ== - -"@esbuild/linux-loong64@0.17.14": - version "0.17.14" - resolved "https://registry.npmmirror.com/@esbuild/linux-loong64/-/linux-loong64-0.17.14.tgz#5f5305fdffe2d71dd9a97aa77d0c99c99409066f" - integrity sha512-vp15H+5NR6hubNgMluqqKza85HcGJgq7t6rMH7O3Y6ApiOWPkvW2AJfNojUQimfTp6OUrACUXfR4hmpcENXoMQ== - -"@esbuild/linux-mips64el@0.17.14": - version "0.17.14" - resolved "https://registry.npmmirror.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.14.tgz#a602e85c51b2f71d2aedfe7f4143b2f92f97f3f5" - integrity sha512-90TOdFV7N+fgi6c2+GO9ochEkmm9kBAKnuD5e08GQMgMINOdOFHuYLPQ91RYVrnWwQ5683sJKuLi9l4SsbJ7Hg== - -"@esbuild/linux-ppc64@0.17.14": - version "0.17.14" - resolved "https://registry.npmmirror.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.14.tgz#32d918d782105cbd9345dbfba14ee018b9c7afdf" - integrity sha512-NnBGeoqKkTugpBOBZZoktQQ1Yqb7aHKmHxsw43NddPB2YWLAlpb7THZIzsRsTr0Xw3nqiPxbA1H31ZMOG+VVPQ== - -"@esbuild/linux-riscv64@0.17.14": - version "0.17.14" - resolved "https://registry.npmmirror.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.14.tgz#38612e7b6c037dff7022c33f49ca17f85c5dec58" - integrity sha512-0qdlKScLXA8MGVy21JUKvMzCYWovctuP8KKqhtE5A6IVPq4onxXhSuhwDd2g5sRCzNDlDjitc5sX31BzDoL5Fw== - -"@esbuild/linux-s390x@0.17.14": - version "0.17.14" - resolved "https://registry.npmmirror.com/@esbuild/linux-s390x/-/linux-s390x-0.17.14.tgz#4397dff354f899e72fd035d72af59a700c465ccb" - integrity sha512-Hdm2Jo1yaaOro4v3+6/zJk6ygCqIZuSDJHdHaf8nVH/tfOuoEX5Riv03Ka15LmQBYJObUTNS1UdyoMk0WUn9Ww== - -"@esbuild/linux-x64@0.17.14": - version "0.17.14" - resolved "https://registry.npmmirror.com/@esbuild/linux-x64/-/linux-x64-0.17.14.tgz#6c5cb99891b6c3e0c08369da3ef465e8038ad9c2" - integrity sha512-8KHF17OstlK4DuzeF/KmSgzrTWQrkWj5boluiiq7kvJCiQVzUrmSkaBvcLB2UgHpKENO2i6BthPkmUhNDaJsVw== - -"@esbuild/netbsd-x64@0.17.14": - version "0.17.14" - resolved "https://registry.npmmirror.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.14.tgz#5fa5255a64e9bf3947c1b3bef5e458b50b211994" - integrity sha512-nVwpqvb3yyXztxIT2+VsxJhB5GCgzPdk1n0HHSnchRAcxqKO6ghXwHhJnr0j/B+5FSyEqSxF4q03rbA2fKXtUQ== - -"@esbuild/openbsd-x64@0.17.14": - version "0.17.14" - resolved "https://registry.npmmirror.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.14.tgz#74d14c79dcb6faf446878cc64284aa4e02f5ca6f" - integrity sha512-1RZ7uQQ9zcy/GSAJL1xPdN7NDdOOtNEGiJalg/MOzeakZeTrgH/DoCkbq7TaPDiPhWqnDF+4bnydxRqQD7il6g== - -"@esbuild/sunos-x64@0.17.14": - version "0.17.14" - resolved "https://registry.npmmirror.com/@esbuild/sunos-x64/-/sunos-x64-0.17.14.tgz#5c7d1c7203781d86c2a9b2ff77bd2f8036d24cfa" - integrity sha512-nqMjDsFwv7vp7msrwWRysnM38Sd44PKmW8EzV01YzDBTcTWUpczQg6mGao9VLicXSgW/iookNK6AxeogNVNDZA== - -"@esbuild/win32-arm64@0.17.14": - version "0.17.14" - resolved "https://registry.npmmirror.com/@esbuild/win32-arm64/-/win32-arm64-0.17.14.tgz#dc36ed84f1390e73b6019ccf0566c80045e5ca3d" - integrity sha512-xrD0mccTKRBBIotrITV7WVQAwNJ5+1va6L0H9zN92v2yEdjfAN7864cUaZwJS7JPEs53bDTzKFbfqVlG2HhyKQ== - -"@esbuild/win32-ia32@0.17.14": - version "0.17.14" - resolved "https://registry.npmmirror.com/@esbuild/win32-ia32/-/win32-ia32-0.17.14.tgz#0802a107afa9193c13e35de15a94fe347c588767" - integrity sha512-nXpkz9bbJrLLyUTYtRotSS3t5b+FOuljg8LgLdINWFs3FfqZMtbnBCZFUmBzQPyxqU87F8Av+3Nco/M3hEcu1w== - "@esbuild/win32-x64@0.17.14": version "0.17.14" resolved "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.14.tgz" @@ -159,7 +54,12 @@ resolved "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz" integrity sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ== -"@types/lodash-es@^4.17.6": +"@remax/mini-types@^0.1.0": + version "0.1.0" + resolved "https://registry.npmmirror.com/@remax/mini-types/-/mini-types-0.1.0.tgz" + integrity sha512-bVDcbUrp6p0PZwfS0xGVQS6k9f8B35BtZaYt/W/IGKh7VALYQ+tS2KcytLRmIJ/Vmohaw5ikIRN89I+frPdh4g== + +"@types/lodash-es@*", "@types/lodash-es@^4.17.6": version "4.17.12" resolved "https://registry.npmmirror.com/@types/lodash-es/-/lodash-es-4.17.12.tgz" integrity sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ== @@ -176,7 +76,7 @@ resolved "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz" integrity sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ== -"@videojs/http-streaming@3.13.2", "@videojs/http-streaming@^3.13.2": +"@videojs/http-streaming@^3.13.2", "@videojs/http-streaming@3.13.2": version "3.13.2" resolved "https://registry.npmmirror.com/@videojs/http-streaming/-/http-streaming-3.13.2.tgz" integrity sha512-eCfQp61w00hg7Y9npmLnsJ6UvDF+SsFYzu7mQJgVXxWpVm9AthYWA3KQEKA7F7Sy6yzlm/Sps8BHs5ItelNZgQ== @@ -190,19 +90,19 @@ mux.js "7.0.3" video.js "^7 || ^8" -"@videojs/vhs-utils@4.0.0", "@videojs/vhs-utils@^4.0.0": - version "4.0.0" - resolved "https://registry.npmmirror.com/@videojs/vhs-utils/-/vhs-utils-4.0.0.tgz" - integrity sha512-xJp7Yd4jMLwje2vHCUmi8MOUU76nxiwII3z4Eg3Ucb+6rrkFVGosrXlMgGnaLjq724j3wzNElRZ71D/CKrTtxg== +"@videojs/vhs-utils@^3.0.5": + version "3.0.5" + resolved "https://registry.npmmirror.com/@videojs/vhs-utils/-/vhs-utils-3.0.5.tgz" + integrity sha512-PKVgdo8/GReqdx512F+ombhS+Bzogiofy1LgAj4tN8PfdBx3HSS7V5WfJotKTqtOWGwVfSWsrYN/t09/DSryrw== dependencies: "@babel/runtime" "^7.12.5" global "^4.4.0" url-toolkit "^2.2.1" -"@videojs/vhs-utils@^3.0.5": - version "3.0.5" - resolved "https://registry.npmmirror.com/@videojs/vhs-utils/-/vhs-utils-3.0.5.tgz" - integrity sha512-PKVgdo8/GReqdx512F+ombhS+Bzogiofy1LgAj4tN8PfdBx3HSS7V5WfJotKTqtOWGwVfSWsrYN/t09/DSryrw== +"@videojs/vhs-utils@^4.0.0", "@videojs/vhs-utils@4.0.0": + version "4.0.0" + resolved "https://registry.npmmirror.com/@videojs/vhs-utils/-/vhs-utils-4.0.0.tgz" + integrity sha512-xJp7Yd4jMLwje2vHCUmi8MOUU76nxiwII3z4Eg3Ucb+6rrkFVGosrXlMgGnaLjq724j3wzNElRZ71D/CKrTtxg== dependencies: "@babel/runtime" "^7.12.5" global "^4.4.0" @@ -352,6 +252,16 @@ resolved "https://registry.npmmirror.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz" integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw== +aes-decrypter@^4.0.1: + version "4.0.2" + resolved "https://registry.npmmirror.com/aes-decrypter/-/aes-decrypter-4.0.2.tgz" + integrity sha512-lc+/9s6iJvuaRe5qDlMTpCFjnwpkeOXp8qP3oiZ5jsj1MRg+SBVUmmICrhxHvc8OELSmc+fEyyxAuppY6hrWzw== + dependencies: + "@babel/runtime" "^7.12.5" + "@videojs/vhs-utils" "^4.1.1" + global "^4.4.0" + pkcs7 "^1.0.4" + aes-decrypter@1.0.3: version "1.0.3" resolved "https://registry.npmmirror.com/aes-decrypter/-/aes-decrypter-1.0.3.tgz" @@ -369,16 +279,6 @@ aes-decrypter@4.0.1: global "^4.4.0" pkcs7 "^1.0.4" -aes-decrypter@^4.0.1: - version "4.0.2" - resolved "https://registry.npmmirror.com/aes-decrypter/-/aes-decrypter-4.0.2.tgz" - integrity sha512-lc+/9s6iJvuaRe5qDlMTpCFjnwpkeOXp8qP3oiZ5jsj1MRg+SBVUmmICrhxHvc8OELSmc+fEyyxAuppY6hrWzw== - dependencies: - "@babel/runtime" "^7.12.5" - "@videojs/vhs-utils" "^4.1.1" - global "^4.4.0" - pkcs7 "^1.0.4" - anymatch@~3.1.2: version "3.1.3" resolved "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz" @@ -496,7 +396,7 @@ echarts-liquidfill@^3.1.0: resolved "https://registry.npmmirror.com/echarts-liquidfill/-/echarts-liquidfill-3.1.0.tgz" integrity sha512-5Dlqs/jTsdTUAsd+K5LPLLTgrbbNORUSBQyk8PSy1Mg2zgHDWm83FmvA4s0ooNepCJojFYRITTQ4GU1UUSKYLw== -echarts@^5.4.2: +echarts@^5.0.1, echarts@^5.1.2, echarts@^5.4.2: version "5.4.2" resolved "https://registry.npmjs.org/echarts/-/echarts-5.4.2.tgz" integrity sha512-2W3vw3oI2tWJdyAz+b8DuWS0nfXtSDqlDmqgin/lfzbkB01cuMEN66KWBlmur3YMp5nEDEEt5s23pllnAzB4EA== @@ -589,16 +489,19 @@ form-data@^4.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" -fsevents@~2.3.2: - version "2.3.3" - resolved "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" - integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== - function-bind@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== +gdt-jsapi@^1.9.51: + version "1.9.51" + resolved "https://registry.npmmirror.com/gdt-jsapi/-/gdt-jsapi-1.9.51.tgz" + integrity sha512-VN1iIK7kJU2g2oxY/n8waCREhWxcVwR8qHAE1keVnUJHI6mTdgTelICzq++niRRCaLqUVWC1pYvftEVgk4sq8A== + dependencies: + "@babel/runtime" "^7.10.2" + "@remax/mini-types" "^0.1.0" + glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz" @@ -606,7 +509,7 @@ glob-parent@~5.1.2: dependencies: is-glob "^4.0.1" -global@4.3.2, global@^4.3.0, global@~4.3.0: +global@^4.3.0, global@4.3.2: version "4.3.2" resolved "https://registry.npmmirror.com/global/-/global-4.3.2.tgz" integrity sha512-/4AybdwIDU4HkCUbJkZdWpe4P6vuw/CUtu+0I1YlLIPe7OlUO7KNJ+q/rO70CW2/NW6Jc6I62++Hzsf5Alu6rQ== @@ -614,7 +517,7 @@ global@4.3.2, global@^4.3.0, global@~4.3.0: min-document "^2.19.0" process "~0.5.1" -global@4.4.0, global@^4.3.1, global@^4.4.0, global@~4.4.0: +global@^4.3.1, global@^4.4.0, global@~4.4.0, global@4.4.0: version "4.4.0" resolved "https://registry.npmmirror.com/global/-/global-4.4.0.tgz" integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w== @@ -622,6 +525,14 @@ global@4.4.0, global@^4.3.1, global@^4.4.0, global@~4.4.0: min-document "^2.19.0" process "^0.11.10" +global@~4.3.0: + version "4.3.2" + resolved "https://registry.npmmirror.com/global/-/global-4.3.2.tgz" + integrity sha512-/4AybdwIDU4HkCUbJkZdWpe4P6vuw/CUtu+0I1YlLIPe7OlUO7KNJ+q/rO70CW2/NW6Jc6I62++Hzsf5Alu6rQ== + dependencies: + min-document "^2.19.0" + process "~0.5.1" + has@^1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz" @@ -675,7 +586,7 @@ is-number@^7.0.0: resolved "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== -lodash-es@^4.17.21: +lodash-es@*, lodash-es@^4.17.21: version "4.17.21" resolved "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz" integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== @@ -685,16 +596,11 @@ lodash-unified@^1.0.2: resolved "https://registry.npmmirror.com/lodash-unified/-/lodash-unified-1.0.3.tgz" integrity sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ== -lodash@^4.17.21: +lodash@*, lodash@^4.17.21: version "4.17.21" resolved "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -m3u8-parser@2.1.0: - version "2.1.0" - resolved "https://registry.npmmirror.com/m3u8-parser/-/m3u8-parser-2.1.0.tgz" - integrity sha512-WbEpQ2FUaNGbJ0YanSeyj9D9ruu4FUvz+ZvebIzI2bSME+PUwcPXO1kKXZkjcPUAFruDikoOI5fWQNIA6JCCOQ== - m3u8-parser@^7.1.0: version "7.2.0" resolved "https://registry.npmmirror.com/m3u8-parser/-/m3u8-parser-7.2.0.tgz" @@ -704,6 +610,11 @@ m3u8-parser@^7.1.0: "@videojs/vhs-utils" "^4.1.1" global "^4.4.0" +m3u8-parser@2.1.0: + version "2.1.0" + resolved "https://registry.npmmirror.com/m3u8-parser/-/m3u8-parser-2.1.0.tgz" + integrity sha512-WbEpQ2FUaNGbJ0YanSeyj9D9ruu4FUvz+ZvebIzI2bSME+PUwcPXO1kKXZkjcPUAFruDikoOI5fWQNIA6JCCOQ== + magic-string@^0.25.7: version "0.25.9" resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz" @@ -745,12 +656,7 @@ mpd-parser@^1.2.2, mpd-parser@^1.3.0: "@xmldom/xmldom" "^0.8.3" global "^4.4.0" -mux.js@4.3.2: - version "4.3.2" - resolved "https://registry.npmmirror.com/mux.js/-/mux.js-4.3.2.tgz" - integrity sha512-g0q6DPdvb3yYcoK7ElBGobdSSrhY/RjPt19U7uUc733aqvc5bCS/aCvL9z+448y+IoCZnYDwyZfQBBXMSmGOaQ== - -mux.js@7.0.3, mux.js@^7.0.1: +mux.js@^7.0.1, mux.js@7.0.3: version "7.0.3" resolved "https://registry.npmmirror.com/mux.js/-/mux.js-7.0.3.tgz" integrity sha512-gzlzJVEGFYPtl2vvEiJneSWAWD4nfYRHD5XgxmB2gWvXraMPOYk+sxfvexmNfjQUFpmk6hwLR5C6iSFmuwCHdQ== @@ -758,6 +664,11 @@ mux.js@7.0.3, mux.js@^7.0.1: "@babel/runtime" "^7.11.2" global "^4.4.0" +mux.js@4.3.2: + version "4.3.2" + resolved "https://registry.npmmirror.com/mux.js/-/mux.js-4.3.2.tgz" + integrity sha512-g0q6DPdvb3yYcoK7ElBGobdSSrhY/RjPt19U7uUc733aqvc5bCS/aCvL9z+448y+IoCZnYDwyZfQBBXMSmGOaQ== + nanoid@^3.3.4: version "3.3.6" resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz" @@ -876,7 +787,7 @@ safe-json-parse@4.0.0: dependencies: rust-result "^1.0.0" -sass@^1.60.0: +sass@*, sass@^1.60.0: version "1.62.0" resolved "https://registry.npmmirror.com/sass/-/sass-1.62.0.tgz" integrity sha512-Q4USplo4pLYgCi+XlipZCWUQz5pkg/ruSSgJ0WRDSb/+3z9tXUOkQ7QPYn4XrhZKYAK4HlpaQecRwKLJX6+DBg== @@ -885,7 +796,7 @@ sass@^1.60.0: immutable "^4.0.0" source-map-js ">=0.6.2 <2.0.0" -"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2: +source-map-js@^1.0.2, "source-map-js@>=0.6.2 <2.0.0": version "1.0.2" resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== @@ -927,7 +838,7 @@ url-toolkit@^2.1.3, url-toolkit@^2.2.1: resolved "https://registry.npmmirror.com/url-toolkit/-/url-toolkit-2.2.5.tgz" integrity sha512-mtN6xk+Nac+oyJ/PrI7tzfmomRVNFIWKUbG8jdYFt52hxbiReFAXIjYskvu64/dvuW71IcB7lV8l0HvZMac6Jg== -"video.js@^5.17.0 || ^6.2.0", "video.js@^5.19.1 || ^6.2.0": +"video.js@^5.17.0 || ^6.2.0": version "6.13.0" resolved "https://registry.npmmirror.com/video.js/-/video.js-6.13.0.tgz" integrity sha512-36/JR/GhPQSZj0o+GNbhcEYv/b0SkV9SQsjlodAnzMQYN0TA7VhmqrKPYMCi1NGRYu7S9W3OaFCFoUxkYfSVlg== @@ -941,7 +852,21 @@ url-toolkit@^2.1.3, url-toolkit@^2.2.1: videojs-vtt.js "0.12.6" xhr "2.4.0" -"video.js@^7 || ^8", video.js@^8.17.3: +"video.js@^5.19.1 || ^6.2.0": + version "6.13.0" + resolved "https://registry.npmmirror.com/video.js/-/video.js-6.13.0.tgz" + integrity sha512-36/JR/GhPQSZj0o+GNbhcEYv/b0SkV9SQsjlodAnzMQYN0TA7VhmqrKPYMCi1NGRYu7S9W3OaFCFoUxkYfSVlg== + dependencies: + babel-runtime "^6.9.2" + global "4.3.2" + safe-json-parse "4.0.0" + tsml "1.0.1" + videojs-font "2.1.0" + videojs-ie8 "1.1.2" + videojs-vtt.js "0.12.6" + xhr "2.4.0" + +"video.js@^7 || ^8", video.js@^8, video.js@^8.17.3: version "8.17.3" resolved "https://registry.npmmirror.com/video.js/-/video.js-8.17.3.tgz" integrity sha512-zhhmE0LNxJRA603/48oYzF7GYdT+rQRscvcsouYxFE71aKhalHLBP6S9/XjixnyjcrYgwIx8OQo6eSjcbbAW0Q== @@ -1022,7 +947,7 @@ videojs-vtt.js@0.15.5: dependencies: global "^4.3.1" -vite@^4.2.0: +vite@^4.0.0, vite@^4.2.0: version "4.2.1" resolved "https://registry.npmjs.org/vite/-/vite-4.2.1.tgz" integrity sha512-7MKhqdy0ISo4wnvwtqZkjke6XN4taqQ2TBaTccLIpOKv7Vp2h4Y+NpmWCnGDeSvvn45KxvWgGyb0MkHvY1vgbg== @@ -1046,7 +971,7 @@ vue-router@^4.1.6: dependencies: "@vue/devtools-api" "^6.4.5" -vue@^3.2.47: +"vue@^3.0.0-0 || ^2.6.0", vue@^3.2.0, vue@^3.2.25, vue@^3.2.47, vue@3.2.47: version "3.2.47" resolved "https://registry.npmjs.org/vue/-/vue-3.2.47.tgz" integrity sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ== @@ -1077,7 +1002,7 @@ xtend@^4.0.0: resolved "https://registry.npmmirror.com/xtend/-/xtend-4.0.2.tgz" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== -zrender@5.4.3, zrender@^5.1.1: +zrender@^5.1.1, zrender@5.4.3: version "5.4.3" resolved "https://registry.npmjs.org/zrender/-/zrender-5.4.3.tgz" integrity sha512-DRUM4ZLnoaT0PBVvGBDO9oWIDBKFdAVieNWxWwK0niYzJCMwGchRk21/hsE+RKkIveH3XHCyvXcJDkgLVvfizQ== From 496057ae5ca5705c1e29222160146fbad4b4cbe4 Mon Sep 17 00:00:00 2001 From: duanxiaohai <1812246227@qq.com> Date: Wed, 25 Sep 2024 15:56:00 +0800 Subject: [PATCH 2/2] gx --- src/router/index.js | 143 ++++++++++++++++++++++++------------------- src/utils/request.js | 2 + src/view/guide.vue | 105 ++++++++++++++++++++++++++----- 3 files changed, 172 insertions(+), 78 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 6acb453..db27235 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,6 +1,7 @@ -import { createRouter, createWebHashHistory } from 'vue-router' +import { createRouter, createWebHashHistory } from "vue-router"; import http from "@/utils/request.js"; -import tools from '@/utils/tools' +import tools from "@/utils/tools"; +import { namespaceContextKey } from "element-plus"; const routerHistory = createWebHashHistory(); @@ -8,83 +9,88 @@ const router = createRouter({ history: routerHistory, routes: [ { - path: '/', - redirect: '/guide' + path: "/", + redirect: "/guide", }, { - name: '引导页', - path: '/guide', - component: () => import('../view/guide.vue'), + name: "引导页", + path: "/guide", + component: () => import("../view/guide.vue"), }, { - path: '/home', - component: () => import('../view/home.vue'), + path: "/home", + component: () => import("../view/home.vue"), children: [ + // { + // name: '登录', + // path: '/login/index', + // component: () => import('../view/login/LoginZZD.vue'), + // }, { - name: '首页', - path: '/home/index', - component: () => import('../view/sy.vue'), + name: "首页", + path: "/home/index", + component: () => import("../view/sy.vue"), }, { - name: '养老', - path: '/home/yl', - component: () => import('../view/yl.vue'), + name: "养老", + path: "/home/yl", + component: () => import("../view/yl.vue"), }, { - name: '卫生', - path: '/home/hygiene', - component: () => import('../view/hygiene.vue'), + name: "卫生", + path: "/home/hygiene", + component: () => import("../view/hygiene.vue"), }, { - name: '教育', - path: '/home/education', - component: () => import('../view/education.vue'), + name: "教育", + path: "/home/education", + component: () => import("../view/education.vue"), }, { - name: '就业补助', - path: '/home/work', - component: () => import('../view/work.vue'), + name: "就业补助", + path: "/home/work", + component: () => import("../view/work.vue"), }, { - name: '智能分析', - path: '/home/analyze', - component: () => import('../view/analyze.vue'), + name: "智能分析", + path: "/home/analyze", + component: () => import("../view/analyze.vue"), }, { - name: '首页地图', - path: '/home/index/map', - component: () => import('../view/sy_map.vue'), + name: "首页地图", + path: "/home/index/map", + component: () => import("../view/sy_map.vue"), }, { - name: '首页表格', - path: '/home/index/table', - component: () => import('../view/sy_table.vue'), + name: "首页表格", + path: "/home/index/table", + component: () => import("../view/sy_table.vue"), }, { - name: '首页表格详情', - path: '/home/index/table/details', - component: () => import('../view/sy_details.vue'), + name: "首页表格详情", + path: "/home/index/table/details", + component: () => import("../view/sy_details.vue"), }, { - name: '人物图', - path: '/home/index/person', - component: () => import('../view/person/index.vue'), + name: "人物图", + path: "/home/index/person", + component: () => import("../view/person/index.vue"), }, // { // name: '地图编辑', // path: '/home/index/mapEdit', // component: () => import('../view/sy_map_fb.vue'), // }, - ] + ], }, - ] -}) + ], +}); function getCookie(cname) { - var cn = cname - const cookies = document.cookie.split('; '); + var cn = cname; + const cookies = document.cookie.split("; "); for (let i = 0; i < cookies.length; i++) { - const [name, value] = cookies[i].split('='); + const [name, value] = cookies[i].split("="); if (name === cn) { return value; } @@ -100,26 +106,35 @@ function getCookie(cname) { } router.beforeEach((to, form, next) => { - var token = getCookie('lytoken') - // console.log('token', token) - if (token == '') { - window.location.href = - 'http://220.191.238.50:996/api/login?returnURL=' + - window.location.href + // var token = getCookie('lytoken') + // // console.log('token', token) + // if (token == '') { + // window.location.href = + // 'http://220.191.238.50:996/api/login?returnURL=' + + // window.location.href + // } else { + // // http.get("/api/zzdn_event/auditToken?token=" + token).then((res) => { + // // if (res.code == '500') { + // // window.location.href = + // // 'http://220.191.238.50:996/api/login?returnURL=' + + // // window.location.href + // // } else { + // // tools.data.set('token',token) + // next(); + // // } + // // }); + // tools.data.set('token', token) + // next(); + // } + let type = tools.data.get("type"); + if (type) { + console.log(1111); + + next(); } else { - // http.get("/api/zzdn_event/auditToken?token=" + token).then((res) => { - // if (res.code == '500') { - // window.location.href = - // 'http://220.191.238.50:996/api/login?returnURL=' + - // window.location.href - // } else { - // tools.data.set('token',token) - // next(); - // } - // }); - tools.data.set('token', token) + window.location.href = "http://localhost:8080/#/guide"; next(); } -}) +}); -export default router \ No newline at end of file +export default router; diff --git a/src/utils/request.js b/src/utils/request.js index ca4868b..33b0fb6 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,6 +1,8 @@ import axios from "axios"; import { ElMessage } from "element-plus"; import tools from "@/utils/tools"; + +import dd from "gdt-jsapi"; import router from "../router"; // axios.defaults.baseURL = '/api' axios.defaults.timeout = 120000; diff --git a/src/view/guide.vue b/src/view/guide.vue index 3554cb0..a83f9f4 100644 --- a/src/view/guide.vue +++ b/src/view/guide.vue @@ -61,6 +61,9 @@