From 9325ce5fdb9c0f8a4143c89ffeb1b2e367a5da97 Mon Sep 17 00:00:00 2001 From: gtz217 <535262213@qq.com> Date: Tue, 30 Nov 2021 21:05:26 +0800 Subject: [PATCH] update --- build/webpack.base.conf.js | 1 - index.html | 9 +- package-lock.json | 22 +- package.json | 2 +- src/components/Charts/BarChart.vue | 2 +- src/components/Charts/Keyboard.vue | 2 +- src/components/Charts/LineChart.1.vue | 143 ++++ src/components/Charts/LineChart.vue | 91 +- src/components/Charts/LineMarker.vue | 2 +- src/components/Charts/MixChart.vue | 25 +- src/components/Charts/PieChart.vue | 2 +- src/components/Charts/RingChart.vue | 50 +- src/components/Charts/ScatterChart.vue | 2 +- src/views/demo/echarts.vue | 2 +- src/views/energy/ammonia-analysis.vue | 730 +++++++++++++++- src/views/energy/ammonia.vue | 730 +++++++++++++++- src/views/energy/electric-acquisition.vue | 326 +++++++- src/views/energy/electric.vue | 48 +- src/views/energy/kiln-electric.vue | 787 +++++++++++++++++- src/views/energy/kiln-speed.vue | 730 +++++++++++++++- src/views/energy/nitrogen.vue | 730 +++++++++++++++- src/views/energy/process-temperature.vue | 730 +++++++++++++++- src/views/energy/sulfur-dioxide.vue | 730 +++++++++++++++- src/views/energy/sump-temperature.vue | 730 +++++++++++++++- static/config/init.js | 10 +- .../echarts-3.8.5/echarts.common.min.js | 1 - 26 files changed, 6514 insertions(+), 123 deletions(-) create mode 100644 src/components/Charts/LineChart.1.vue delete mode 100644 static/plugins/echarts-3.8.5/echarts.common.min.js diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index 8ec1948..049582c 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -98,7 +98,6 @@ module.exports = { // 引入外部库, 无需webpack打包处理 externals: { mockjs: 'Mock', - echarts: 'echarts', ueditor: 'UE' } } diff --git a/index.html b/index.html index 9aa7be6..78d490c 100644 --- a/index.html +++ b/index.html @@ -1,3 +1,11 @@ + @@ -13,7 +21,6 @@ - diff --git a/package-lock.json b/package-lock.json index 212ea45..c37186c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -522,8 +522,8 @@ }, "async-validator": { "version": "1.8.5", - "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz", - "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==", + "resolved": "https://registry.npmmirror.com/async-validator/download/async-validator-1.8.5.tgz?cache=0&sync_timestamp=1634529574100&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fasync-validator%2Fdownload%2Fasync-validator-1.8.5.tgz", + "integrity": "sha1-3D4I7B/Q3dtn5ghC8CwM0c7G1/A=", "requires": { "babel-runtime": "6.x" } @@ -3466,8 +3466,8 @@ }, "deepmerge": { "version": "1.5.2", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz", - "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==" + "resolved": "https://registry.nlark.com/deepmerge/download/deepmerge-1.5.2.tgz", + "integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M=" }, "default-require-extensions": { "version": "1.0.0", @@ -3893,8 +3893,8 @@ }, "element-ui": { "version": "2.8.2", - "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.8.2.tgz", - "integrity": "sha512-LABKHKGUyewFNvpf9BQLecB659Wq0XYvyP1tBveZ4RWpdlPSylDfGW/RLvDYU7zuCBoRasdZAz7ryjOwq1lLNg==", + "resolved": "https://registry.npmmirror.com/element-ui/download/element-ui-2.8.2.tgz?cache=0&sync_timestamp=1637231762535&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Felement-ui%2Fdownload%2Felement-ui-2.8.2.tgz", + "integrity": "sha1-Iaeky5Jhaw+LddTU5jfToc2MCd4=", "requires": { "async-validator": "~1.8.1", "babel-helper-vue-jsx-merge-props": "^2.0.0", @@ -11348,7 +11348,7 @@ }, "normalize-wheel": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz", + "resolved": "https://registry.nlark.com/normalize-wheel/download/normalize-wheel-1.0.1.tgz", "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU=" }, "npm": { @@ -17322,8 +17322,8 @@ }, "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==" + "resolved": "https://registry.nlark.com/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz?cache=0&sync_timestamp=1618846967396&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fresize-observer-polyfill%2Fdownload%2Fresize-observer-polyfill-1.5.1.tgz", + "integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ=" }, "resolve": { "version": "1.10.1", @@ -19015,8 +19015,8 @@ }, "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==" + "resolved": "https://registry.npm.taobao.org/throttle-debounce/download/throttle-debounce-1.1.0.tgz", + "integrity": "sha1-UYU9o3vmihVctugns1FKPEIuic0=" }, "through": { "version": "2.3.8", diff --git a/package.json b/package.json index f49e47e..6892f59 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "babel-plugin-component": "0.10.1", "babel-polyfill": "6.26.0", "echarts": "^5.2.2", - "element-ui": "2.8.2", + "element-ui": "^2.8.2", "gulp": "3.9.1", "gulp-concat": "2.6.1", "gulp-load-plugins": "1.5.0", diff --git a/src/components/Charts/BarChart.vue b/src/components/Charts/BarChart.vue index 8b860ce..a5c8a10 100644 --- a/src/components/Charts/BarChart.vue +++ b/src/components/Charts/BarChart.vue @@ -11,7 +11,7 @@ + + diff --git a/src/components/Charts/LineChart.vue b/src/components/Charts/LineChart.vue index ea9a990..181cf1d 100644 --- a/src/components/Charts/LineChart.vue +++ b/src/components/Charts/LineChart.vue @@ -3,7 +3,7 @@ -
+
@@ -11,13 +11,46 @@ - diff --git a/src/components/Charts/LineMarker.vue b/src/components/Charts/LineMarker.vue index 6737fa4..a8ece37 100644 --- a/src/components/Charts/LineMarker.vue +++ b/src/components/Charts/LineMarker.vue @@ -3,7 +3,7 @@ - + + diff --git a/src/views/energy/ammonia.vue b/src/views/energy/ammonia.vue index 518d7f5..c941f5c 100644 --- a/src/views/energy/ammonia.vue +++ b/src/views/energy/ammonia.vue @@ -1,7 +1,731 @@ + + + + + + + diff --git a/src/views/energy/electric-acquisition.vue b/src/views/energy/electric-acquisition.vue index 9cca3c7..6a2c79b 100644 --- a/src/views/energy/electric-acquisition.vue +++ b/src/views/energy/electric-acquisition.vue @@ -1,7 +1,319 @@ - + + + diff --git a/src/views/energy/electric.vue b/src/views/energy/electric.vue index 3ac199d..0663606 100644 --- a/src/views/energy/electric.vue +++ b/src/views/energy/electric.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2021-11-19 10:55:33 * @LastEditors: gtz - * @LastEditTime: 2021-11-26 16:53:20 + * @LastEditTime: 2021-11-30 20:19:52 * @Description: -->