diff --git a/public/webA/index.js b/public/webA/index.js index 395bdf6..3f435d6 100644 --- a/public/webA/index.js +++ b/public/webA/index.js @@ -860,11 +860,11 @@ var createScene = function() { new BABYLON.Vector3(0, -1, 0), scene ); - camera.setTarget(new BABYLON.Vector3(0, 3, 0)); + camera.setTarget(new BABYLON.Vector3(0, 2, 0)); camera.attachControl(canvas, true); camera.lowerRadiusLimit = 2.0; // 这里是最大的位置,值越大,物体越小 camera.upperRadiusLimit = 40; - camera.radius = 11.558; + camera.radius = 10.48; camera.alpha = (Math.PI * -211.4) / 180; camera.beta = (Math.PI * 66) / 180; camera.inertia = 0.1; // 缩放的快慢 diff --git a/src/assets/images/largeScreen/device-1.png b/src/assets/images/largeScreen/device-1.png new file mode 100644 index 0000000..24f32e8 Binary files /dev/null and b/src/assets/images/largeScreen/device-1.png differ diff --git a/src/assets/images/largeScreen/device-2.png b/src/assets/images/largeScreen/device-2.png new file mode 100644 index 0000000..821f34d Binary files /dev/null and b/src/assets/images/largeScreen/device-2.png differ diff --git a/src/assets/images/largeScreen/device-3.png b/src/assets/images/largeScreen/device-3.png new file mode 100644 index 0000000..fa2798b Binary files /dev/null and b/src/assets/images/largeScreen/device-3.png differ diff --git a/src/assets/images/largeScreen/device-4.png b/src/assets/images/largeScreen/device-4.png new file mode 100644 index 0000000..04d1e9c Binary files /dev/null and b/src/assets/images/largeScreen/device-4.png differ diff --git a/src/assets/images/largeScreen/device-5.png b/src/assets/images/largeScreen/device-5.png new file mode 100644 index 0000000..a3e20e6 Binary files /dev/null and b/src/assets/images/largeScreen/device-5.png differ diff --git a/src/assets/images/largeScreen/device-6.png b/src/assets/images/largeScreen/device-6.png new file mode 100644 index 0000000..e2322e2 Binary files /dev/null and b/src/assets/images/largeScreen/device-6.png differ diff --git a/src/assets/images/largeScreen/item-left.png b/src/assets/images/largeScreen/item-left.png new file mode 100644 index 0000000..5b52a18 Binary files /dev/null and b/src/assets/images/largeScreen/item-left.png differ diff --git a/src/assets/images/largeScreen/item-right.png b/src/assets/images/largeScreen/item-right.png new file mode 100644 index 0000000..dc062eb Binary files /dev/null and b/src/assets/images/largeScreen/item-right.png differ diff --git a/src/assets/images/largeScreen/top-title.png b/src/assets/images/largeScreen/top-title.png new file mode 100644 index 0000000..ec3b330 Binary files /dev/null and b/src/assets/images/largeScreen/top-title.png differ diff --git a/src/assets/images/largeScreen/top.png b/src/assets/images/largeScreen/top.png new file mode 100644 index 0000000..5e71fb4 Binary files /dev/null and b/src/assets/images/largeScreen/top.png differ diff --git a/src/router/routers.js b/src/router/routers.js index e46713d..2fc6c48 100644 --- a/src/router/routers.js +++ b/src/router/routers.js @@ -57,6 +57,11 @@ export const constantRouterMap = [ meta: { title: '个人中心' } } ] + }, + { + path: '/environmentalScreen', + component: (resolve) => require(['@/views/environmentalScreen/index'], resolve), + hidden: true } ] diff --git a/src/views/dashboard/LineChart.vue b/src/views/dashboard/LineChart.vue index e654168..f93580d 100644 --- a/src/views/dashboard/LineChart.vue +++ b/src/views/dashboard/LineChart.vue @@ -58,13 +58,29 @@ export default { }, methods: { initChart() { - this.chart = echarts.init(this.$el, 'macarons') + this.chart = echarts.init(this.$el, 'dark', 'macarons') this.setOptions(this.chartData) }, - setOptions({ expectedData, actualData } = {}) { + setOptions({ actualData } = {}) { this.chart.setOption({ + backgroundColor: '#021941', xAxis: { - data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'], + type: 'category', + axisLine: { + // 是否显示以及样式设置 + show: true, + // onZero: true,//表示 X 轴或者 Y 轴的轴线是否在另一个轴的 0 刻度上,只有在另一个轴为数值轴且包含 0 刻度时有效。 + lineStyle: { + width: '1', + color: '#113D72', + type: 'solid' + } + }, + axisLabel: { + fontWeight: 'bold', + color: '#fff' + }, + data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'], boundaryGap: false, axisTick: { show: false @@ -85,49 +101,71 @@ export default { padding: [5, 10] }, yAxis: { + max: 900, + min: 0, + interval: 300, axisTick: { show: false - } - }, - legend: { - data: ['expected', 'actual'] - }, - series: [{ - name: 'expected', itemStyle: { - normal: { - color: '#FF005A', - lineStyle: { - color: '#FF005A', - width: 2 - } + }, + axisLabel: { + textStyle: { + color: '#fff', + fontWeight: 'bold' } }, - smooth: true, - type: 'line', - data: expectedData, - animationDuration: 2800, - animationEasing: 'cubicInOut' + // 轴线 + axisLine: { + show: true, + lineStyle: { + color: '#113D72', + width: '1', + type: 'solid' + } + }, + // 分割线 + splitLine: { + show: true, + lineStyle: { + color: '#113D72', + type: 'dashed', + // 透明度 + opacity: 1, + width: 1 + } + } }, - { - name: 'actual', - smooth: true, - type: 'line', - itemStyle: { - normal: { - color: '#3888fa', - lineStyle: { + series: [ + { + name: 'actual', + smooth: true, + type: 'line', + itemStyle: { + normal: { color: '#3888fa', - width: 2 - }, - areaStyle: { - color: '#f3f8ff' + lineStyle: { + color: '#3888fa', + width: 2 + }, + areaStyle: { + opacity: 0.6, + color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: 'rgba(51, 156, 255, 1)' + + }, + { + offset: 1, + color: 'rgba(51, 156, 255, 0)' + } + ]) + } } - } - }, - data: actualData, - animationDuration: 2800, - animationEasing: 'quadraticOut' - }] + }, + data: actualData, + animationDuration: 2800, + animationEasing: 'quadraticOut' + }] }) } } diff --git a/src/views/environmentalScreen/index.vue b/src/views/environmentalScreen/index.vue new file mode 100644 index 0000000..fdc3aea --- /dev/null +++ b/src/views/environmentalScreen/index.vue @@ -0,0 +1,190 @@ +