Ver código fonte

2022-12-06 update

1. 调整combine的scatter-chart.vue 颜色
2. 调整lineAnalysis scatter-chart.vue right属性
3. rateAnalysis 新增dialog pdf导出功能,  下拉全选功能
4. prepare 下拉全选功能
5. tools\pdf插件调用函数
6. 调整element-plus版本等  并提交压缩后node_modules
moccus 2 anos atrás
pai
commit
cbc3d5846a

+ 33 - 29
components.d.ts

@@ -22,35 +22,36 @@ declare module '@vue/runtime-core' {
     DoubleLineChart: typeof import('./src/components/chart/line/double-line-chart.vue')['default']
     DoubleLineChartold: typeof import('./src/components/chart/line/double-line-chartold.vue')['default']
     DualPieChart: typeof import('./src/components/chart/pie/dual-pie-chart.vue')['default']
-    ElButton: typeof import('element-plus/es/el-button')['default']
-    ElCheckbox: typeof import('element-plus/es/el-checkbox')['default']
-    ElCheckboxGroup: typeof import('element-plus/es/el-checkbox-group')['default']
-    ElCol: typeof import('element-plus/es/el-col')['default']
-    ElDatePicker: typeof import('element-plus/es/el-date-picker')['default']
-    ElDialog: typeof import('element-plus/es/el-dialog')['default']
-    ElDropdown: typeof import('element-plus/es/el-dropdown')['default']
-    ElDropdownItem: typeof import('element-plus/es/el-dropdown-item')['default']
-    ElDropdownMenu: typeof import('element-plus/es/el-dropdown-menu')['default']
-    ElEmpty: typeof import('element-plus/es/el-empty')['default']
-    ElForm: typeof import('element-plus/es/el-form')['default']
-    ElFormItem: typeof import('element-plus/es/el-form-item')['default']
-    ElIcon: typeof import('element-plus/es/el-icon')['default']
-    ElInput: typeof import('element-plus/es/el-input')['default']
-    ElInputNumber: typeof import('element-plus/es/el-input-number')['default']
-    ElMenu: typeof import('element-plus/es/el-menu')['default']
-    ElMenuItem: typeof import('element-plus/es/el-menu-item')['default']
-    ElOption: typeof import('element-plus/es/el-option')['default']
-    ElProgress: typeof import('element-plus/es/el-progress')['default']
-    ElRadio: typeof import('element-plus/es/el-radio')['default']
-    ElRadioGroup: typeof import('element-plus/es/el-radio-group')['default']
-    ElRow: typeof import('element-plus/es/el-row')['default']
-    ElSelect: typeof import('element-plus/es/el-select')['default']
-    ElSubmenu: typeof import('element-plus/es/el-submenu')['default']
-    ElTable: typeof import('element-plus/es/el-table')['default']
-    ElTableColumn: typeof import('element-plus/es/el-table-column')['default']
-    ElTabPane: typeof import('element-plus/es/el-tab-pane')['default']
-    ElTabs: typeof import('element-plus/es/el-tabs')['default']
-    ElTree: typeof import('element-plus/es/el-tree')['default']
+    ElButton: typeof import('element-plus/es')['ElButton']
+    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
+    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
+    ElCol: typeof import('element-plus/es')['ElCol']
+    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
+    ElDialog: typeof import('element-plus/es')['ElDialog']
+    ElDropdown: typeof import('element-plus/es')['ElDropdown']
+    ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
+    ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
+    ElEmpty: typeof import('element-plus/es')['ElEmpty']
+    ElForm: typeof import('element-plus/es')['ElForm']
+    ElFormItem: typeof import('element-plus/es')['ElFormItem']
+    ElIcon: typeof import('element-plus/es')['ElIcon']
+    ElInput: typeof import('element-plus/es')['ElInput']
+    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
+    ElMenu: typeof import('element-plus/es')['ElMenu']
+    ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
+    ElOption: typeof import('element-plus/es')['ElOption']
+    ElProgress: typeof import('element-plus/es')['ElProgress']
+    ElRadio: typeof import('element-plus/es')['ElRadio']
+    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
+    ElRow: typeof import('element-plus/es')['ElRow']
+    ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElSubmenu: typeof import('element-plus/es')['ElSubmenu']
+    ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
+    ElTable: typeof import('element-plus/es')['ElTable']
+    ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
+    ElTabPane: typeof import('element-plus/es')['ElTabPane']
+    ElTabs: typeof import('element-plus/es')['ElTabs']
+    ElTree: typeof import('element-plus/es')['ElTree']
     Excel: typeof import('./src/components/excel.vue')['default']
     Header: typeof import('./src/components/Header.vue')['default']
     HealthBarLineChart: typeof import('./src/components/chart/combination/health-bar-line-chart.vue')['default']
@@ -99,4 +100,7 @@ declare module '@vue/runtime-core' {
     WeatherLineChart: typeof import('./src/components/chart/line/weather-line-chart.vue')['default']
     ZoomLineChart: typeof import('./src/components/chart/line/zoom-line-chart.vue')['default']
   }
+  export interface ComponentCustomProperties {
+    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
+  }
 }

BIN
node_modules.rar


+ 303 - 80
package-lock.json

@@ -17,7 +17,7 @@
         "dayjs": "^1.10.7",
         "default-passive-events": "^2.0.0",
         "echarts": "^5.2.2",
-        "element-plus": "^1.0.2-beta.71",
+        "element-plus": "^2.2.26",
         "file-saver": "^2.0.5",
         "html2canvas": "^1.0.0-rc.7",
         "jsencrypt": "^3.2.1",
@@ -103,11 +103,13 @@
         "to-fast-properties": "^2.0.0"
       }
     },
-    "node_modules/@element-plus/icons": {
-      "version": "0.0.11",
-      "resolved": "https://registry.npmjs.org/@element-plus/icons/-/icons-0.0.11.tgz",
-      "integrity": "sha512-iKQXSxXu131Ai+I9Ymtcof9WId7kaXvB1+WRfAfpQCW7UiAMYgdNDqb/u0hgTo2Yq3MwC4MWJnNuTBEpG8r7+A==",
-      "deprecated": "Please use @element-plus/icons-vue instead."
+    "node_modules/@ctrl/tinycolor": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.5.0.tgz",
+      "integrity": "sha512-tlJpwF40DEQcfR/QF+wNMVyGMaO9FQp6Z1Wahj4Gk3CJQYHwA2xVG7iKDFdW6zuxZY9XWOpGcfNCTsX4McOsOg==",
+      "engines": {
+        "node": ">=10"
+      }
     },
     "node_modules/@element-plus/icons-vue": {
       "version": "2.0.10",
@@ -165,6 +167,19 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/@floating-ui/core": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.0.3.tgz",
+      "integrity": "sha512-27FDAEVHrAEQI1UV+7FIjZrFK862gBoAG0USoPMU7RoBCmaTDt6bnKVW/J2uPnOPI6TWqiWGtS7RFN+tN/k+vQ=="
+    },
+    "node_modules/@floating-ui/dom": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.0.8.tgz",
+      "integrity": "sha512-uUm1xYQ0xdmFLhtetKgjK9AtF4INwDVwuJZvpK19ENHg1wYn7T0w9phYyCL5+HEpgJtX4ZYG6HJkDbtd2yP6cg==",
+      "dependencies": {
+        "@floating-ui/core": "^1.0.3"
+      }
+    },
     "node_modules/@hapi/hoek": {
       "version": "9.3.0",
       "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
@@ -279,10 +294,10 @@
       }
     },
     "node_modules/@popperjs/core": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npm.taobao.org/@popperjs/core/download/@popperjs/core-2.9.2.tgz?cache=0&sync_timestamp=1617290098226&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40popperjs%2Fcore%2Fdownload%2F%40popperjs%2Fcore-2.9.2.tgz",
-      "integrity": "sha1-rep7aVPLs0ZRdmsFSEaOdDxqI1M=",
-      "license": "MIT",
+      "name": "@sxzz/popperjs-es",
+      "version": "2.11.7",
+      "resolved": "https://registry.npmjs.org/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
+      "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/popperjs"
@@ -362,6 +377,19 @@
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
       "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="
     },
+    "node_modules/@types/lodash": {
+      "version": "4.14.191",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz",
+      "integrity": "sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ=="
+    },
+    "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==",
+      "dependencies": {
+        "@types/lodash": "*"
+      }
+    },
     "node_modules/@types/mini-css-extract-plugin": {
       "version": "0.9.1",
       "resolved": "https://registry.nlark.com/@types/mini-css-extract-plugin/download/@types/mini-css-extract-plugin-0.9.1.tgz?cache=0&sync_timestamp=1621241867700&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fmini-css-extract-plugin%2Fdownload%2F%40types%2Fmini-css-extract-plugin-0.9.1.tgz",
@@ -383,6 +411,11 @@
       "integrity": "sha512-taW5/WYqo36N7V39oYyHP9Ipfd5pNFvGTIQsNGj86xV88YQ7GnI30/yMfKDF7Zgin0m3e+ikX88FvImnK4RjGw==",
       "optional": true
     },
+    "node_modules/@types/web-bluetooth": {
+      "version": "0.0.16",
+      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz",
+      "integrity": "sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ=="
+    },
     "node_modules/@types/webpack": {
       "version": "5.28.0",
       "resolved": "https://registry.nlark.com/@types/webpack/download/@types/webpack-5.28.0.tgz?cache=0&sync_timestamp=1621533733988&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fwebpack%2Fdownload%2F%40types%2Fwebpack-5.28.0.tgz",
@@ -772,6 +805,89 @@
       "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.39.tgz",
       "integrity": "sha512-D3dl2ZB9qE6mTuWPk9RlhDeP1dgNRUKC3NJxji74A4yL8M2MwlhLKUC/49WHjrNzSPug58fWx/yFbaTzGAQSBw=="
     },
+    "node_modules/@vueuse/core": {
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-9.6.0.tgz",
+      "integrity": "sha512-qGUcjKQXHgN+jqXEgpeZGoxdCbIDCdVPz3QiF1uyecVGbMuM63o96I1GjYx5zskKgRI0FKSNsVWM7rwrRMTf6A==",
+      "dependencies": {
+        "@types/web-bluetooth": "^0.0.16",
+        "@vueuse/metadata": "9.6.0",
+        "@vueuse/shared": "9.6.0",
+        "vue-demi": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@vueuse/core/node_modules/vue-demi": {
+      "version": "0.13.11",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz",
+      "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==",
+      "hasInstallScript": true,
+      "bin": {
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@vueuse/metadata": {
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-9.6.0.tgz",
+      "integrity": "sha512-sIC8R+kWkIdpi5X2z2Gk8TRYzmczDwHRhEFfCu2P+XW2JdPoXrziqsGpDDsN7ykBx4ilwieS7JUIweVGhvZ93w==",
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@vueuse/shared": {
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-9.6.0.tgz",
+      "integrity": "sha512-/eDchxYYhkHnFyrb00t90UfjCx94kRHxc7J1GtBCqCG4HyPMX+krV9XJgVtWIsAMaxKVU4fC8NSUviG1JkwhUQ==",
+      "dependencies": {
+        "vue-demi": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@vueuse/shared/node_modules/vue-demi": {
+      "version": "0.13.11",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz",
+      "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==",
+      "hasInstallScript": true,
+      "bin": {
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.11.0",
       "resolved": "https://registry.npm.taobao.org/@webassemblyjs/ast/download/@webassemblyjs/ast-1.11.0.tgz",
@@ -1142,10 +1258,9 @@
       }
     },
     "node_modules/async-validator": {
-      "version": "3.5.2",
-      "resolved": "https://registry.nlark.com/async-validator/download/async-validator-3.5.2.tgz",
-      "integrity": "sha1-aOhmqWgk6LJpT/eoMcGiXETV5QA=",
-      "license": "MIT"
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-4.2.5.tgz",
+      "integrity": "sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg=="
     },
     "node_modules/asynckit": {
       "version": "0.4.0",
@@ -1863,21 +1978,28 @@
       "license": "ISC"
     },
     "node_modules/element-plus": {
-      "version": "1.0.2-beta.71",
-      "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-1.0.2-beta.71.tgz",
-      "integrity": "sha512-tlfbRORIav8gJcIpjZI5F6aJIVHIaDuGO6/vKu43lgYq4JS2JPNRTjvrSE2p4f5xLfaFNfOWjCS3sybXLfMg8g==",
-      "dependencies": {
-        "@element-plus/icons": "^0.0.11",
-        "@popperjs/core": "^2.4.4",
-        "async-validator": "^3.4.0",
-        "dayjs": "1.x",
-        "lodash": "^4.17.20",
-        "mitt": "^2.1.0",
-        "normalize-wheel": "^1.0.1",
-        "resize-observer-polyfill": "^1.5.1"
+      "version": "2.2.26",
+      "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.2.26.tgz",
+      "integrity": "sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==",
+      "dependencies": {
+        "@ctrl/tinycolor": "^3.4.1",
+        "@element-plus/icons-vue": "^2.0.6",
+        "@floating-ui/dom": "^1.0.1",
+        "@popperjs/core": "npm:@sxzz/popperjs-es@^2.11.7",
+        "@types/lodash": "^4.14.182",
+        "@types/lodash-es": "^4.17.6",
+        "@vueuse/core": "^9.1.0",
+        "async-validator": "^4.2.5",
+        "dayjs": "^1.11.3",
+        "escape-html": "^1.0.3",
+        "lodash": "^4.17.21",
+        "lodash-es": "^4.17.21",
+        "lodash-unified": "^1.0.2",
+        "memoize-one": "^6.0.0",
+        "normalize-wheel-es": "^1.2.0"
       },
       "peerDependencies": {
-        "vue": "3.1.x"
+        "vue": "^3.2.0"
       }
     },
     "node_modules/emmet": {
@@ -1988,6 +2110,11 @@
         "node": ">=6"
       }
     },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+    },
     "node_modules/escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -3334,6 +3461,21 @@
       "integrity": "sha1-Z5WRxWTDv/quhFTPCz3zcMPWkRw=",
       "license": "MIT"
     },
+    "node_modules/lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+    },
+    "node_modules/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==",
+      "peerDependencies": {
+        "@types/lodash-es": "*",
+        "lodash": "*",
+        "lodash-es": "*"
+      }
+    },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
@@ -3360,6 +3502,11 @@
         "sourcemap-codec": "^1.4.4"
       }
     },
+    "node_modules/memoize-one": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz",
+      "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="
+    },
     "node_modules/merge-source-map": {
       "version": "1.1.0",
       "resolved": "https://registry.npm.taobao.org/merge-source-map/download/merge-source-map-1.1.0.tgz",
@@ -3437,12 +3584,6 @@
       "integrity": "sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI=",
       "license": "MIT"
     },
-    "node_modules/mitt": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npm.taobao.org/mitt/download/mitt-2.1.0.tgz",
-      "integrity": "sha1-90BXfCMXbGIFsSGylzUU6t4bIjA=",
-      "license": "MIT"
-    },
     "node_modules/moment": {
       "version": "2.29.4",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
@@ -3527,11 +3668,10 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/normalize-wheel": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
-      "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU=",
-      "license": "BSD-3-Clause"
+    "node_modules/normalize-wheel-es": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/normalize-wheel-es/-/normalize-wheel-es-1.2.0.tgz",
+      "integrity": "sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw=="
     },
     "node_modules/nwmatcher": {
       "version": "1.4.4",
@@ -4072,12 +4212,6 @@
       "integrity": "sha512-3Zjgh+8b5fhRJBQZoy+zbVKpAQGLyka0MPgW3zruTF4dFFJ8Fqcfu9YsAvi/rvdcaTeWG3MkbZv4WKxAn/84Lg==",
       "dev": true
     },
-    "node_modules/resize-observer-polyfill": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz",
-      "integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ=",
-      "license": "MIT"
-    },
     "node_modules/resolve": {
       "version": "1.22.1",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
@@ -5738,10 +5872,10 @@
         "to-fast-properties": "^2.0.0"
       }
     },
-    "@element-plus/icons": {
-      "version": "0.0.11",
-      "resolved": "https://registry.npmjs.org/@element-plus/icons/-/icons-0.0.11.tgz",
-      "integrity": "sha512-iKQXSxXu131Ai+I9Ymtcof9WId7kaXvB1+WRfAfpQCW7UiAMYgdNDqb/u0hgTo2Yq3MwC4MWJnNuTBEpG8r7+A=="
+    "@ctrl/tinycolor": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.5.0.tgz",
+      "integrity": "sha512-tlJpwF40DEQcfR/QF+wNMVyGMaO9FQp6Z1Wahj4Gk3CJQYHwA2xVG7iKDFdW6zuxZY9XWOpGcfNCTsX4McOsOg=="
     },
     "@element-plus/icons-vue": {
       "version": "2.0.10",
@@ -5791,6 +5925,19 @@
         "strip-json-comments": "^3.1.1"
       }
     },
+    "@floating-ui/core": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.0.3.tgz",
+      "integrity": "sha512-27FDAEVHrAEQI1UV+7FIjZrFK862gBoAG0USoPMU7RoBCmaTDt6bnKVW/J2uPnOPI6TWqiWGtS7RFN+tN/k+vQ=="
+    },
+    "@floating-ui/dom": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.0.8.tgz",
+      "integrity": "sha512-uUm1xYQ0xdmFLhtetKgjK9AtF4INwDVwuJZvpK19ENHg1wYn7T0w9phYyCL5+HEpgJtX4ZYG6HJkDbtd2yP6cg==",
+      "requires": {
+        "@floating-ui/core": "^1.0.3"
+      }
+    },
     "@hapi/hoek": {
       "version": "9.3.0",
       "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
@@ -5882,9 +6029,9 @@
       }
     },
     "@popperjs/core": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npm.taobao.org/@popperjs/core/download/@popperjs/core-2.9.2.tgz?cache=0&sync_timestamp=1617290098226&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40popperjs%2Fcore%2Fdownload%2F%40popperjs%2Fcore-2.9.2.tgz",
-      "integrity": "sha1-rep7aVPLs0ZRdmsFSEaOdDxqI1M="
+      "version": "npm:@sxzz/popperjs-es@2.11.7",
+      "resolved": "https://registry.npmjs.org/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
+      "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
     },
     "@rollup/pluginutils": {
       "version": "4.1.0",
@@ -5950,6 +6097,19 @@
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
       "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="
     },
+    "@types/lodash": {
+      "version": "4.14.191",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz",
+      "integrity": "sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ=="
+    },
+    "@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==",
+      "requires": {
+        "@types/lodash": "*"
+      }
+    },
     "@types/mini-css-extract-plugin": {
       "version": "0.9.1",
       "resolved": "https://registry.nlark.com/@types/mini-css-extract-plugin/download/@types/mini-css-extract-plugin-0.9.1.tgz?cache=0&sync_timestamp=1621241867700&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fmini-css-extract-plugin%2Fdownload%2F%40types%2Fmini-css-extract-plugin-0.9.1.tgz",
@@ -5969,6 +6129,11 @@
       "integrity": "sha512-taW5/WYqo36N7V39oYyHP9Ipfd5pNFvGTIQsNGj86xV88YQ7GnI30/yMfKDF7Zgin0m3e+ikX88FvImnK4RjGw==",
       "optional": true
     },
+    "@types/web-bluetooth": {
+      "version": "0.0.16",
+      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz",
+      "integrity": "sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ=="
+    },
     "@types/webpack": {
       "version": "5.28.0",
       "resolved": "https://registry.nlark.com/@types/webpack/download/@types/webpack-5.28.0.tgz?cache=0&sync_timestamp=1621533733988&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fwebpack%2Fdownload%2F%40types%2Fwebpack-5.28.0.tgz",
@@ -6259,6 +6424,46 @@
       "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.39.tgz",
       "integrity": "sha512-D3dl2ZB9qE6mTuWPk9RlhDeP1dgNRUKC3NJxji74A4yL8M2MwlhLKUC/49WHjrNzSPug58fWx/yFbaTzGAQSBw=="
     },
+    "@vueuse/core": {
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-9.6.0.tgz",
+      "integrity": "sha512-qGUcjKQXHgN+jqXEgpeZGoxdCbIDCdVPz3QiF1uyecVGbMuM63o96I1GjYx5zskKgRI0FKSNsVWM7rwrRMTf6A==",
+      "requires": {
+        "@types/web-bluetooth": "^0.0.16",
+        "@vueuse/metadata": "9.6.0",
+        "@vueuse/shared": "9.6.0",
+        "vue-demi": "*"
+      },
+      "dependencies": {
+        "vue-demi": {
+          "version": "0.13.11",
+          "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz",
+          "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==",
+          "requires": {}
+        }
+      }
+    },
+    "@vueuse/metadata": {
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-9.6.0.tgz",
+      "integrity": "sha512-sIC8R+kWkIdpi5X2z2Gk8TRYzmczDwHRhEFfCu2P+XW2JdPoXrziqsGpDDsN7ykBx4ilwieS7JUIweVGhvZ93w=="
+    },
+    "@vueuse/shared": {
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-9.6.0.tgz",
+      "integrity": "sha512-/eDchxYYhkHnFyrb00t90UfjCx94kRHxc7J1GtBCqCG4HyPMX+krV9XJgVtWIsAMaxKVU4fC8NSUviG1JkwhUQ==",
+      "requires": {
+        "vue-demi": "*"
+      },
+      "dependencies": {
+        "vue-demi": {
+          "version": "0.13.11",
+          "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz",
+          "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==",
+          "requires": {}
+        }
+      }
+    },
     "@webassemblyjs/ast": {
       "version": "1.11.0",
       "resolved": "https://registry.npm.taobao.org/@webassemblyjs/ast/download/@webassemblyjs/ast-1.11.0.tgz",
@@ -6562,9 +6767,9 @@
       "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="
     },
     "async-validator": {
-      "version": "3.5.2",
-      "resolved": "https://registry.nlark.com/async-validator/download/async-validator-3.5.2.tgz",
-      "integrity": "sha1-aOhmqWgk6LJpT/eoMcGiXETV5QA="
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-4.2.5.tgz",
+      "integrity": "sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg=="
     },
     "asynckit": {
       "version": "0.4.0",
@@ -7122,18 +7327,25 @@
       "integrity": "sha1-8HdWqpLKvVpu7G9JFSWmT+YvmLk="
     },
     "element-plus": {
-      "version": "1.0.2-beta.71",
-      "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-1.0.2-beta.71.tgz",
-      "integrity": "sha512-tlfbRORIav8gJcIpjZI5F6aJIVHIaDuGO6/vKu43lgYq4JS2JPNRTjvrSE2p4f5xLfaFNfOWjCS3sybXLfMg8g==",
-      "requires": {
-        "@element-plus/icons": "^0.0.11",
-        "@popperjs/core": "^2.4.4",
-        "async-validator": "^3.4.0",
-        "dayjs": "1.x",
-        "lodash": "^4.17.20",
-        "mitt": "^2.1.0",
-        "normalize-wheel": "^1.0.1",
-        "resize-observer-polyfill": "^1.5.1"
+      "version": "2.2.26",
+      "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.2.26.tgz",
+      "integrity": "sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg==",
+      "requires": {
+        "@ctrl/tinycolor": "^3.4.1",
+        "@element-plus/icons-vue": "^2.0.6",
+        "@floating-ui/dom": "^1.0.1",
+        "@popperjs/core": "npm:@sxzz/popperjs-es@^2.11.7",
+        "@types/lodash": "^4.14.182",
+        "@types/lodash-es": "^4.17.6",
+        "@vueuse/core": "^9.1.0",
+        "async-validator": "^4.2.5",
+        "dayjs": "^1.11.3",
+        "escape-html": "^1.0.3",
+        "lodash": "^4.17.21",
+        "lodash-es": "^4.17.21",
+        "lodash-unified": "^1.0.2",
+        "memoize-one": "^6.0.0",
+        "normalize-wheel-es": "^1.2.0"
       }
     },
     "emmet": {
@@ -7219,6 +7431,11 @@
       "resolved": "https://registry.nlark.com/escalade/download/escalade-3.1.1.tgz",
       "integrity": "sha1-2M/ccACWXFoBdLSoLqpcBVJ0LkA="
     },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+    },
     "escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -8247,6 +8464,17 @@
       "resolved": "https://registry.nlark.com/lodash/download/lodash-4.17.21.tgz",
       "integrity": "sha1-Z5WRxWTDv/quhFTPCz3zcMPWkRw="
     },
+    "lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+    },
+    "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": {}
+    },
     "lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
@@ -8271,6 +8499,11 @@
         "sourcemap-codec": "^1.4.4"
       }
     },
+    "memoize-one": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz",
+      "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="
+    },
     "merge-source-map": {
       "version": "1.1.0",
       "resolved": "https://registry.npm.taobao.org/merge-source-map/download/merge-source-map-1.1.0.tgz",
@@ -8328,11 +8561,6 @@
       "resolved": "https://registry.nlark.com/minimist/download/minimist-1.2.5.tgz?cache=0&sync_timestamp=1618847017774&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fminimist%2Fdownload%2Fminimist-1.2.5.tgz",
       "integrity": "sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI="
     },
-    "mitt": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npm.taobao.org/mitt/download/mitt-2.1.0.tgz",
-      "integrity": "sha1-90BXfCMXbGIFsSGylzUU6t4bIjA="
-    },
     "moment": {
       "version": "2.29.4",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
@@ -8394,10 +8622,10 @@
       "integrity": "sha1-Dc1p/yOhybEf0JeDFmRKA4ghamU=",
       "dev": true
     },
-    "normalize-wheel": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz",
-      "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
+    "normalize-wheel-es": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/normalize-wheel-es/-/normalize-wheel-es-1.2.0.tgz",
+      "integrity": "sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw=="
     },
     "nwmatcher": {
       "version": "1.4.4",
@@ -8837,11 +9065,6 @@
       "integrity": "sha512-3Zjgh+8b5fhRJBQZoy+zbVKpAQGLyka0MPgW3zruTF4dFFJ8Fqcfu9YsAvi/rvdcaTeWG3MkbZv4WKxAn/84Lg==",
       "dev": true
     },
-    "resize-observer-polyfill": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz",
-      "integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ="
-    },
     "resolve": {
       "version": "1.22.1",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",

+ 1 - 1
package.json

@@ -17,7 +17,7 @@
     "dayjs": "^1.10.7",
     "default-passive-events": "^2.0.0",
     "echarts": "^5.2.2",
-    "element-plus": "^1.0.2-beta.71",
+    "element-plus": "^2.2.26",
     "file-saver": "^2.0.5",
     "html2canvas": "^1.0.0-rc.7",
     "jsencrypt": "^3.2.1",

+ 2 - 2
src/components/Sidebar.vue

@@ -12,7 +12,7 @@
     >
       <template v-for="item in router.options.routes[1].children">
         <template v-if="item.children">
-          <el-submenu :index="item.path" :key="item.name"  v-if="item.isshow == identity || !item.isshow">
+          <el-sub-menu :index="item.path" :key="item.name"  v-if="item.isshow == identity || !item.isshow">
             <template #title>
               <i :class="item.icon" style="margin-right:10px"></i>
               <span>{{ item.meta.title }}</span>
@@ -22,7 +22,7 @@
                 {{ subItem.meta.title }}
               </el-menu-item>
             </template>
-          </el-submenu>
+          </el-sub-menu>
         </template>
         <template v-else >
           <el-menu-item :index="item.path" :key="item.path"  v-if="item.isshow == identity || !item.isshow">

+ 1 - 1
src/components/SubmitBtn.vue

@@ -8,5 +8,5 @@ const props = defineProps({
 </script>
 <template>
 	<!-- <div class="h-[24px] flex justify-center items-center text-white bg-[rgba(0,70,199,0.5)] px-[15px] cursor-pointer text-[14px] rounded-[13px]">{{props.desc}}</div> -->
-	<el-button size="small" type="primary">{{props.desc}}</el-button>
+	<el-button type="primary">{{props.desc}}</el-button>
 </template>

+ 1 - 1
src/components/tree.vue

@@ -12,7 +12,7 @@
 				<p v-if="node.level === 1" class="flex justify-between items-center text-[12px]"
 					:class="[props.showCheckbox ? 'w-[84%]' : 'w-[90%]']">
 					<span>{{ node.label }}</span>
-					<el-icon class="!text-[rgb(64,158,255)]" title="刷新" @click.stop="emits('refresh')">
+					<el-icon class="!text-[rgb(64,158,255)]" size="14" title="刷新" @click.stop="emits('refresh')">
 						<RefreshRight />
 					</el-icon>
 				</p>

+ 1 - 1
src/main.js

@@ -5,7 +5,7 @@ import App from './App.vue'
 import router from './router'
 import store from './store'
 import ElementPlus from 'element-plus'
-import 'element-plus/lib/theme-chalk/index.css'
+import 'element-plus/dist/index.css'
 import './assets/css/icon.css'
 import './assets/font/iconfont.css'
 import 'default-passive-events'

+ 1 - 1
src/pages/dataAnalysis/combine/components/current-scatter-chart.vue

@@ -104,7 +104,7 @@ export default {
         color: [
             "#3D54BE",
             "rgb(255,0,0)",
-            "#d3d3d3",
+            "#a1a1a1",
             "#0098d9",
             "#FF8700",
             "#005eaa",

+ 1 - 1
src/pages/dataAnalysis/lineAnalysis/components/current-scatter-chart.vue

@@ -185,7 +185,7 @@ export default {
         legend: {
           show: that.showLegend,
           // data: [ "拟合功率", "保证功率","无用点", "有用点", "Cp值"],
-          right: "120",
+          right: 170,
           type: 'scroll',
           top: "5",
           // icon: "circle",

+ 29 - 7
src/pages/dataAnalysis/rateAnalysis/index.vue

@@ -8,6 +8,7 @@ import scatterSingleChartCop from './components/scatterSingleChart.vue'
 import { ElMessage } from 'element-plus';
 import { onMounted, ref, onActivated, shallowRef, reactive, nextTick } from 'vue'
 import request from '@/api/axios.js'
+import tools from '@tools/htmlToPdf.js'
 // import flowerRes from '@/data/flower.json'
 import lineChartRes from '@/data/lineNew.json'
 /**配置参数 */
@@ -27,6 +28,7 @@ const funExcelChange = async (obj) => {
 		}
 	})  // 选中excel当前项时, excel列表赋值给dialog 下拉框
 	queryForm.checkIds = excelList.value.map(o => o.id)
+	checkAll.value = true
 	funSubmit()
 }
 const funExcelCheckChange = ({ checkArr, data }) => {
@@ -296,7 +298,6 @@ const lineDataSet = ref([
 	}
 ])
 const funChartSelect = async (batch) => {
-	console.log(batch)
 	const wDataArr = []
 	const yDataArr = []
 	let scatterls = []
@@ -396,6 +397,8 @@ const wtTab = ref('table')
 const dialog = ref(false)
 const actChartName = ref('')
 const actDiaTitle = ref('')
+const diaPanelRef = ref()
+const exportLoading = ref(false)
 const actCopList = ref([
 	// {
 	// 	xAxis: [],
@@ -407,9 +410,18 @@ const actCopList = ref([
 	// 	dataset: []
 	// }
 ])
+const checkAll = ref(true)
 const queryForm = reactive({
 	checkIds: []
 })
+const funCheckAll = () => {
+	checkAll.value = !checkAll.value
+	if(checkAll.value){
+		queryForm.checkIds = chartExcelList.value.map(o => o.id)
+	}else{
+		queryForm.checkIds = []
+	}
+}
 const chartExcelList = ref([]) //dialog 下拉项
 const funActCop = (obj, type) => {
 	switch(type){
@@ -616,6 +628,12 @@ const funDiaSubmit = async () => {
 		}
 	}
 }
+const funDiaExport = () => {
+	exportLoading.value = true
+	tools.scrollToPDF(diaPanelRef.value, actDiaTitle.value, () => {
+		exportLoading.value = false
+	})
+}
 /**created */
 // funGetTree()
 /**activated */
@@ -663,18 +681,22 @@ onActivated(() => {
 		<el-dialog draggable width="80%" v-model="dialog" :title="actDiaTitle">
 			<el-form class="whitespace-nowrap" :inline="true" :model="queryForm">
 				<el-form-item label="" class="!mb-0">
-					<el-select v-model="queryForm.checkIds" clearable collapse-tags multiple>
+					<el-select v-model="queryForm.checkIds" clearable @clear="checkAll = false" collapse-tags multiple>
+						<el-option label="全选" :class="{'selected': checkAll}" @click="funCheckAll"></el-option>
 						<el-option v-for="item in chartExcelList" :key="item.id" :value="item.id" :label="item.name"></el-option>
 					</el-select>
 				</el-form-item>
 				<el-form-item class="!mb-0">
-					<submit-btn desc="多台展示" @click="funDiaSubmit"></submit-btn>
+					<submit-btn desc="查询" @click="funDiaSubmit"></submit-btn>
+					<submit-btn desc="导出" @click="funDiaExport"></submit-btn>
 				</el-form-item>
 			</el-form>
-			<div class="flex flex-wrap justify-center items-center h-[750px] overflow-y-auto overflow-x-hidden">
-				<component :is="item.actCop" :width="actCopList.length > 1 ? '50%' : '100%'" height="600px" v-for="item in actCopList"
-					:key="item.id" :xAxis="item.xAxis" :subtext="item.subtext" :title="item.title"
-					:series="item.series" :isDiaAlone="(actCopList.length === 1)" :yAxis="item.yAxis" :dataset="item.dataset" :brush="item.isBrush" @getSelected="funChartSelect"></component>
+			<div v-loading="exportLoading">
+				<div ref="diaPanelRef" class="flex flex-wrap justify-center items-center h-[650px] overflow-y-auto overflow-x-hidden">
+					<component :is="item.actCop" :width="actCopList.length > 1 ? '50%' : '100%'" height="100%" v-for="item in actCopList"
+						:key="item.id" :xAxis="item.xAxis" :subtext="item.subtext" :title="item.title"
+						:series="item.series" :isDiaAlone="(actCopList.length === 1)" :yAxis="item.yAxis" :dataset="item.dataset" :brush="item.isBrush" @getSelected="funChartSelect"></component>
+				</div>
 			</div>
 		</el-dialog>
 		<div class="relative shadow rounded-[6px] shadow-blue-500 px-[10px] pt-[10px] pb-[10px]">

+ 14 - 3
src/pages/dataFilter/prepare/components/search.vue

@@ -28,11 +28,21 @@ const funStationChange = (stationId) => {
 	}
 }
 /**风机 */
+const checkAll = ref(true)
 const windList = ref([])
 const funGetWind = async (stationId) => {
 	const res = await request.get("/base/windturbine", {params: { stationId }})
 	windList.value = res.data
 	queryForm.wtIds = res.data.map(o => o.id)
+	checkAll.value = true
+}
+const funCheckAll = () => {
+	checkAll.value = !checkAll.value
+	if(checkAll.value){
+		queryForm.wtIds = windList.value.map(o => o.id)
+	}else{
+		queryForm.wtIds = []
+	}
 }
 /**导出 */
 const emits = defineEmits(['submit'])
@@ -63,14 +73,15 @@ funGetStation()
 <template>
 	<div class="pl-[20px] flex items-center h-[80px] relative">
 		<div class="absolute top-[-7px] left-[20px] text-[#B3B3B3] text-[14px]">操作面板</div>
-		<el-form class="whitespace-nowrap" :inline="true" :model="queryForm">
+		<el-form class="" :inline="true" :model="queryForm">
 			<el-form-item label="场站" class="!mb-0">
 				<el-select v-model="queryForm.station" class="w-[150px]" @change="funStationChange">
 					<el-option v-for="item in stationList" :key="item.id" :label="item.name" :value="item.id"></el-option>
 				</el-select>
 			</el-form-item>
 			<el-form-item label="风机" class="!mb-0">
-				<el-select multiple clearable class="w-[150px]" v-model="queryForm.wtIds" collapse-tags>
+				<el-select multiple clearable class="w-[150px]" v-model="queryForm.wtIds" @clear="checkAll = false" collapse-tags>
+					<el-option label="全选" :class="{'selected': checkAll}" @click="funCheckAll"></el-option>
 					<el-option v-for="item in windList" :key="item.id" :label="item.name" :value="item.id"></el-option>
 				</el-select>
 			</el-form-item>
@@ -80,7 +91,7 @@ funGetStation()
 			<el-form-item label="结束时间" class="!mb-0">
 				<el-date-picker type="date" class="!w-[150px]" v-model="queryForm.et"></el-date-picker>
 			</el-form-item>
-			<el-form-item label="等间隔" class="!mb-0 h-[40px]">
+			<el-form-item label="等间隔" class="!mb-0">
 				<el-radio-group v-model="queryForm.interval">
 					<el-radio :label="1">一秒钟</el-radio>
 					<el-radio :label="2">一分钟</el-radio>

+ 49 - 1
src/tools/htmlToPdf.js

@@ -93,7 +93,55 @@ function downloadPDF(ele, pdfName) {
 
 }
 
+const scrollToPDF = (ele, pdfName, call = () => {}) => {
+    let scrollHeight = ele.scrollHeight
+    let offsetHeight = ele.offsetHeight
+    ele.scrollTo(0,0)
+    const pdf = new JsPDF('', 'pt', 'a4');
+    const funRepeat = (y, yCount, callback = () => {}) => {
+        html2canvas(ele, {
+            width: ele.offsetWidth,
+            height: offsetHeight,
+            allowTaint: false,
+            useCORS: true,
+        }).then(canvas => {
+            // 592.28 841.89
+            const ratio = 592.28 / canvas.width  //获取宽度占比
+            const pageHeight = canvas.height * ratio //获取canvas 画到pdf的高度
+            const pageData = canvas.toDataURL('image/jpeg', ratio);
+            let position = pageHeight * yCount //定位
+            let addPos = 0
+            if(position>0){
+                while(position > 841.89){  // top - 分页大小 = 当前元素到当前页顶部距离
+                    position -= 841.89
+                }
+                if(position + pageHeight > 841.89){  // 到顶部距离 + 当前元素高度 > 页面高度 则进行填充下一页
+                    pdf.addPage()
+                    addPos = 0  // 填充下一页后, 设置当前元素填充位置为 新页的top为0
+                }else{
+                    addPos = pageHeight // 如果不大于页面高度  则当前元素填充位置为一个元素高度
+                }
+            }
+            pdf.addImage(pageData, 'JPEG', 0, addPos, 592.28, pageHeight)
+            y += offsetHeight
+            yCount += 1  //循环 数量
+            ele.scrollTo(0, y);
+            if (y < scrollHeight) {
+                funRepeat(y,yCount,callback)
+            } else {
+                callback()
+            }
+        })
+    }
+    funRepeat(0, 0, () => {
+        pdf.save(pdfName)
+        ele.scrollTo(0,0)
+        call()
+    })
+}
+
 
 export default {
-    downloadPDF
+    scrollToPDF, //对滚动元素截图导出pdf
+    downloadPDF //对非滚动元素截图适配pdf
 }

+ 117 - 44
yarn.lock

@@ -37,16 +37,16 @@
     "@babel/helper-validator-identifier" "^7.14.0"
     "to-fast-properties" "^2.0.0"
 
-"@element-plus/icons-vue@^2.0.10":
+"@ctrl/tinycolor@^3.4.1":
+  "integrity" "sha512-tlJpwF40DEQcfR/QF+wNMVyGMaO9FQp6Z1Wahj4Gk3CJQYHwA2xVG7iKDFdW6zuxZY9XWOpGcfNCTsX4McOsOg=="
+  "resolved" "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.5.0.tgz"
+  "version" "3.5.0"
+
+"@element-plus/icons-vue@^2.0.10", "@element-plus/icons-vue@^2.0.6":
   "integrity" "sha512-ygEZ1mwPjcPo/OulhzLE7mtDrQBWI8vZzEWSNB2W/RNCRjoQGwbaK4N8lV4rid7Ts4qvySU3njMN7YCiSlSaTQ=="
   "resolved" "https://registry.npmjs.org/@element-plus/icons-vue/-/icons-vue-2.0.10.tgz"
   "version" "2.0.10"
 
-"@element-plus/icons@^0.0.11":
-  "integrity" "sha512-iKQXSxXu131Ai+I9Ymtcof9WId7kaXvB1+WRfAfpQCW7UiAMYgdNDqb/u0hgTo2Yq3MwC4MWJnNuTBEpG8r7+A=="
-  "resolved" "https://registry.npmjs.org/@element-plus/icons/-/icons-0.0.11.tgz"
-  "version" "0.0.11"
-
 "@emmetio/abbreviation@^2.2.3":
   "integrity" "sha512-87pltuCPt99aL+y9xS6GPZ+Wmmyhll2WXH73gG/xpGcQ84DRnptBsI2r0BeIQ0EB/SQTOe2ANPqFqj3Rj5FOGA=="
   "resolved" "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.2.3.tgz"
@@ -81,6 +81,18 @@
     "minimatch" "^3.1.2"
     "strip-json-comments" "^3.1.1"
 
+"@floating-ui/core@^1.0.3":
+  "integrity" "sha512-27FDAEVHrAEQI1UV+7FIjZrFK862gBoAG0USoPMU7RoBCmaTDt6bnKVW/J2uPnOPI6TWqiWGtS7RFN+tN/k+vQ=="
+  "resolved" "https://registry.npmjs.org/@floating-ui/core/-/core-1.0.3.tgz"
+  "version" "1.0.3"
+
+"@floating-ui/dom@^1.0.1":
+  "integrity" "sha512-uUm1xYQ0xdmFLhtetKgjK9AtF4INwDVwuJZvpK19ENHg1wYn7T0w9phYyCL5+HEpgJtX4ZYG6HJkDbtd2yP6cg=="
+  "resolved" "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.0.8.tgz"
+  "version" "1.0.8"
+  dependencies:
+    "@floating-ui/core" "^1.0.3"
+
 "@hapi/hoek@^9.0.0":
   "integrity" "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ=="
   "resolved" "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz"
@@ -152,10 +164,10 @@
   dependencies:
     "pako" "^1.0.10"
 
-"@popperjs/core@^2.4.4":
-  "integrity" "sha1-rep7aVPLs0ZRdmsFSEaOdDxqI1M="
-  "resolved" "https://registry.npm.taobao.org/@popperjs/core/download/@popperjs/core-2.9.2.tgz?cache=0&sync_timestamp=1617290098226&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40popperjs%2Fcore%2Fdownload%2F%40popperjs%2Fcore-2.9.2.tgz"
-  "version" "2.9.2"
+"@popperjs/core@npm:@sxzz/popperjs-es@^2.11.7":
+  "integrity" "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
+  "resolved" "https://registry.npmjs.org/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz"
+  "version" "2.11.7"
 
 "@rollup/pluginutils@^4.1.0":
   "integrity" "sha1-Dcxhx4DjkldVT+t/dyB9zsoTyDg="
@@ -227,6 +239,18 @@
   "resolved" "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz"
   "version" "7.0.11"
 
+"@types/lodash-es@*", "@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"
+  dependencies:
+    "@types/lodash" "*"
+
+"@types/lodash@*", "@types/lodash@^4.14.182":
+  "integrity" "sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ=="
+  "resolved" "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz"
+  "version" "4.14.191"
+
 "@types/mini-css-extract-plugin@^0.9.1":
   "integrity" "sha1-1L3eUZcyb8oDnUGPS92gPcdNxFE="
   "resolved" "https://registry.nlark.com/@types/mini-css-extract-plugin/download/@types/mini-css-extract-plugin-0.9.1.tgz?cache=0&sync_timestamp=1621241867700&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fmini-css-extract-plugin%2Fdownload%2F%40types%2Fmini-css-extract-plugin-0.9.1.tgz"
@@ -244,6 +268,11 @@
   "resolved" "https://registry.npmjs.org/@types/raf/-/raf-3.4.0.tgz"
   "version" "3.4.0"
 
+"@types/web-bluetooth@^0.0.16":
+  "integrity" "sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ=="
+  "resolved" "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz"
+  "version" "0.0.16"
+
 "@types/webpack@*":
   "integrity" "sha1-eN3gYhLwONd+VBFs/mnoiuntLAM="
   "resolved" "https://registry.nlark.com/@types/webpack/download/@types/webpack-5.28.0.tgz?cache=0&sync_timestamp=1621533733988&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fwebpack%2Fdownload%2F%40types%2Fwebpack-5.28.0.tgz"
@@ -487,6 +516,28 @@
   "resolved" "https://registry.npmjs.org/@vue/shared/-/shared-3.2.39.tgz"
   "version" "3.2.39"
 
+"@vueuse/core@^9.1.0":
+  "integrity" "sha512-qGUcjKQXHgN+jqXEgpeZGoxdCbIDCdVPz3QiF1uyecVGbMuM63o96I1GjYx5zskKgRI0FKSNsVWM7rwrRMTf6A=="
+  "resolved" "https://registry.npmjs.org/@vueuse/core/-/core-9.6.0.tgz"
+  "version" "9.6.0"
+  dependencies:
+    "@types/web-bluetooth" "^0.0.16"
+    "@vueuse/metadata" "9.6.0"
+    "@vueuse/shared" "9.6.0"
+    "vue-demi" "*"
+
+"@vueuse/metadata@9.6.0":
+  "integrity" "sha512-sIC8R+kWkIdpi5X2z2Gk8TRYzmczDwHRhEFfCu2P+XW2JdPoXrziqsGpDDsN7ykBx4ilwieS7JUIweVGhvZ93w=="
+  "resolved" "https://registry.npmjs.org/@vueuse/metadata/-/metadata-9.6.0.tgz"
+  "version" "9.6.0"
+
+"@vueuse/shared@9.6.0":
+  "integrity" "sha512-/eDchxYYhkHnFyrb00t90UfjCx94kRHxc7J1GtBCqCG4HyPMX+krV9XJgVtWIsAMaxKVU4fC8NSUviG1JkwhUQ=="
+  "resolved" "https://registry.npmjs.org/@vueuse/shared/-/shared-9.6.0.tgz"
+  "version" "9.6.0"
+  dependencies:
+    "vue-demi" "*"
+
 "@webassemblyjs/ast@1.11.0":
   "integrity" "sha1-papnnv3J5RcHpCBxOdpXkgVVlh8="
   "resolved" "https://registry.npm.taobao.org/@webassemblyjs/ast/download/@webassemblyjs/ast-1.11.0.tgz"
@@ -767,10 +818,10 @@
   "resolved" "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
   "version" "1.0.0"
 
-"async-validator@^3.4.0":
-  "integrity" "sha1-aOhmqWgk6LJpT/eoMcGiXETV5QA="
-  "resolved" "https://registry.nlark.com/async-validator/download/async-validator-3.5.2.tgz"
-  "version" "3.5.2"
+"async-validator@^4.2.5":
+  "integrity" "sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg=="
+  "resolved" "https://registry.npmjs.org/async-validator/-/async-validator-4.2.5.tgz"
+  "version" "4.2.5"
 
 "asynckit@^0.4.0":
   "integrity" "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
@@ -1192,7 +1243,7 @@
   dependencies:
     "assert-plus" "^1.0.0"
 
-"dayjs@^1.10.7", "dayjs@1.x":
+"dayjs@^1.10.7", "dayjs@^1.11.3":
   "integrity" "sha512-Zj/lPM5hOvQ1Bf7uAvewDaUcsJoI6JmNqmHhHl3nyumwe0XHwt8sWdOVAPACJzCebL8gQCi+K49w7iKWnGwX9g=="
   "resolved" "https://registry.npmjs.org/dayjs/-/dayjs-1.11.4.tgz"
   "version" "1.11.4"
@@ -1319,19 +1370,26 @@
   "resolved" "https://registry.nlark.com/electron-to-chromium/download/electron-to-chromium-1.3.739.tgz?cache=0&sync_timestamp=1621994584976&other_urls=https%3A%2F%2Fregistry.nlark.com%2Felectron-to-chromium%2Fdownload%2Felectron-to-chromium-1.3.739.tgz"
   "version" "1.3.739"
 
-"element-plus@^1.0.2-beta.71":
-  "integrity" "sha512-tlfbRORIav8gJcIpjZI5F6aJIVHIaDuGO6/vKu43lgYq4JS2JPNRTjvrSE2p4f5xLfaFNfOWjCS3sybXLfMg8g=="
-  "resolved" "https://registry.npmjs.org/element-plus/-/element-plus-1.0.2-beta.71.tgz"
-  "version" "1.0.2-beta.71"
-  dependencies:
-    "@element-plus/icons" "^0.0.11"
-    "@popperjs/core" "^2.4.4"
-    "async-validator" "^3.4.0"
-    "dayjs" "1.x"
-    "lodash" "^4.17.20"
-    "mitt" "^2.1.0"
-    "normalize-wheel" "^1.0.1"
-    "resize-observer-polyfill" "^1.5.1"
+"element-plus@^2.2.26":
+  "integrity" "sha512-O/rdY5m9DkclpVg8r3GynyqCunm7MxSR142xSsjrZA77bi7bcwA3SIy6SPEDqHi5R4KqgkGYgKSp4Q4e3irbYg=="
+  "resolved" "https://registry.npmjs.org/element-plus/-/element-plus-2.2.26.tgz"
+  "version" "2.2.26"
+  dependencies:
+    "@ctrl/tinycolor" "^3.4.1"
+    "@element-plus/icons-vue" "^2.0.6"
+    "@floating-ui/dom" "^1.0.1"
+    "@popperjs/core" "npm:@sxzz/popperjs-es@^2.11.7"
+    "@types/lodash" "^4.14.182"
+    "@types/lodash-es" "^4.17.6"
+    "@vueuse/core" "^9.1.0"
+    "async-validator" "^4.2.5"
+    "dayjs" "^1.11.3"
+    "escape-html" "^1.0.3"
+    "lodash" "^4.17.21"
+    "lodash-es" "^4.17.21"
+    "lodash-unified" "^1.0.2"
+    "memoize-one" "^6.0.0"
+    "normalize-wheel-es" "^1.2.0"
 
 "emmet@^2.3.0":
   "integrity" "sha512-pLS4PBPDdxuUAmw7Me7+TcHbykTsBKN/S9XJbUOMFQrNv9MoshzyMFK/R57JBm94/6HSL4vHnDeEmxlC82NQ4A=="
@@ -1405,6 +1463,11 @@
   "resolved" "https://registry.nlark.com/escalade/download/escalade-3.1.1.tgz"
   "version" "3.1.1"
 
+"escape-html@^1.0.3":
+  "integrity" "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+  "resolved" "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"
+  "version" "1.0.3"
+
 "escape-string-regexp@^4.0.0":
   "integrity" "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
   "resolved" "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"
@@ -2217,12 +2280,22 @@
   dependencies:
     "p-locate" "^5.0.0"
 
+"lodash-es@*", "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"
+
+"lodash-unified@^1.0.2":
+  "integrity" "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ=="
+  "resolved" "https://registry.npmjs.org/lodash-unified/-/lodash-unified-1.0.3.tgz"
+  "version" "1.0.3"
+
 "lodash.merge@^4.6.2":
   "integrity" "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
   "resolved" "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"
   "version" "4.6.2"
 
-"lodash@^4.17.20", "lodash@^4.17.21":
+"lodash@*", "lodash@^4.17.20", "lodash@^4.17.21":
   "integrity" "sha1-Z5WRxWTDv/quhFTPCz3zcMPWkRw="
   "resolved" "https://registry.nlark.com/lodash/download/lodash-4.17.21.tgz"
   "version" "4.17.21"
@@ -2262,6 +2335,11 @@
   dependencies:
     "sourcemap-codec" "^1.4.8"
 
+"memoize-one@^6.0.0":
+  "integrity" "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="
+  "resolved" "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz"
+  "version" "6.0.0"
+
 "merge-source-map@^1.1.0":
   "integrity" "sha1-L93n5gIJOfcJBqaPLXrmheTIxkY="
   "resolved" "https://registry.npm.taobao.org/merge-source-map/download/merge-source-map-1.1.0.tgz"
@@ -2318,11 +2396,6 @@
   "resolved" "https://registry.nlark.com/minimist/download/minimist-1.2.5.tgz?cache=0&sync_timestamp=1618847017774&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fminimist%2Fdownload%2Fminimist-1.2.5.tgz"
   "version" "1.2.5"
 
-"mitt@^2.1.0":
-  "integrity" "sha1-90BXfCMXbGIFsSGylzUU6t4bIjA="
-  "resolved" "https://registry.npm.taobao.org/mitt/download/mitt-2.1.0.tgz"
-  "version" "2.1.0"
-
 "moment@^2.29.1":
   "integrity" "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
   "resolved" "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz"
@@ -2381,10 +2454,10 @@
   "resolved" "https://registry.npm.taobao.org/normalize-path/download/normalize-path-3.0.0.tgz"
   "version" "3.0.0"
 
-"normalize-wheel@^1.0.1":
-  "integrity" "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
-  "resolved" "https://registry.npm.taobao.org/normalize-wheel/download/normalize-wheel-1.0.1.tgz"
-  "version" "1.0.1"
+"normalize-wheel-es@^1.2.0":
+  "integrity" "sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw=="
+  "resolved" "https://registry.npmjs.org/normalize-wheel-es/-/normalize-wheel-es-1.2.0.tgz"
+  "version" "1.2.0"
 
 "nwmatcher@>= 1.3.7 < 2.0.0":
   "integrity" "sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ=="
@@ -2768,11 +2841,6 @@
     "tunnel-agent" "^0.6.0"
     "uuid" "^3.3.2"
 
-"resize-observer-polyfill@^1.5.1":
-  "integrity" "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ="
-  "resolved" "https://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz"
-  "version" "1.5.1"
-
 "resolve-from@^4.0.0":
   "integrity" "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
   "resolved" "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"
@@ -3441,6 +3509,11 @@
   dependencies:
     "cropperjs" "^1.5.6"
 
+"vue-demi@*":
+  "integrity" "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A=="
+  "resolved" "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz"
+  "version" "0.13.11"
+
 "vue-loader-v16@^16.0.0-beta.5.4":
   "integrity" "sha1-j7z4fcacmXns13etuk6KDn/ZWn4="
   "resolved" "https://registry.npm.taobao.org/vue-loader-v16/download/vue-loader-v16-16.0.0-beta.5.4.tgz"
@@ -3467,7 +3540,7 @@
   dependencies:
     "vscode-vue-languageservice" "^0.27.0"
 
-"vue@^3.0.0", "vue@^3.0.2", "vue@^3.2.0", "vue@^3.2.6", "vue@>=3.0.0", "vue@2 || 3", "vue@3.1.x", "vue@3.2.39":
+"vue@^3.0.0", "vue@^3.0.0-0 || ^2.6.0", "vue@^3.0.2", "vue@^3.2.0", "vue@^3.2.6", "vue@>=3.0.0", "vue@2 || 3", "vue@3.2.39":
   "integrity" "sha512-tRkguhRTw9NmIPXhzk21YFBqXHT2t+6C6wPOgQ50fcFVWnPdetmRqbmySRHznrYjX2E47u0cGlKGcxKZJ38R/g=="
   "resolved" "https://registry.npmjs.org/vue/-/vue-3.2.39.tgz"
   "version" "3.2.39"