hongrunxia 1 éve
szülő
commit
e96768a7b2

+ 2 - 0
package.json

@@ -42,6 +42,7 @@
     "@liveqing/liveplayer-v3": "^3.1.9",
     "@logicflow/core": "^1.1.13",
     "@logicflow/extension": "^1.1.13",
+    "@vue/reactivity": "^3.3.6",
     "@vue/runtime-core": "^3.2.33",
     "@vue/shared": "^3.2.33",
     "@vueuse/core": "^8.3.0",
@@ -63,6 +64,7 @@
     "enquire.js": "^2.1.6",
     "gsap": "^3.11.3",
     "intro.js": "^5.1.0",
+    "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",
     "lodash.get": "^4.4.2",
     "md5": "^2.3.0",

+ 52 - 36
pnpm-lock.yaml

@@ -39,6 +39,7 @@ specifiers:
   '@vitejs/plugin-vue': ^3.0.1
   '@vitejs/plugin-vue-jsx': ^1.3.10
   '@vue/compiler-sfc': ^3.2.33
+  '@vue/reactivity': ^3.3.6
   '@vue/runtime-core': ^3.2.33
   '@vue/shared': ^3.2.33
   '@vue/test-utils': ^2.0.0-rc.21
@@ -84,6 +85,7 @@ specifiers:
   jest: ^27.3.1
   less: ^4.1.2
   lint-staged: 12.3.7
+  lodash: ^4.17.21
   lodash-es: ^4.17.21
   lodash.get: ^4.4.2
   md5: ^2.3.0
@@ -166,6 +168,7 @@ dependencies:
   '@liveqing/liveplayer-v3': 3.7.9
   '@logicflow/core': 1.1.31
   '@logicflow/extension': 1.1.31
+  '@vue/reactivity': 3.3.6
   '@vue/runtime-core': 3.2.45
   '@vue/shared': 3.2.45
   '@vueuse/core': 8.9.4_vue@3.2.45
@@ -187,6 +190,7 @@ dependencies:
   enquire.js: 2.1.6
   gsap: 3.11.3
   intro.js: 5.1.0
+  lodash: 4.17.21
   lodash-es: 4.17.21
   lodash.get: 4.4.2
   md5: 2.3.0
@@ -248,7 +252,7 @@ devDependencies:
   '@types/three': 0.155.0
   '@typescript-eslint/eslint-plugin': 5.46.0_5mle7isnkfgjmrghnnczirv6iy
   '@typescript-eslint/parser': 5.46.0_ha6vam6werchizxrnqvarmz2zu
-  '@vitejs/plugin-legacy': 2.3.1_terser@5.16.1+vite@3.2.5
+  '@vitejs/plugin-legacy': 2.3.1_vite@3.2.5
   '@vitejs/plugin-vue': 3.2.0_vite@3.2.5+vue@3.2.45
   '@vitejs/plugin-vue-jsx': 1.3.10
   '@vue/compiler-sfc': 3.2.45
@@ -292,10 +296,10 @@ devDependencies:
   stylelint-config-recommended-vue: 1.4.0_bto6pmslw3cibsiuq6smxboytq
   stylelint-config-standard: 25.0.0_stylelint@14.16.0
   stylelint-order: 5.0.0_stylelint@14.16.0
-  ts-jest: 27.1.5_c6cqmjyjkcdfmldnpoikskgowe
+  ts-jest: 27.1.5_llt55oiqarpqk3a6ko7ts5f3gi
   ts-node: 10.9.1_zpb5kzpnyozdjq4cwaojlul57u
   typescript: 4.9.4
-  vite: 3.2.5_57ocsrwjvekxd6jheajt4uyjba
+  vite: 3.2.5_uakuilq6iygkg5ll5cv37w4i7m
   vite-plugin-compression: 0.5.1_vite@3.2.5
   vite-plugin-html: 3.2.0_vite@3.2.5
   vite-plugin-imagemin: 0.6.1_vite@3.2.5
@@ -304,7 +308,7 @@ devDependencies:
   vite-plugin-optimize-persist: 0.1.2_hixcczfrsvi4wedfdfr7z5co24
   vite-plugin-package-config: 0.1.1_vite@3.2.5
   vite-plugin-purge-icons: 0.8.2_vite@3.2.5
-  vite-plugin-pwa: 0.12.8_x7bmrdf5vv7jofix4vzvx6ucm4
+  vite-plugin-pwa: 0.12.8_vite@3.2.5
   vite-plugin-style-import: 2.0.0_vite@3.2.5
   vite-plugin-svg-icons: 2.0.1_vite@3.2.5
   vite-plugin-vue-setup-extend: 0.4.0_vite@3.2.5
@@ -1665,7 +1669,7 @@ packages:
       '@types/node': 17.0.45
       chalk: 4.1.2
       cosmiconfig: 7.1.0
-      cosmiconfig-typescript-loader: 2.0.2_4lq2onoqld4qnqfsh3rxqlz6x4
+      cosmiconfig-typescript-loader: 2.0.2_zpb5kzpnyozdjq4cwaojlul57u
       lodash: 4.17.21
       resolve-from: 5.0.0
       typescript: 4.9.4
@@ -2392,29 +2396,35 @@ packages:
       '@jridgewell/set-array': 1.1.2
       '@jridgewell/sourcemap-codec': 1.4.14
       '@jridgewell/trace-mapping': 0.3.17
+    dev: true
 
   /@jridgewell/resolve-uri/3.1.0:
     resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==}
     engines: {node: '>=6.0.0'}
+    dev: true
 
   /@jridgewell/set-array/1.1.2:
     resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==}
     engines: {node: '>=6.0.0'}
+    dev: true
 
   /@jridgewell/source-map/0.3.2:
     resolution: {integrity: sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==}
     dependencies:
       '@jridgewell/gen-mapping': 0.3.2
       '@jridgewell/trace-mapping': 0.3.17
+    dev: true
 
   /@jridgewell/sourcemap-codec/1.4.14:
     resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==}
+    dev: true
 
   /@jridgewell/trace-mapping/0.3.17:
     resolution: {integrity: sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==}
     dependencies:
       '@jridgewell/resolve-uri': 3.1.0
       '@jridgewell/sourcemap-codec': 1.4.14
+    dev: true
 
   /@jridgewell/trace-mapping/0.3.9:
     resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==}
@@ -2702,7 +2712,7 @@ packages:
       esbuild: 0.11.23
       esbuild-plugin-alias: 0.1.2
       tinycolor2: 1.4.2
-      vite: 3.2.5_57ocsrwjvekxd6jheajt4uyjba
+      vite: 3.2.5_uakuilq6iygkg5ll5cv37w4i7m
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -3216,7 +3226,7 @@ packages:
       eslint-visitor-keys: 3.3.0
     dev: true
 
-  /@vitejs/plugin-legacy/2.3.1_terser@5.16.1+vite@3.2.5:
+  /@vitejs/plugin-legacy/2.3.1_vite@3.2.5:
     resolution: {integrity: sha512-J5KaGBlSt2tEYPVjM/C8dA6DkRzkFkbPe+Xb4IX5G+XOV5OGbVAfkMjKywdrkO3gGynO8S98i71Lmsff4cWkCQ==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
@@ -3228,8 +3238,7 @@ packages:
       magic-string: 0.26.7
       regenerator-runtime: 0.13.11
       systemjs: 6.13.0
-      terser: 5.16.1
-      vite: 3.2.5_57ocsrwjvekxd6jheajt4uyjba
+      vite: 3.2.5_uakuilq6iygkg5ll5cv37w4i7m
     dev: true
 
   /@vitejs/plugin-vue-jsx/1.3.10:
@@ -3253,7 +3262,7 @@ packages:
       vite: ^3.0.0
       vue: ^3.2.25
     dependencies:
-      vite: 3.2.5_57ocsrwjvekxd6jheajt4uyjba
+      vite: 3.2.5_uakuilq6iygkg5ll5cv37w4i7m
       vue: 3.2.45
     dev: true
 
@@ -3302,7 +3311,7 @@ packages:
       '@volar/source-map': 0.33.9
       '@vue/compiler-core': 3.2.45
       '@vue/compiler-dom': 3.2.45
-      '@vue/shared': 3.2.45
+      '@vue/shared': 3.3.6
     dev: true
 
   /@volar/vue-typescript/0.33.9:
@@ -3313,7 +3322,7 @@ packages:
       '@volar/source-map': 0.33.9
       '@volar/vue-code-gen': 0.33.9
       '@vue/compiler-sfc': 3.2.45
-      '@vue/reactivity': 3.2.45
+      '@vue/reactivity': 3.3.6
     dev: true
 
   /@vue/babel-helper-vue-transform-on/1.0.2:
@@ -3389,6 +3398,11 @@ packages:
     dependencies:
       '@vue/shared': 3.2.45
 
+  /@vue/reactivity/3.3.6:
+    resolution: {integrity: sha512-gtChAumfQz5lSy5jZXfyXbKrIYPf9XEOrIr6rxwVyeWVjFhJwmwPLtV6Yis+M9onzX++I5AVE9j+iPH60U+B8Q==}
+    dependencies:
+      '@vue/shared': 3.3.6
+
   /@vue/runtime-core/3.2.45:
     resolution: {integrity: sha512-gzJiTA3f74cgARptqzYswmoQx0fIA+gGYBfokYVhF8YSXjWTUA2SngRzZRku2HbGbjzB6LBYSbKGIaK8IW+s0A==}
     dependencies:
@@ -3414,6 +3428,9 @@ packages:
   /@vue/shared/3.2.45:
     resolution: {integrity: sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==}
 
+  /@vue/shared/3.3.6:
+    resolution: {integrity: sha512-Xno5pEqg8SVhomD0kTSmfh30ZEmV/+jZtyh39q6QflrjdJCXah5lrnOLi9KB6a5k5aAHXMXjoMnxlzUkCNfWLQ==}
+
   /@vue/test-utils/2.2.6_vue@3.2.45:
     resolution: {integrity: sha512-64zHtJZdG7V/U2L0j/z3Pt5bSygccI3xs+Kl7LB73AZK4MQ8WONJhqDQPK8leUFFA9CmmoJygeky7zcl2hX10A==}
     peerDependencies:
@@ -3559,6 +3576,7 @@ packages:
     resolution: {integrity: sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==}
     engines: {node: '>=0.4.0'}
     hasBin: true
+    dev: true
 
   /add-stream/1.0.0:
     resolution: {integrity: sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==}
@@ -4170,6 +4188,7 @@ packages:
 
   /buffer-from/1.1.2:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
+    dev: true
 
   /buffer/5.7.1:
     resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
@@ -4874,12 +4893,11 @@ packages:
     engines: {node: '>= 0.4.0'}
     dev: true
 
-  /cosmiconfig-typescript-loader/2.0.2_4lq2onoqld4qnqfsh3rxqlz6x4:
+  /cosmiconfig-typescript-loader/2.0.2_zpb5kzpnyozdjq4cwaojlul57u:
     resolution: {integrity: sha512-KmE+bMjWMXJbkWCeY4FJX/npHuZPNr9XF9q9CIQ/bpFwi1qHfCmSiKarrCcRa0LO4fWjk93pVoeRtJAkTGcYNw==}
     engines: {node: '>=12', npm: '>=6'}
     peerDependencies:
       '@types/node': '*'
-      cosmiconfig: '>=7'
       typescript: '>=3'
     dependencies:
       '@types/node': 17.0.45
@@ -11234,6 +11252,7 @@ packages:
     dependencies:
       buffer-from: 1.1.2
       source-map: 0.6.1
+    dev: true
 
   /source-map-url/0.4.1:
     resolution: {integrity: sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==}
@@ -11812,6 +11831,7 @@ packages:
       acorn: 8.8.1
       commander: 2.20.3
       source-map-support: 0.5.21
+    dev: true
 
   /test-exclude/6.0.0:
     resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==}
@@ -11975,7 +11995,7 @@ packages:
       escape-string-regexp: 1.0.5
     dev: true
 
-  /ts-jest/27.1.5_c6cqmjyjkcdfmldnpoikskgowe:
+  /ts-jest/27.1.5_llt55oiqarpqk3a6ko7ts5f3gi:
     resolution: {integrity: sha512-Xv6jBQPoBEvBq/5i2TeSG9tt/nqkbpcurrEG1b+2yfBrcJelOZF9Ml6dmyMh7bcW9JyFbRYpR5rxROSlBLTZHA==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     hasBin: true
@@ -11996,10 +12016,8 @@ packages:
       esbuild:
         optional: true
     dependencies:
-      '@babel/core': 7.20.5
       '@types/jest': 27.5.2
       bs-logger: 0.2.6
-      esbuild: 0.16.4
       fast-json-stable-stringify: 2.1.0
       jest: 27.5.1_ts-node@10.9.1
       jest-util: 27.5.1
@@ -12405,7 +12423,7 @@ packages:
       chalk: 4.1.2
       debug: 4.3.4
       fs-extra: 10.1.0
-      vite: 3.2.5_57ocsrwjvekxd6jheajt4uyjba
+      vite: 3.2.5_uakuilq6iygkg5ll5cv37w4i7m
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -12427,7 +12445,7 @@ packages:
       html-minifier-terser: 6.1.0
       node-html-parser: 5.4.2
       pathe: 0.2.0
-      vite: 3.2.5_57ocsrwjvekxd6jheajt4uyjba
+      vite: 3.2.5_uakuilq6iygkg5ll5cv37w4i7m
     dev: true
 
   /vite-plugin-imagemin/0.6.1_vite@3.2.5:
@@ -12458,7 +12476,7 @@ packages:
       imagemin-webp: 6.0.0
       jpegtran-bin: 6.0.1
       pathe: 0.2.0
-      vite: 3.2.5_57ocsrwjvekxd6jheajt4uyjba
+      vite: 3.2.5_uakuilq6iygkg5ll5cv37w4i7m
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -12473,7 +12491,7 @@ packages:
       axios: 0.21.4_debug@4.3.4
       debug: 4.3.4
       picocolors: 1.0.0
-      vite: 3.2.5_57ocsrwjvekxd6jheajt4uyjba
+      vite: 3.2.5_uakuilq6iygkg5ll5cv37w4i7m
     transitivePeerDependencies:
       - encoding
       - supports-color
@@ -12496,7 +12514,7 @@ packages:
       fast-glob: 3.2.12
       mockjs: 1.1.0
       path-to-regexp: 6.2.1
-      vite: 3.2.5_57ocsrwjvekxd6jheajt4uyjba
+      vite: 3.2.5_uakuilq6iygkg5ll5cv37w4i7m
     transitivePeerDependencies:
       - rollup
       - supports-color
@@ -12510,7 +12528,7 @@ packages:
     dependencies:
       debug: 4.3.4
       fs-extra: 10.1.0
-      vite: 3.2.5_57ocsrwjvekxd6jheajt4uyjba
+      vite: 3.2.5_uakuilq6iygkg5ll5cv37w4i7m
       vite-plugin-package-config: 0.1.1_vite@3.2.5
     transitivePeerDependencies:
       - supports-color
@@ -12522,7 +12540,7 @@ packages:
       vite: ^2.0.0
     dependencies:
       debug: 4.3.4
-      vite: 3.2.5_57ocsrwjvekxd6jheajt4uyjba
+      vite: 3.2.5_uakuilq6iygkg5ll5cv37w4i7m
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -12536,27 +12554,26 @@ packages:
       '@purge-icons/core': 0.8.0
       '@purge-icons/generated': 0.8.1
       rollup-plugin-purge-icons: 0.8.1
-      vite: 3.2.5_57ocsrwjvekxd6jheajt4uyjba
+      vite: 3.2.5_uakuilq6iygkg5ll5cv37w4i7m
     transitivePeerDependencies:
       - encoding
       - supports-color
     dev: true
 
-  /vite-plugin-pwa/0.12.8_x7bmrdf5vv7jofix4vzvx6ucm4:
+  /vite-plugin-pwa/0.12.8_vite@3.2.5:
     resolution: {integrity: sha512-pSiFHmnJGMQJJL8aJzQ8SaraZBSBPMGvGUkCNzheIq9UQCEk/eP3UmANNmS9eupuhIpTK8AdxTOHcaMcAqAbCA==}
     peerDependencies:
       vite: ^2.0.0 || ^3.0.0-0
-      workbox-build: ^6.4.0
-      workbox-window: ^6.4.0
     dependencies:
       debug: 4.3.4
       fast-glob: 3.2.12
       pretty-bytes: 6.0.0
       rollup: 2.79.1
-      vite: 3.2.5_57ocsrwjvekxd6jheajt4uyjba
+      vite: 3.2.5_uakuilq6iygkg5ll5cv37w4i7m
       workbox-build: 6.5.4
       workbox-window: 6.5.4
     transitivePeerDependencies:
+      - '@types/babel__core'
       - supports-color
     dev: true
 
@@ -12572,7 +12589,7 @@ packages:
       fs-extra: 10.1.0
       magic-string: 0.25.9
       pathe: 0.2.0
-      vite: 3.2.5_57ocsrwjvekxd6jheajt4uyjba
+      vite: 3.2.5_uakuilq6iygkg5ll5cv37w4i7m
     dev: true
 
   /vite-plugin-svg-icons/2.0.1_vite@3.2.5:
@@ -12588,7 +12605,7 @@ packages:
       pathe: 0.2.0
       svg-baker: 1.7.0
       svgo: 2.8.0
-      vite: 3.2.5_57ocsrwjvekxd6jheajt4uyjba
+      vite: 3.2.5_uakuilq6iygkg5ll5cv37w4i7m
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -12606,7 +12623,7 @@ packages:
       esbuild: 0.11.23
       esbuild-plugin-alias: 0.1.2
       tinycolor2: 1.4.2
-      vite: 3.2.5_57ocsrwjvekxd6jheajt4uyjba
+      vite: 3.2.5_uakuilq6iygkg5ll5cv37w4i7m
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -12618,7 +12635,7 @@ packages:
     dependencies:
       '@vue/compiler-sfc': 3.2.45
       magic-string: 0.25.9
-      vite: 3.2.5_57ocsrwjvekxd6jheajt4uyjba
+      vite: 3.2.5_uakuilq6iygkg5ll5cv37w4i7m
     dev: true
 
   /vite-plugin-windicss/1.8.8_vite@3.2.5:
@@ -12629,13 +12646,13 @@ packages:
       '@windicss/plugin-utils': 1.8.8
       debug: 4.3.4
       kolorist: 1.6.0
-      vite: 3.2.5_57ocsrwjvekxd6jheajt4uyjba
+      vite: 3.2.5_uakuilq6iygkg5ll5cv37w4i7m
       windicss: 3.5.6
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /vite/3.2.5_57ocsrwjvekxd6jheajt4uyjba:
+  /vite/3.2.5_uakuilq6iygkg5ll5cv37w4i7m:
     resolution: {integrity: sha512-4mVEpXpSOgrssFZAOmGIr85wPHKvaDAcXqxVxVRZhljkJOMZi1ibLibzjLHzJvcok8BMguLc7g1W6W/GqZbLdQ==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
@@ -12666,7 +12683,6 @@ packages:
       postcss: 8.4.19
       resolve: 1.22.1
       rollup: 2.79.1
-      terser: 5.16.1
     optionalDependencies:
       fsevents: 2.3.2
 

+ 7 - 1
src/layouts/default/content/index.vue

@@ -11,7 +11,9 @@
         </div>
       </div>
     </div>
-    <div id="content" class="app-view-box" v-show="openQianKun == 'true' && currentRoute.path.startsWith('/micro-')" :style="{top: getShowFullHeader ? 0 : '48px'}"> </div>
+    <template v-show="openQianKun == 'true' && currentRoute.path.startsWith('/micro-') && !currentRoute.path.endsWith('/modelchannel/model3D-')">
+      <div id="content" class="app-view-box"  :style="{top: getShowFullHeader ? 0 : '48px'}"> </div>
+    </template>
     <!-- update-end-author:zyf date:20211129 for: qiankun 挂载子应用盒子-->
   </div>
 </template>
@@ -120,6 +122,10 @@
     // overflow-y: auto;
     height: 100%
   }
+  #content{
+    width: 970px;
+    height: 540px;
+  }
   .app-loading {
     display: flex;
     width: 100%;

+ 1 - 1
src/layouts/default/header/index.vue

@@ -6,7 +6,7 @@
       {
         'vent-header': currentRoute.path.startsWith('/monitorChannel/monitor-'),
         'normal-header': !currentRoute.path.startsWith('/monitorChannel/monitor-'),
-        'no-header': currentRoute.path.endsWith('home'),
+        'no-header': currentRoute.path.endsWith('home') || currentRoute.path.endsWith('modelchannel/model3D'),
       },
     ]"
   >

+ 4 - 0
src/views/vent/home/clique/components/fan-monitor.vue

@@ -27,6 +27,9 @@
   import { ref, reactive, onMounted, nextTick } from 'vue';
   import { SvgIcon } from '/@/components/Icon';
   import * as echarts from 'echarts';
+  import { useGo } from '/@/hooks/web/usePage';
+  const go = useGo();
+
   let searchValue = ref('局扇监测');
   const options1 = reactive<any>([
     {
@@ -53,6 +56,7 @@
 //跳转详情
 function getDetail(){
     console.log('跳转详情')
+    go('/micro-vent-3dModal/dashboard/analysis')
   }
   //选项切换
   function changeSelect(val){

+ 45 - 2
src/views/vent/home/clique/index.vue

@@ -39,7 +39,8 @@
             </div>
           </div>
           <div class="three-modal">
-            <iframe id="iframe" ref="iframe" src="http://10.10.150.72:8091/user/autologin" scrolling="auto" frameborder="0" width="100%" height="100%"></iframe>
+            <!-- <iframe id="iframe" ref="iframe" src="http://10.10.150.72:8091/user/autologin" scrolling="auto" frameborder="0" width="100%" height="100%"></iframe> -->
+            <!-- <div id="content" style="width: 100%; height: 100%;"></div> -->
           </div>
         </div>
         <!-- 风量监测 -->
@@ -65,7 +66,8 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { reactive } from 'vue';
+  import { reactive, onMounted, ref } from 'vue';
+  import { getActions } from '/@/qiankun/state';
   import fanMonitor from './components/fan-monitor.vue';
   import mainMonitor from './components/main-monitor.vue';
   import windDevice from './components/wind-device.vue';
@@ -73,6 +75,8 @@
   import windLine from './components/wind-line.vue';
   import workMonitor from './components/work-monitor.vue';
   import deviceWarn from './components/device-warn.vue';
+  import { useGlobSetting } from '/@/hooks/setting';
+  
 
   let navList = reactive([
     { name: '总风量(m³/min)', isShow: true, valList: [{ val: '2' }, { val: '1' }, { val: '3' }, { val: '3' }, { val: '0' }] },
@@ -81,6 +85,39 @@
     { name: '外部漏风率', isShow: false, val: '6%' },
     { name: '有效风量率', isShow: false, val: '91.5%' },
   ]);
+  const loading = ref(false);
+  const globSetting = useGlobSetting();
+  const openQianKun = globSetting.openQianKun;
+  let actions;
+  if (openQianKun == 'true') {
+    actions = getActions();
+    actions.setGlobalState({ isMounted: false });
+    actions.onGlobalStateChange((newState, prev) => {
+      for (const key in newState) {
+        if (key === 'isMounted') {
+          if (newState[key] !== prev[key] && newState[key] === true) {
+            loading.value = false;
+            console.log('首页已经渲染完毕');
+            
+          }
+        }
+      }
+    });
+  }
+
+  onMounted(() => {
+    const renderModal = () => {
+      const element = document.getElementById('__qiankun_microapp_wrapper_for_micro_vent_3_d_modal__')
+      if(element){
+        element?.setAttribute('style', 'width: 100%; height: 100%');
+      }else{
+        setTimeout(() => {
+          renderModal()
+        }, 2000)
+      }
+    }
+    renderModal()
+  })
 </script>
 
 <style lang="less" scoped>
@@ -263,5 +300,11 @@
         }
       }
     }
+    
   }
+  
+  // #__qiankun_microapp_wrapper_for_micro_vent_3_d_modal__{
+  //   width: 100% !important;
+  //   height: 100% !important;
+  // }
 </style>