diff --git a/package-lock.json b/package-lock.json index af0f410..5dbd276 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "core-js": "^3.6.5", "dayjs": "^1.11.4", "echarts": "^5.3.1", - "element-plus": "^2.2.30", + "element-plus": "^2.2.28", "exceljs": "^4.3.0", "file-saver": "^2.0.5", "fuse.js": "^6.6.2", @@ -31,6 +31,8 @@ "pinia": "^2.0.21", "pinia-plugin-persistedstate": "^2.1.1", "print-js": "^1.6.0", + "raf": "^3.4.1", + "resize-observer-polyfill": "^1.5.1", "sass": "^1.54.0", "splitpanes": "^3.1.1", "svg-sprite-loader": "^6.0.11", @@ -6458,6 +6460,11 @@ "integrity": "sha512-x3nrPvG0HDSDzUiJ0WqtzhN4MD+h5B+dFJ3/qyxVuARlr4Y3aJv8gri2cZzp9Z8sGs2a+aG9gNbKngh3gme57A==", "dev": true }, + "node_modules/performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==" + }, "node_modules/picocolors": { "version": "1.0.0", "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz", @@ -6817,6 +6824,14 @@ "node": ">=8" } }, + "node_modules/raf": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz", + "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==", + "dependencies": { + "performance-now": "^2.1.0" + } + }, "node_modules/read-pkg": { "version": "5.2.0", "resolved": "https://r2.cnpmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", @@ -7111,6 +7126,11 @@ "resolved": "https://registry.npmmirror.com/resize-detector/-/resize-detector-0.3.0.tgz", "integrity": "sha512-R/tCuvuOHQ8o2boRP6vgx8hXCCy87H1eY9V5imBYeVNyNVpuL9ciReSccLj2gDcax9+2weXy3bc8Vv+NRXeEvQ==" }, + "node_modules/resize-observer-polyfill": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz", + "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==" + }, "node_modules/resolve": { "version": "1.22.1", "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.1.tgz", @@ -14521,6 +14541,11 @@ "integrity": "sha512-x3nrPvG0HDSDzUiJ0WqtzhN4MD+h5B+dFJ3/qyxVuARlr4Y3aJv8gri2cZzp9Z8sGs2a+aG9gNbKngh3gme57A==", "dev": true }, + "performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==" + }, "picocolors": { "version": "1.0.0", "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz", @@ -14777,6 +14802,14 @@ "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==", "dev": true }, + "raf": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz", + "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==", + "requires": { + "performance-now": "^2.1.0" + } + }, "read-pkg": { "version": "5.2.0", "resolved": "https://r2.cnpmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", @@ -15010,6 +15043,11 @@ "resolved": "https://registry.npmmirror.com/resize-detector/-/resize-detector-0.3.0.tgz", "integrity": "sha512-R/tCuvuOHQ8o2boRP6vgx8hXCCy87H1eY9V5imBYeVNyNVpuL9ciReSccLj2gDcax9+2weXy3bc8Vv+NRXeEvQ==" }, + "resize-observer-polyfill": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz", + "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==" + }, "resolve": { "version": "1.22.1", "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.1.tgz", diff --git a/src/assets/image/we.png b/src/assets/image/we.png index cb3e1ba..0cdf38e 100644 Binary files a/src/assets/image/we.png and b/src/assets/image/we.png differ diff --git a/src/layout/LayoutHorizontal/HeaderHorizontal/index.scss b/src/layout/LayoutHorizontal/HeaderHorizontal/index.scss index 88a2f78..10f233c 100644 --- a/src/layout/LayoutHorizontal/HeaderHorizontal/index.scss +++ b/src/layout/LayoutHorizontal/HeaderHorizontal/index.scss @@ -27,7 +27,7 @@ flex: 1; overflow: hidden; height: 100%; - margin-right:20px; + :deep(.el-menu-item){ height: 100%; } diff --git a/src/layout/LayoutHorizontal/HeaderHorizontal/index.vue b/src/layout/LayoutHorizontal/HeaderHorizontal/index.vue index bae598c..6c4f324 100644 --- a/src/layout/LayoutHorizontal/HeaderHorizontal/index.vue +++ b/src/layout/LayoutHorizontal/HeaderHorizontal/index.vue @@ -1,27 +1,33 @@ -