diff --git a/package-lock.json b/package-lock.json index 1de62b0..ac2ae30 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1808,16 +1808,6 @@ "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=", "dev": true }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1606792302448&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz", - "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, "cacache": { "version": "13.0.1", "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.1.tgz?cache=0&sync_timestamp=1594427999421&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-13.0.1.tgz", @@ -1850,34 +1840,6 @@ "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA=", "dev": true }, - "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz", - "integrity": "sha1-ThSHCmGNni7dl92DRf2dncMVZGo=", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz", - "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz", - "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=", - "dev": true, - "optional": true - }, "css-loader": { "version": "3.6.0", "resolved": "https://registry.npm.taobao.org/css-loader/download/css-loader-3.6.0.tgz?cache=0&sync_timestamp=1604507107408&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcss-loader%2Fdownload%2Fcss-loader-3.6.0.tgz", @@ -1931,13 +1893,6 @@ "universalify": "^0.1.0" } }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz", - "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=", - "dev": true, - "optional": true - }, "icss-utils": { "version": "4.1.1", "resolved": "https://registry.npm.taobao.org/icss-utils/download/icss-utils-4.1.1.tgz?cache=0&sync_timestamp=1602527330977&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ficss-utils%2Fdownload%2Ficss-utils-4.1.1.tgz", @@ -2052,16 +2007,6 @@ "minipass": "^3.1.1" } }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1606205010380&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz", - "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - }, "terser-webpack-plugin": { "version": "2.3.8", "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz?cache=0&sync_timestamp=1603881757308&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-2.3.8.tgz", @@ -2078,32 +2023,6 @@ "terser": "^4.6.12", "webpack-sources": "^1.4.3" } - }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.1.1", - "resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-16.1.1.tgz?cache=0&sync_timestamp=1607093652138&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-16.1.1.tgz", - "integrity": "sha1-9bKG1grGiGaExjoXoYQ5HMngGZo=", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz", - "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - } - } } } }, @@ -3668,6 +3587,11 @@ "resolved": "https://registry.npm.taobao.org/classnames/download/classnames-2.2.6.tgz", "integrity": "sha1-Q5Nb/90pHzJtrQogUwmzjQD2UM4=" }, + "claygl": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/claygl/-/claygl-1.3.0.tgz", + "integrity": "sha512-+gGtJjT6SSHD2l2yC3MCubW/sCV40tZuSs5opdtn79vFSGUgp/lH139RNEQ6Jy078/L0aV8odCw8RSrUcMfLaQ==" + }, "clean-css": { "version": "4.2.3", "resolved": "https://registry.npm.taobao.org/clean-css/download/clean-css-4.2.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fclean-css%2Fdownload%2Fclean-css-4.2.3.tgz", @@ -5289,6 +5213,15 @@ "zrender": "4.3.2" } }, + "echarts-gl": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/echarts-gl/-/echarts-gl-1.1.1.tgz", + "integrity": "sha512-cRSTU9H+Ay+qCUFowm+2XcxYqCfi/OLK805NISeJunKgJa5p+7p7tnHZoI0qKebjtHu8VbFSOBk9UvWZ01adng==", + "requires": { + "claygl": "^1.2.1", + "zrender": "^4.0.4" + } + }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz", @@ -12641,6 +12574,87 @@ } } }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.1.1", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.1.tgz", + "integrity": "sha512-wz/+HFg/3SBayHWAlZXARcnDTl3VOChrfW9YnxvAweiuyKX/7IGx1ad/4yJHmwhgWlOVYMAbTiI7GV8G33PfGQ==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "vue-ref": { "version": "2.0.0", "resolved": "https://registry.npm.taobao.org/vue-ref/download/vue-ref-2.0.0.tgz", diff --git a/package.json b/package.json index 2e3d3ee..d1265f3 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "compression-webpack-plugin": "^6.1.1", "core-js": "^3.6.5", "echarts": "^4.9.0", + "echarts-gl": "^1.1.1", "moment": "^2.29.1", "register-service-worker": "^1.7.1", "stylus": "^0.54.8", diff --git a/src/components/Duration/Duration.js b/src/components/Duration/Duration.js index 65d43c3..9049792 100644 --- a/src/components/Duration/Duration.js +++ b/src/components/Duration/Duration.js @@ -1,12 +1,12 @@ var option = { - title: { - left: '10%', - textStyle: { - fontWeight: 'normal', - color: '#fff', //标题颜色 - }, - text: '急救时长分析', - }, + // title: { + // left: '10%', + // textStyle: { + // fontWeight: 'normal', + // color: '#fff', //标题颜色 + // }, + // text: '急救时长分析', + // }, tooltip: { trigger: 'axis' }, legend: { x: 'center', @@ -14,7 +14,7 @@ var option = { data: ['我院记录', '国际水准', '当前数据'], textStyle: { fontWeight: 'normal', - color: '#fff', //标题颜色 + color: '#ccc', //标题颜色 }, }, grid: { @@ -30,25 +30,26 @@ var option = { axisLabel: { textStyle: { fontWeight: 'normal', - color: '#fff', //标题颜色 + color: '#ccc', //标题颜色 }, }, }, yAxis: { type: 'value', name: '秒', - interval: 100, + interval: 200, axisLabel: { textStyle: { fontWeight: 'normal', - color: '#fff', //标题颜色 + color: '#ccc', //标题颜色 }, }, + nameTextStyle: { color: '#ccc' }, splitLine: { show: true, lineStyle: { type: 'dashed', - color: '#666', + color: '#ccc', }, }, }, @@ -57,22 +58,26 @@ var option = { name: '我院记录', type: 'line', stack: '总量', - symbolSize: 10, + symbolSize: 6, + // symbol: 'star', data: [120, 132, 101, 134, 90, 230, 210], + color: 'rgb(18, 131, 227)', }, { name: '国际水准', type: 'line', stack: '总量', - symbolSize: 10, + symbolSize: 6, data: [220, 182, 191, 234, 290, 330, 310], + color: 'rgb(30, 231, 231)', }, { name: '当前数据', type: 'line', stack: '总量', - symbolSize: 10, + symbolSize: 6, data: [150, 232, 201, 154, 190, 330, 410], + color: 'rgb(227, 18, 187)', }, ], }; diff --git a/src/components/Duration/Duration.vue b/src/components/Duration/Duration.vue index 97e7ea1..1b39d61 100644 --- a/src/components/Duration/Duration.vue +++ b/src/components/Duration/Duration.vue @@ -10,7 +10,7 @@ export default { name: 'Duration', data() { return { - msg: 'Welcome to Your Vue.js App', + // msg: 'Welcome to Your Vue.js App', width: '', height: '', }; diff --git a/src/components/FastEd/FastEd.vue b/src/components/FastEd/FastEd.vue new file mode 100644 index 0000000..18c0431 --- /dev/null +++ b/src/components/FastEd/FastEd.vue @@ -0,0 +1,147 @@ + + + + + diff --git a/src/components/Panel/Panel.vue b/src/components/Panel/Panel.vue new file mode 100644 index 0000000..46b697b --- /dev/null +++ b/src/components/Panel/Panel.vue @@ -0,0 +1,112 @@ + + + + + diff --git a/src/components/Sensor/Sensor.js b/src/components/Sensor/Sensor.js index 13ca551..7729fc0 100644 --- a/src/components/Sensor/Sensor.js +++ b/src/components/Sensor/Sensor.js @@ -1,19 +1,19 @@ var option = { - title: { - left: '10%', - textStyle: { - fontWeight: 'normal', - color: '#fff', //标题颜色 - }, - text: '震动传感器', - }, + // title: { + // left: '10%', + // textStyle: { + // fontWeight: 'normal', + // color: '#ccc', //标题颜色 + // }, + // text: '震动传感器', + // }, legend: { x: 'center', y: 'top', data: ['传感器1', '传感器2'], textStyle: { fontWeight: 'normal', - color: '#fff', //标题颜色 + color: '#ccc', //标题颜色 }, }, xAxis: { @@ -48,9 +48,10 @@ var option = { series: [ { name: '传感器1', - data: [120, 932, 401, 534, 290, 530, 320], + data: [320, 932, 401, 834, 290, 530, 620], type: 'line', smooth: true, + symbol: 'none', itemStyle: { color: { type: 'linear', @@ -61,24 +62,25 @@ var option = { colorStops: [ { offset: 0, - color: '#0A4982', // 0% 处的颜色 + color: 'rgba(10,73,130,1)', // 0% 处的颜色 }, { offset: 1, - color: '#243859', // 100% 处的颜色 + color: 'rgba(10,73,130,0)', // 100% 处的颜色 }, ], global: false, // 缺省为 false }, }, areaStyle: {}, - lineStyle: { normal: { width: 4 } }, + lineStyle: { normal: { color: 'rgb(39,149,243)', width: 2 } }, }, { name: '传感器2', - data: [220, 632, 101, 834, 490, 630, 220], + data: [420, 232, 401, 234, 490, 230, 420], type: 'line', smooth: true, + symbol: 'none', itemStyle: { color: { type: 'linear', @@ -89,18 +91,18 @@ var option = { colorStops: [ { offset: 0, - color: '#B2F2FC', // 0% 处的颜色 + color: 'rgba(91,225,251,1)', // 0% 处的颜色 }, { offset: 1, - color: '#5BE1FB', // 100% 处的颜色 + color: 'rgba(91,225,251,0)', // 100% 处的颜色 }, ], global: false, // 缺省为 false }, }, areaStyle: {}, - lineStyle: { normal: { width: 4 } }, + lineStyle: { normal: { color: 'rgb(91,225,251)', width: 2 } }, }, ], }; diff --git a/src/components/Sensor/Sensor.vue b/src/components/Sensor/Sensor.vue index b34be51..8d0331f 100644 --- a/src/components/Sensor/Sensor.vue +++ b/src/components/Sensor/Sensor.vue @@ -1,16 +1,16 @@