diff --git a/package-lock.json b/package-lock.json index a81377c..2f260a6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "盐湖区人民医院数字看板", + "name": "salt-lake-hospital", "version": "0.1.0", "lockfileVersion": 1, "requires": true, @@ -3668,6 +3668,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 +5294,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", diff --git a/package.json b/package.json index 56f9d59..570b1fe 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..b7b34c1 --- /dev/null +++ b/src/components/Panel/Panel.vue @@ -0,0 +1,119 @@ + + + + + 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 @@