From bf1584f43d73fc8763feea44aa113232aafc34af Mon Sep 17 00:00:00 2001 From: "@0Melon0" <576788380@qq.com> Date: Thu, 29 Feb 2024 15:36:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B7=A6=E4=B8=8B=E8=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- babel.config.js | 15 +- package-lock.json | 129 +++++++++++++++++- package.json | 3 + src/assets/svg/Monitor/BottomLeft/Box.svg | 1 + .../svg/Monitor/BottomLeft/MonthActive.svg | 1 + .../svg/Monitor/BottomLeft/Triangle.svg | 1 + .../svg/Monitor/BottomLeft/WeekActive.svg | 1 + .../{TopLeftBox.svg => TopLeft/Box.svg} | 0 .../ItemBox.svg} | 0 .../ItemBoxPurple.svg} | 0 .../svg/Monitor/{ => TopLeft}/PointPurple.svg | 0 .../Monitor/{ => TopLeft}/TriangleBlue.svg | 0 .../Monitor/{ => TopLeft}/TrianglePurple.svg | 0 src/assets/svg/Monitor/TopRight/Box.svg | 1 + src/assets/svg/Monitor/TopRight/ItemBox.svg | 1 + .../svg/Monitor/TopRight/ItemBoxBorder.svg | 1 + src/assets/svg/Monitor/TopRight/ItemLine.svg | 1 + .../svg/Monitor/TopRight/OpWaitIcon.svg | 1 + src/assets/svg/Monitor/TopRight/OpendIcon.svg | 1 + src/assets/svg/Monitor/TopRight/OpingIcon.svg | 1 + src/views/pageMonitor/bottomLeft/index.vue | 65 ++++++++- src/views/pageMonitor/topLeft/index.vue | 12 +- src/views/pageMonitor/topRight/index.vue | 86 +++++++++++- 23 files changed, 304 insertions(+), 17 deletions(-) create mode 100644 src/assets/svg/Monitor/BottomLeft/Box.svg create mode 100644 src/assets/svg/Monitor/BottomLeft/MonthActive.svg create mode 100644 src/assets/svg/Monitor/BottomLeft/Triangle.svg create mode 100644 src/assets/svg/Monitor/BottomLeft/WeekActive.svg rename src/assets/svg/Monitor/{TopLeftBox.svg => TopLeft/Box.svg} (100%) rename src/assets/svg/Monitor/{TopLeftItemBox.svg => TopLeft/ItemBox.svg} (100%) rename src/assets/svg/Monitor/{TopLeftItemBoxPurple.svg => TopLeft/ItemBoxPurple.svg} (100%) rename src/assets/svg/Monitor/{ => TopLeft}/PointPurple.svg (100%) rename src/assets/svg/Monitor/{ => TopLeft}/TriangleBlue.svg (100%) rename src/assets/svg/Monitor/{ => TopLeft}/TrianglePurple.svg (100%) create mode 100644 src/assets/svg/Monitor/TopRight/Box.svg create mode 100644 src/assets/svg/Monitor/TopRight/ItemBox.svg create mode 100644 src/assets/svg/Monitor/TopRight/ItemBoxBorder.svg create mode 100644 src/assets/svg/Monitor/TopRight/ItemLine.svg create mode 100644 src/assets/svg/Monitor/TopRight/OpWaitIcon.svg create mode 100644 src/assets/svg/Monitor/TopRight/OpendIcon.svg create mode 100644 src/assets/svg/Monitor/TopRight/OpingIcon.svg diff --git a/babel.config.js b/babel.config.js index e955840..3d5235d 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,5 +1,12 @@ module.exports = { - presets: [ - '@vue/cli-plugin-babel/preset' - ] -} + presets: ['@vue/cli-plugin-babel/preset'], + plugins: [ + [ + 'component', + { + libraryName: 'element-ui', + styleLibraryName: 'theme-chalk', + }, + ], + ], +}; diff --git a/package-lock.json b/package-lock.json index 5add144..20e43b0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,8 @@ "dependencies": { "core-js": "^3.8.3", "dayjs": "^1.11.10", + "echarts": "^5.5.0", + "element-ui": "^2.15.14", "vue": "^2.6.14", "vue-router": "^3.5.1", "vuex": "^3.6.2" @@ -23,6 +25,7 @@ "@vue/cli-plugin-vuex": "~5.0.0", "@vue/cli-service": "~5.0.0", "autoprefixer": "^10.4.17", + "babel-plugin-component": "^1.1.1", "eslint": "^7.32.0", "eslint-plugin-vue": "^8.0.3", "postcss": "^8.4.35", @@ -3658,6 +3661,14 @@ "lodash": "^4.17.14" } }, + "node_modules/async-validator": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz", + "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==", + "dependencies": { + "babel-runtime": "6.x" + } + }, "node_modules/at-least-node": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", @@ -3704,6 +3715,11 @@ "postcss": "^8.1.0" } }, + "node_modules/babel-helper-vue-jsx-merge-props": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz", + "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==" + }, "node_modules/babel-loader": { "version": "8.3.0", "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz", @@ -3737,6 +3753,36 @@ "node": ">=8.9.0" } }, + "node_modules/babel-plugin-component": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/babel-plugin-component/-/babel-plugin-component-1.1.1.tgz", + "integrity": "sha512-WUw887kJf2GH80Ng/ZMctKZ511iamHNqPhd9uKo14yzisvV7Wt1EckIrb8oq/uCz3B3PpAW7Xfl7AkTLDYT6ag==", + "dev": true, + "dependencies": { + "@babel/helper-module-imports": "7.0.0-beta.35" + } + }, + "node_modules/babel-plugin-component/node_modules/@babel/helper-module-imports": { + "version": "7.0.0-beta.35", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.35.tgz", + "integrity": "sha512-vaC1KyIZSuyWb3Lj277fX0pxivyHwuDU4xZsofqgYAbkDxNieMg2vuhzP5AgMweMY7fCQUMTi+BgPqTLjkxXFg==", + "dev": true, + "dependencies": { + "@babel/types": "7.0.0-beta.35", + "lodash": "^4.2.0" + } + }, + "node_modules/babel-plugin-component/node_modules/@babel/types": { + "version": "7.0.0-beta.35", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.35.tgz", + "integrity": "sha512-y9XT11CozHDgjWcTdxmhSj13rJVXpa5ZXwjjOiTedjaM0ba5ItqdS02t31EhPl7HtOWxsZkYCCUNrSfrOisA6w==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2", + "lodash": "^4.2.0", + "to-fast-properties": "^2.0.0" + } + }, "node_modules/babel-plugin-dynamic-import-node": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", @@ -3785,6 +3831,27 @@ "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, + "node_modules/babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==", + "dependencies": { + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" + } + }, + "node_modules/babel-runtime/node_modules/core-js": { + "version": "2.6.12", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", + "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==", + "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.", + "hasInstallScript": true + }, + "node_modules/babel-runtime/node_modules/regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -4997,7 +5064,6 @@ "version": "1.5.2", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz", "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -5379,6 +5445,20 @@ "node": ">=6.0.0" } }, + "node_modules/echarts": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.5.0.tgz", + "integrity": "sha512-rNYnNCzqDAPCr4m/fqyUFv7fD9qIsd50S6GDFgO1DxZhncCsNsG7IfUlAlvZe5oSEQxtsjnHiUuppzccry93Xw==", + "dependencies": { + "tslib": "2.3.0", + "zrender": "5.5.0" + } + }, + "node_modules/echarts/node_modules/tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" + }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -5391,6 +5471,22 @@ "integrity": "sha512-yDYeobbTEe4TNooEzOQO6xFqg9XnAkVy2Lod1C1B2it8u47JNLYvl9nLDWBamqUakWB8Jc1hhS1uHUNYTNQdfw==", "dev": true }, + "node_modules/element-ui": { + "version": "2.15.14", + "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.14.tgz", + "integrity": "sha512-2v9fHL0ZGINotOlRIAJD5YuVB8V7WKxrE9Qy7dXhRipa035+kF7WuU/z+tEmLVPBcJ0zt8mOu1DKpWcVzBK8IA==", + "dependencies": { + "async-validator": "~1.8.1", + "babel-helper-vue-jsx-merge-props": "^2.0.0", + "deepmerge": "^1.2.0", + "normalize-wheel": "^1.0.1", + "resize-observer-polyfill": "^1.5.0", + "throttle-debounce": "^1.0.1" + }, + "peerDependencies": { + "vue": "^2.5.17" + } + }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -8470,6 +8566,11 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/normalize-wheel": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz", + "integrity": "sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA==" + }, "node_modules/npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", @@ -10099,6 +10200,11 @@ "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", "dev": true }, + "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.8", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", @@ -11276,6 +11382,14 @@ "url": "https://opencollective.com/webpack" } }, + "node_modules/throttle-debounce": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz", + "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg==", + "engines": { + "node": ">=4" + } + }, "node_modules/thunky": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", @@ -12524,6 +12638,19 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==", "dev": true + }, + "node_modules/zrender": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.5.0.tgz", + "integrity": "sha512-O3MilSi/9mwoovx77m6ROZM7sXShR/O/JIanvzTwjN3FORfLSr81PsUGd7jlaYOeds9d8tw82oP44+3YucVo+w==", + "dependencies": { + "tslib": "2.3.0" + } + }, + "node_modules/zrender/node_modules/tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" } } } diff --git a/package.json b/package.json index 5f3efb9..8356fd6 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,8 @@ "dependencies": { "core-js": "^3.8.3", "dayjs": "^1.11.10", + "echarts": "^5.5.0", + "element-ui": "^2.15.14", "vue": "^2.6.14", "vue-router": "^3.5.1", "vuex": "^3.6.2" @@ -23,6 +25,7 @@ "@vue/cli-plugin-vuex": "~5.0.0", "@vue/cli-service": "~5.0.0", "autoprefixer": "^10.4.17", + "babel-plugin-component": "^1.1.1", "eslint": "^7.32.0", "eslint-plugin-vue": "^8.0.3", "postcss": "^8.4.35", diff --git a/src/assets/svg/Monitor/BottomLeft/Box.svg b/src/assets/svg/Monitor/BottomLeft/Box.svg new file mode 100644 index 0000000..faab613 --- /dev/null +++ b/src/assets/svg/Monitor/BottomLeft/Box.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/Monitor/BottomLeft/MonthActive.svg b/src/assets/svg/Monitor/BottomLeft/MonthActive.svg new file mode 100644 index 0000000..57d7180 --- /dev/null +++ b/src/assets/svg/Monitor/BottomLeft/MonthActive.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/Monitor/BottomLeft/Triangle.svg b/src/assets/svg/Monitor/BottomLeft/Triangle.svg new file mode 100644 index 0000000..a282a62 --- /dev/null +++ b/src/assets/svg/Monitor/BottomLeft/Triangle.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/Monitor/BottomLeft/WeekActive.svg b/src/assets/svg/Monitor/BottomLeft/WeekActive.svg new file mode 100644 index 0000000..bb891bd --- /dev/null +++ b/src/assets/svg/Monitor/BottomLeft/WeekActive.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/Monitor/TopLeftBox.svg b/src/assets/svg/Monitor/TopLeft/Box.svg similarity index 100% rename from src/assets/svg/Monitor/TopLeftBox.svg rename to src/assets/svg/Monitor/TopLeft/Box.svg diff --git a/src/assets/svg/Monitor/TopLeftItemBox.svg b/src/assets/svg/Monitor/TopLeft/ItemBox.svg similarity index 100% rename from src/assets/svg/Monitor/TopLeftItemBox.svg rename to src/assets/svg/Monitor/TopLeft/ItemBox.svg diff --git a/src/assets/svg/Monitor/TopLeftItemBoxPurple.svg b/src/assets/svg/Monitor/TopLeft/ItemBoxPurple.svg similarity index 100% rename from src/assets/svg/Monitor/TopLeftItemBoxPurple.svg rename to src/assets/svg/Monitor/TopLeft/ItemBoxPurple.svg diff --git a/src/assets/svg/Monitor/PointPurple.svg b/src/assets/svg/Monitor/TopLeft/PointPurple.svg similarity index 100% rename from src/assets/svg/Monitor/PointPurple.svg rename to src/assets/svg/Monitor/TopLeft/PointPurple.svg diff --git a/src/assets/svg/Monitor/TriangleBlue.svg b/src/assets/svg/Monitor/TopLeft/TriangleBlue.svg similarity index 100% rename from src/assets/svg/Monitor/TriangleBlue.svg rename to src/assets/svg/Monitor/TopLeft/TriangleBlue.svg diff --git a/src/assets/svg/Monitor/TrianglePurple.svg b/src/assets/svg/Monitor/TopLeft/TrianglePurple.svg similarity index 100% rename from src/assets/svg/Monitor/TrianglePurple.svg rename to src/assets/svg/Monitor/TopLeft/TrianglePurple.svg diff --git a/src/assets/svg/Monitor/TopRight/Box.svg b/src/assets/svg/Monitor/TopRight/Box.svg new file mode 100644 index 0000000..d72650e --- /dev/null +++ b/src/assets/svg/Monitor/TopRight/Box.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/Monitor/TopRight/ItemBox.svg b/src/assets/svg/Monitor/TopRight/ItemBox.svg new file mode 100644 index 0000000..c741a0e --- /dev/null +++ b/src/assets/svg/Monitor/TopRight/ItemBox.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/Monitor/TopRight/ItemBoxBorder.svg b/src/assets/svg/Monitor/TopRight/ItemBoxBorder.svg new file mode 100644 index 0000000..9f78a46 --- /dev/null +++ b/src/assets/svg/Monitor/TopRight/ItemBoxBorder.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/Monitor/TopRight/ItemLine.svg b/src/assets/svg/Monitor/TopRight/ItemLine.svg new file mode 100644 index 0000000..513af99 --- /dev/null +++ b/src/assets/svg/Monitor/TopRight/ItemLine.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/Monitor/TopRight/OpWaitIcon.svg b/src/assets/svg/Monitor/TopRight/OpWaitIcon.svg new file mode 100644 index 0000000..8fc8585 --- /dev/null +++ b/src/assets/svg/Monitor/TopRight/OpWaitIcon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/Monitor/TopRight/OpendIcon.svg b/src/assets/svg/Monitor/TopRight/OpendIcon.svg new file mode 100644 index 0000000..7f99086 --- /dev/null +++ b/src/assets/svg/Monitor/TopRight/OpendIcon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/svg/Monitor/TopRight/OpingIcon.svg b/src/assets/svg/Monitor/TopRight/OpingIcon.svg new file mode 100644 index 0000000..0b4ba9a --- /dev/null +++ b/src/assets/svg/Monitor/TopRight/OpingIcon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/pageMonitor/bottomLeft/index.vue b/src/views/pageMonitor/bottomLeft/index.vue index fe4f1c2..b8d6729 100644 --- a/src/views/pageMonitor/bottomLeft/index.vue +++ b/src/views/pageMonitor/bottomLeft/index.vue @@ -1,9 +1,68 @@ - + diff --git a/src/views/pageMonitor/topLeft/index.vue b/src/views/pageMonitor/topLeft/index.vue index 188b381..6c0f1c2 100644 --- a/src/views/pageMonitor/topLeft/index.vue +++ b/src/views/pageMonitor/topLeft/index.vue @@ -3,7 +3,7 @@