From 32e425a9264203d5923e0f83a4b70318e59b6cc6 Mon Sep 17 00:00:00 2001 From: dengj <209192278@qq.com> Date: Fri, 15 Dec 2023 12:58:24 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=A6=96=E5=B1=8F=E5=BC=B9=E7=AA=97=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/index.scss | 12 +++++----- .../content/badGasInfo/BadGasInfo.vue | 21 +++++++++-------- src/components/content/fanInfo/FanInfo.vue | 23 ++++++++++--------- .../content/windPressure/WindPressureList.vue | 13 +++++++---- src/components/timeRangeBtn/index.vue | 8 +++---- 5 files changed, 42 insertions(+), 35 deletions(-) diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 443a9d6..79d08ee 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -252,12 +252,12 @@ html, body, #app, .el-container, .el-aside, .el-main { display: flex; #container { flex: 1; - height: 650px; + height: 1160px; //width: 1300px; } #containerEle { flex: 1; - height: 1160px; + height: 1060px; //width: 2180px; } } @@ -267,19 +267,19 @@ html, body, #app, .el-container, .el-aside, .el-main { position: relative; display: flex; flex-direction: column; - height: 1400px; + height: 1300px; border: 2px solid #0F82AF; background: rgba(6, 34, 71, 0.78); border-radius: 20px; padding: 47px 30px; box-sizing: border-box; - margin: 548px auto 0 auto; + margin: 520px auto 0 auto; .el-dialog__header { - padding: 0 0 25px 0; + padding: 0 0 28px 0; //display: none; .el-dialog__title { - font-size: 32px; + font-size: 50px; font-weight: bold; color: #D6F1FA; } diff --git a/src/components/content/badGasInfo/BadGasInfo.vue b/src/components/content/badGasInfo/BadGasInfo.vue index 2aae911..e02432c 100644 --- a/src/components/content/badGasInfo/BadGasInfo.vue +++ b/src/components/content/badGasInfo/BadGasInfo.vue @@ -5,10 +5,13 @@
- +
-
+
+
+
+
props.badGasData, (now) => { }, {deep: true}); const timeSelect = (index) => { console.log('选择时间', index) - if(index===0){ + if (index === 0) { console.log('--年') - }else if(index===1){ + } else if (index === 1) { console.log('--月') - }else if(index===2){ + } else if (index === 2) { console.log('--日') } }; @@ -109,7 +112,7 @@ const initChart = () => { left: 0, textStyle: { color: '#FFFFFF', - fontSize: 28 + fontSize: 40 }, // itemWidth: 20, // itemHeight: 20 @@ -130,10 +133,10 @@ const initChart = () => { //X轴 xAxis: { type: 'category', - data: ['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00','07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00','19:00', '20:00', '21:00', '22:00', '23:00','24:00'], + data: ['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00', '24:00'], axisLabel: { textStyle: { - fontSize: 24, + fontSize: 45, color: '#D6F1FA' }, }, @@ -143,7 +146,7 @@ const initChart = () => { type: 'value', axisLabel: { textStyle: { - fontSize: 24, + fontSize: 45, color: '#D6F1FA' }, }, diff --git a/src/components/content/fanInfo/FanInfo.vue b/src/components/content/fanInfo/FanInfo.vue index e9f67d8..73d3c1b 100644 --- a/src/components/content/fanInfo/FanInfo.vue +++ b/src/components/content/fanInfo/FanInfo.vue @@ -6,13 +6,13 @@
-
{{changeNum(index+1)}}号风机
+
{{ changeNum(index + 1) }}号风机
- 状态:{{ item.breakdown ? '故障':'运行' }} + 状态:{{ item.breakdown ? '故障' : '运行' }}
props.list, (now) => { socketData.value.forEach(item => { now.forEach(newItem => { if (item.equipmentId === newItem.equipmentId) { - if(newItem.frequencyFeedback){ - item.frequencyFeedback= newItem.frequencyFeedback + if (newItem.frequencyFeedback) { + item.frequencyFeedback = newItem.frequencyFeedback } } }) @@ -82,9 +82,9 @@ watch(() => props.list, (now) => { handleOnMounted() }, {deep: true}); -onMounted(async () => { +onMounted(() => { setTimeout(() => { - nextTick(()=>{ + nextTick(() => { handleOnMounted() }) }, 100); @@ -97,7 +97,7 @@ const getImage = (type) => { return "red-state-icon.png"; } } -const changeNum=(index)=>{ +const changeNum = (index) => { switch (index) { case 1: return '一'; @@ -125,7 +125,7 @@ const getBasicData = (data) => { const handleOnMounted = () => { const chart = document.getElementsByClassName('echart'); - for(let i = 0; i < chart.length; i++ ){ + for (let i = 0; i < chart.length; i++) { Echarts_info1 = echarts.init(chart[i]); fan01_option = { series: [ @@ -237,12 +237,12 @@ const handleOnMounted = () => { }, ], } - fan01_option && Echarts_info1.setOption(fan01_option); + fan01_option && Echarts_info1.setOption(fan01_option); } } const getImageUrl = (name) => { - let icon=getImage(name) + let icon = getImage(name) return new URL(`../../../assets/images/fanInfo/${icon}`, import.meta.url).href } @@ -303,7 +303,8 @@ input[type="number"] { background-image: url(../../../assets/images/fanInfo/bg.png); //clip-path: polygon(0% 0%, 40% 0%, 48% 15%, 100% 15%, 100% 100%, 0% 100%); color: #2fb0df; -box-sizing: border-box; + box-sizing: border-box; + .title { width: 40%; text-align: left; diff --git a/src/components/content/windPressure/WindPressureList.vue b/src/components/content/windPressure/WindPressureList.vue index 26149d3..b3928a4 100644 --- a/src/components/content/windPressure/WindPressureList.vue +++ b/src/components/content/windPressure/WindPressureList.vue @@ -5,10 +5,13 @@
- +
-
+
+
+
+
{ left: 0, textStyle: { color: '#FFFFFF', - fontSize: 28 + fontSize: 40 }, // itemWidth: 20, // itemHeight: 20 @@ -120,7 +123,7 @@ const initChart = () => { data: ['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00','07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00','19:00', '20:00', '21:00', '22:00', '23:00','24:00'], axisLabel: { textStyle: { - fontSize: 24, + fontSize: 45, color: '#D6F1FA' }, }, @@ -130,7 +133,7 @@ const initChart = () => { type: 'value', axisLabel: { textStyle: { - fontSize: 24, + fontSize: 45, color: '#D6F1FA' }, }, diff --git a/src/components/timeRangeBtn/index.vue b/src/components/timeRangeBtn/index.vue index d472e7f..2984499 100644 --- a/src/components/timeRangeBtn/index.vue +++ b/src/components/timeRangeBtn/index.vue @@ -47,16 +47,16 @@ watchEffect(() => {