diff --git a/package-lock.json b/package-lock.json index 8a866370b..5ea4fe558 100644 --- a/package-lock.json +++ b/package-lock.json @@ -325,6 +325,23 @@ "integrity": "sha1-VHbVYV0BvzOcZcLoBPWQm7wnhEo=", "dev": true }, + "@vueuse/core": { + "version": "4.8.1", + "resolved": "http://192.168.250.101:4873/@vueuse%2fcore/-/core-4.8.1.tgz", + "integrity": "sha1-16f7LnJhDRli7LkkS9k9rLltkhw=", + "requires": { + "@vueuse/shared": "4.8.1", + "vue-demi": "^0.7.4" + } + }, + "@vueuse/shared": { + "version": "4.8.1", + "resolved": "http://192.168.250.101:4873/@vueuse%2fshared/-/shared-4.8.1.tgz", + "integrity": "sha1-Rf1fZL9OiUTbQqW3L6JwXPx0YIo=", + "requires": { + "vue-demi": "^0.7.4" + } + }, "ansi-styles": { "version": "3.2.1", "resolved": "http://192.168.250.101:4873/ansi-styles/-/ansi-styles-3.2.1.tgz", @@ -1316,11 +1333,6 @@ "neo-async": "^2.6.2" } }, - "screenfull": { - "version": "5.1.0", - "resolved": "http://192.168.250.101:4873/screenfull/-/screenfull-5.1.0.tgz", - "integrity": "sha1-hcE8cPTq1MG4qTXHABDf3NLA5cg=" - }, "sortablejs": { "version": "1.10.2", "resolved": "http://192.168.250.101:4873/sortablejs/-/sortablejs-1.10.2.tgz", @@ -1589,6 +1601,11 @@ } } }, + "vue-demi": { + "version": "0.7.4", + "resolved": "http://192.168.250.101:4873/vue-demi/-/vue-demi-0.7.4.tgz", + "integrity": "sha1-TGvlJXiOH2s/1dT1+fIUjPZkWXk=" + }, "vue-i18n": { "version": "9.0.0", "resolved": "http://192.168.250.101:4873/vue-i18n/-/vue-i18n-9.0.0.tgz", diff --git a/package.json b/package.json index 7ecf12e37..fd849260d 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@vueuse/core": "^4.8.1", "await-to-js": "^2.1.1", "axios": "^0.21.1", "dayjs": "^1.10.4", @@ -21,7 +22,6 @@ "path": "^0.12.7", "path-to-regexp": "^6.2.0", "resize-observer-polyfill": "^1.5.1", - "screenfull": "^5.1.0", "three": "^0.126.1", "troisjs": "^0.1.19", "v-contextmenu": "^3.0.0-alpha.4", diff --git a/src/components/info/index.vue b/src/components/info/index.vue index 5d3b01c70..0bffea8ed 100644 --- a/src/components/info/index.vue +++ b/src/components/info/index.vue @@ -144,6 +144,10 @@ export default defineComponent({ router.push("/"); }; + onBeforeMount(()=>{ + vm = getCurrentInstance(); //获取组件实例 + }) + return { rules, tips, diff --git a/src/layout/components/panel/index.vue b/src/layout/components/panel/index.vue index 55c512813..9da42346e 100644 --- a/src/layout/components/panel/index.vue +++ b/src/layout/components/panel/index.vue @@ -19,6 +19,7 @@