diff --git a/package.json b/package.json index 926f6a8..5fda2b1 100644 --- a/package.json +++ b/package.json @@ -38,17 +38,18 @@ "image-conversion": "2.1.1", "js-cookie": "3.0.5", "jsencrypt": "3.3.2", + "mitt": "^3.0.1", "nprogress": "0.2.0", "pinia": "3.0.2", "screenfull": "6.0.2", + "swiper": "^12.0.3", "vue": "3.5.13", "vue-cropper": "1.1.1", "vue-i18n": "11.1.3", "vue-json-pretty": "2.4.0", "vue-router": "4.5.0", "vue-types": "6.0.0", - "vxe-table": "4.13.7", - "mitt": "^3.0.1" + "vxe-table": "4.13.7" }, "devDependencies": { "@iconify/json": "^2.2.276", diff --git a/src/assets/projectLarge/Clip.png b/src/assets/projectLarge/Clip.png new file mode 100644 index 0000000..f83b668 Binary files /dev/null and b/src/assets/projectLarge/Clip.png differ diff --git a/src/assets/projectLarge/search.png b/src/assets/projectLarge/search.png new file mode 100644 index 0000000..7563471 Binary files /dev/null and b/src/assets/projectLarge/search.png differ diff --git a/src/assets/projectLarge/tcbj.png b/src/assets/projectLarge/tcbj.png new file mode 100644 index 0000000..7e5c95a Binary files /dev/null and b/src/assets/projectLarge/tcbj.png differ diff --git a/src/views/omScreen/components/bigtitle.vue b/src/views/omScreen/components/bigtitle.vue new file mode 100644 index 0000000..31af72a --- /dev/null +++ b/src/views/omScreen/components/bigtitle.vue @@ -0,0 +1,85 @@ + + + + + diff --git a/src/views/omScreen/components/center.vue b/src/views/omScreen/components/center.vue index 348b64e..21f79fd 100644 --- a/src/views/omScreen/components/center.vue +++ b/src/views/omScreen/components/center.vue @@ -1,5 +1,6 @@ diff --git a/src/views/omScreen/components/leftPage.vue b/src/views/omScreen/components/leftPage.vue index f600055..21ff085 100644 --- a/src/views/omScreen/components/leftPage.vue +++ b/src/views/omScreen/components/leftPage.vue @@ -16,18 +16,18 @@
- - <div class="infoContainer"> - + <Title title="光伏板清洗发电提升对比" /> + <div class="echarts"> + <EchartBoxTwo :option="option_fdssgl" ref="barChart" /> </div> </div> </div> </template> <script lang="ts" setup> import Title from './title.vue'; -import { ref } from 'vue'; - - +import { option2 } from './options'; +import EchartBoxTwo from '@/components/EchartBox/index.vue'; +const option_fdssgl = ref(option2); </script> <style scoped lang="scss"> @@ -99,6 +99,9 @@ import { ref } from 'vue'; margin-top: vh(20); height: vh(580); background: linear-gradient(135.47deg, rgba(21, 49, 58, 0.82) 0%, rgba(39, 85, 94, 0.5) 100%); + .echarts { + height: vh(500); + } } } </style> \ No newline at end of file diff --git a/src/views/omScreen/components/options.ts b/src/views/omScreen/components/options.ts index 9ee0766..337e51e 100644 --- a/src/views/omScreen/components/options.ts +++ b/src/views/omScreen/components/options.ts @@ -1,4 +1,4 @@ -import axios from "axios"; + export let option1 = { tooltip: { @@ -105,3 +105,131 @@ export let option1 = { backgroundColor: 'transparent' }; + + +export let option2 = { + tooltip: { + trigger: 'axis', + axisPointer: { + type: 'cross' + } + }, + // 图例 + legend: { + top: '5%', + itemWidth: 12, + itemHeight: 12, + textStyle: { + color: '#fff', + fontSize: 14 + }, + data: [ + { name: '未清洁发电量', itemStyle: { color: 'rgba(255, 141, 26, 1)' } }, + { name: '清洁后发电量', itemStyle: { color: 'rgba(13, 251, 172, 1)' } } + ] + }, + // 网格 + grid: { + left: '3%', + right: '5%', + bottom: '5%', + top: '15%', + containLabel: true + }, + // X轴 + xAxis: { + type: 'category', + boundaryGap: true, + axisTick: { + show: false + }, + axisLabel: { + color: '#fff', + fontSize: 12 + }, + axisLine: { + lineStyle: { + color: 'rgba(0, 255, 238,1)' + } + }, + data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'], + // interval: 2 + }, + // Y轴 + yAxis: { + type: 'value', + name: 'kWh', + + axisLine: { + lineStyle: { + color: 'rgba(0, 255, 238,1)' + } + }, + axisTick: { + show: false + }, + splitLine: { + lineStyle: { + color: 'rgba(255,255,255,0.2)' + } + }, + axisLabel: { + color: '#fff', + fontSize: 12 + }, + min: 0, + interval: 200000 + }, + // 系列 + series: [ + { + name: '未清洁发电量', + type: 'line', + data: [150000, 700000, 400000, 550000, 650000, 850000, 300000, 800000, 600000,1000000,1200000,1500000], + lineStyle: { + color: 'rgba(255, 141, 26, 1)', + width: 3 + }, + areaStyle: { + color: { + type: 'linear', + x: 0, + y: 0, + x2: 0, + y2: 1, + colorStops: [{ + offset: 0, color: 'rgba(255, 141, 26, 0.3)' + }, { + offset: 1, color: 'rgba(255, 141, 26, 0.0)' + }] + } + }, + symbol: 'none', + }, + { + name: '清洁后发电量', + type: 'line', + data: [200000, 800000, 500000, 650000, 750000, 950000, 400000, 900000, 700000,1100000,1300000,1600000], + lineStyle: { + color: 'rgba(13, 251, 172, 1)', + width: 3 + }, + areaStyle: { + color: { + type: 'linear', + x: 0, + y: 0, + x2: 0, + y2: 1, + colorStops: [{ + offset: 0, color: 'rgba(13, 251, 172, 0.3)' + }, { + offset: 1, color: 'rgba(13, 251, 172, 0.0)' + }] + } + }, + symbol: 'none', + } + ], + backgroundColor: 'transparent' +}; \ No newline at end of file diff --git a/src/views/omScreen/components/rightPage.vue b/src/views/omScreen/components/rightPage.vue index 0e9f2c5..af93f98 100644 --- a/src/views/omScreen/components/rightPage.vue +++ b/src/views/omScreen/components/rightPage.vue @@ -108,9 +108,10 @@ const handleWheel = (event: WheelEvent) => { }; const reszieFont = () => { - const fontSize = Math.sqrt(window.innerWidth) / 3; - option_fdssgl.value.xAxis.axisLabel.fontSize = fontSize; - option_fdssgl.value.yAxis.axisLabel.fontSize = fontSize; + //注意删除 + // const fontSize = Math.sqrt(window.innerWidth) / 3; + // option_fdssgl.value.xAxis.axisLabel.fontSize = fontSize; + // option_fdssgl.value.yAxis.axisLabel.fontSize = fontSize; } diff --git a/src/views/omScreen/icon/m_bottom.png b/src/views/omScreen/icon/m_bottom.png new file mode 100644 index 0000000..2acabb5 Binary files /dev/null and b/src/views/omScreen/icon/m_bottom.png differ diff --git a/src/views/omScreen/icon/m_icon1.png b/src/views/omScreen/icon/m_icon1.png new file mode 100644 index 0000000..03377b9 Binary files /dev/null and b/src/views/omScreen/icon/m_icon1.png differ diff --git a/src/views/omScreen/icon/m_icon2.png b/src/views/omScreen/icon/m_icon2.png new file mode 100644 index 0000000..a7feb35 Binary files /dev/null and b/src/views/omScreen/icon/m_icon2.png differ diff --git a/src/views/omScreen/icon/m_top.png b/src/views/omScreen/icon/m_top.png new file mode 100644 index 0000000..ea174fc Binary files /dev/null and b/src/views/omScreen/icon/m_top.png differ diff --git a/src/views/omScreen/icon/prev.png b/src/views/omScreen/icon/prev.png new file mode 100644 index 0000000..ebea930 Binary files /dev/null and b/src/views/omScreen/icon/prev.png differ diff --git a/src/views/omScreen/icon/view.png b/src/views/omScreen/icon/view.png new file mode 100644 index 0000000..6364fc3 Binary files /dev/null and b/src/views/omScreen/icon/view.png differ