From 5a711436b829fc0bb04d6de6fe2a620cb0b2edcc Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Thu, 22 Feb 2024 17:31:16 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat=20:=20=E9=A3=8E=E5=8E=8Becharts?=
=?UTF-8?q?=E6=8C=89=E6=97=A5=E6=9C=88=E5=B9=B4=E7=9B=91=E6=8E=A7=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/content/airInfo/AirInfo.vue | 2 +-
.../content/windPressure/WindPressureList.vue | 14 ++++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/components/content/airInfo/AirInfo.vue b/src/components/content/airInfo/AirInfo.vue
index d022522..104b32f 100644
--- a/src/components/content/airInfo/AirInfo.vue
+++ b/src/components/content/airInfo/AirInfo.vue
@@ -127,7 +127,7 @@ const handleOpenChart = (id, type) => {
const timeSelect = (index) => {
if (index === 0) {
- getChartInfo(openDialogId.value, 'year')
+ getChartInfo(openDialogId.value, 'years')
} else if (index === 1) {
getChartInfo(openDialogId.value, 'month')
} else if (index === 2) {
diff --git a/src/components/content/windPressure/WindPressureList.vue b/src/components/content/windPressure/WindPressureList.vue
index 2f20f87..13fb77a 100644
--- a/src/components/content/windPressure/WindPressureList.vue
+++ b/src/components/content/windPressure/WindPressureList.vue
@@ -48,6 +48,7 @@ const props = defineProps({
loading: Number,
});
const windSort = ref(1)
+const windSortId = ref(1)
const timeList = ref(["年", "月", "日"]);
const selectTimeButton = ref(2);
const isVisited = ref(false);
@@ -68,10 +69,10 @@ watch(() => props.winData, (now) => {
getScreenInfo(now.windPressureSensorList)
}, {deep: true});
-const getWindInfo = (equipmentId) => {
+const getWindInfo = (equipmentId,type='day') => {
isVisited.value = true
showLoading.value=true
- getEchartsInfo(equipmentId).then(res => {
+ getEchartsInfo(equipmentId,type).then(res => {
if (res?.code === 1000) {
showLoading.value=false
nextTick(() => {
@@ -82,17 +83,18 @@ const getWindInfo = (equipmentId) => {
}
const handleOpenChart = (item) => {
+ selectTimeButton.value=2
getWindInfo(item.equipmentId)
windSort.value = item.equipmentName
+ windSortId.value = item.equipmentId
}
const timeSelect = (index) => {
- console.log('选择时间', index)
if (index === 0) {
- console.log('--年')
+ getWindInfo(windSortId.value,'years')
} else if (index === 1) {
- console.log('--月')
+ getWindInfo(windSortId.value,'month')
} else if (index === 2) {
- console.log('--日')
+ getWindInfo(windSortId.value,'day')
}
};
const getScreenInfo = (now) => {
From 02af5f650865e10312e1164394d6dea8f00fee6c Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Thu, 22 Feb 2024 20:08:35 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feat=20:=20=E9=A3=8E=E6=9C=BA=E5=90=AF?=
=?UTF-8?q?=E5=81=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/content/fanInfo/FanInfo.vue | 27 ++++++++++++++--------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/components/content/fanInfo/FanInfo.vue b/src/components/content/fanInfo/FanInfo.vue
index b86d927..9ba98c6 100644
--- a/src/components/content/fanInfo/FanInfo.vue
+++ b/src/components/content/fanInfo/FanInfo.vue
@@ -122,6 +122,8 @@ import {
editFrequencyOperationSwitch,
getFanEchartsInfo
} from "@/api/largeScreen";
+import {ElMessageBox} from "element-plus";
+import {removeToken} from "../../../utils/auth";
const timeList = ref(["年", "月", "日"]);
const selectTimeButton = ref(2);
@@ -229,22 +231,27 @@ const packageData = (item, type, flag) => {
}
//启动/停止
const editOperate = (item) => {
- const data = packageData(item, item.running)
- // editFrequencyOperationSwitch(data).then(res => {
- // console.log('修改风机启动', res)
- // })
+ ElMessageBox.confirm('是否启动/停止该风机?','系统提示',{
+ type: 'warning',
+ closeOnClickModal: false
+ }).then(()=>{
+ const data = packageData(item, item.running)
+ editFrequencyOperationSwitch(data).then(res => {
+ console.log('修改风机启动', res)
+ })
+ })
}
const changeFrequency = (item) => {
const data = packageData(item, item.frequencySetting, true)
- // editFrequency(data).then(res => {
- // console.log('修改风机频率', res)
- // })
+ editFrequency(data).then(res => {
+ console.log('修改风机频率', res)
+ })
}
const changeModel = (item) => {
const data = packageData(item, item.autoMode)
- // editFrequencyModelSwitch(data).then(res => {
- // console.log('修改自动模式', res)
- // })
+ editFrequencyModelSwitch(data).then(res => {
+ console.log('修改自动模式', res)
+ })
}
const getFanInfo = (equipmentId, type = 'day') => {
isVisited.value = true
From 97787def3306940ce52186edca6635c3d3e4be77 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Thu, 22 Feb 2024 21:33:35 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix=20:=20=E7=BB=86=E8=8A=82=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/content/fanInfo/FanInfo.vue | 46 ++++++++++++----------
1 file changed, 25 insertions(+), 21 deletions(-)
diff --git a/src/components/content/fanInfo/FanInfo.vue b/src/components/content/fanInfo/FanInfo.vue
index 9ba98c6..2334220 100644
--- a/src/components/content/fanInfo/FanInfo.vue
+++ b/src/components/content/fanInfo/FanInfo.vue
@@ -11,7 +11,7 @@
- {{ changeNum(index + 1) }}号风机
+ {{ changeNum(item) }}号风机
@@ -24,14 +24,14 @@
启动
停止
@@ -65,7 +65,7 @@
-
-
@@ -157,7 +157,7 @@ const stateB = ref(false)
const stateC = ref(false)
const isVisited = ref(false)
const showLoading = ref(false)
-const fanIndex = ref(0)
+const fanIndex = ref('')
const openEquipmentId = ref(0)
let myEcharts = reactive({});
watch(() => props.loading, (now) => {
@@ -230,8 +230,8 @@ const packageData = (item, type, flag) => {
}
}
//启动/停止
-const editOperate = (item) => {
- ElMessageBox.confirm('是否启动/停止该风机?','系统提示',{
+const editOperate = (item,type) => {
+ ElMessageBox.confirm(`是否${type}该风机?`,'系统提示',{
type: 'warning',
closeOnClickModal: false
}).then(()=>{
@@ -265,10 +265,14 @@ const getFanInfo = (equipmentId, type = 'day') => {
}
})
}
-const handleOpenChart = (item, index) => {
+const handleOpenChart = (item) => {
openEquipmentId.value = item.equipmentId
getFanInfo(item.equipmentId, 'day')
- fanIndex.value = index + 1
+ if(item.equipmentId===22){
+ fanIndex.value='一'
+ }else {
+ fanIndex.value='二'
+ }
}
const getTransData = (data) => {
let tranObj = {}
@@ -301,14 +305,13 @@ const getImage = (type) => {
return "red-state-icon.png";
}
}
-const changeNum = (index) => {
- switch (index) {
- case 1:
+const changeNum = (item) => {
+ console.log('1号变频器')
+ switch (item.equipmentId) {
+ case 22:
return '一';
- case 2:
+ case 23:
return '二';
- case 3:
- return '三';
}
}
const getBasicData = (data) => {
@@ -317,6 +320,7 @@ const getBasicData = (data) => {
data?.map(item => {
tranObj = {
equipmentId: item.equipmentId,
+ equipmentName: item.equipmentName,
equipmentType: item.equipmentType,
autoMode: item.autoMode,//自动模式
breakdown: item.breakdown,//故障
@@ -421,7 +425,7 @@ const handleOnMounted = () => {
},
data: [
{
- value: socketData.value[i].frequencyFeedback,
+ value: socketData.value[i].frequencySetting,
fontSize: 2100,
detail: {
valueAnimation: true,
@@ -780,7 +784,7 @@ input[type="number"] {
color: #38cafb;
line-height: 35px;
text-align: center;
- margin-right: 42px;
+ margin-right: 25px;
transform: translateY(33%);
}
@@ -814,7 +818,7 @@ input[type="number"] {
height: 45px;
margin-right: 15px;
color: #fff;
- background-color: #127399;
+ background-color: #3eab3f;
padding-left: 10px;
border-radius: 8px;
margin-left: -5px;
@@ -860,7 +864,7 @@ input[type="number"] {
font-size: 28px;
color: #38cafb;
line-height: 37px;
- gap: 33px;
+ gap: 40px;
.check-box {
display: flex;
@@ -884,7 +888,7 @@ input[type="number"] {
// }
//}
:deep(.el-input__wrapper) {
- width: 130px;
+ width: 160px;
height: 44px;
background-color: transparent;
box-shadow: none;
From 0301aa79bc92ccc6097b3d44083310a50b35e07c Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 26 Feb 2024 17:47:15 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix=20:=20=E9=A3=8E=E6=9C=BA=E5=8C=BA?=
=?UTF-8?q?=E5=9F=9F=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/content/fanInfo/FanInfo.vue | 146 ++++++++++++---------
1 file changed, 86 insertions(+), 60 deletions(-)
diff --git a/src/components/content/fanInfo/FanInfo.vue b/src/components/content/fanInfo/FanInfo.vue
index 2334220..eed36ce 100644
--- a/src/components/content/fanInfo/FanInfo.vue
+++ b/src/components/content/fanInfo/FanInfo.vue
@@ -15,7 +15,7 @@
-
+
状态:
{{ item.breakdown ? '故障' : '运行' }}
@@ -45,22 +45,28 @@
-
给定频率
-
-
-
-
-
-
-
-
-
-
- Hz
-
-
+
+ 给定频率
+
+
+
+
+
+
+
+
+
+
+ Hz
+
+
+
+
+ 正在输入中...
+
+
@@ -122,8 +128,7 @@ import {
editFrequencyOperationSwitch,
getFanEchartsInfo
} from "@/api/largeScreen";
-import {ElMessageBox} from "element-plus";
-import {removeToken} from "../../../utils/auth";
+import {ElMessage, ElMessageBox} from "element-plus";
const timeList = ref(["年", "月", "日"]);
const selectTimeButton = ref(2);
@@ -201,11 +206,11 @@ watch(() => props.list, (now) => {
}, {deep: true});
const timeSelect = (index) => {
if (index === 0) {
- getFanInfo(openEquipmentId.value,'years')
+ getFanInfo(openEquipmentId.value, 'years')
} else if (index === 1) {
- getFanInfo(openEquipmentId.value,'month')
+ getFanInfo(openEquipmentId.value, 'month')
} else if (index === 2) {
- getFanInfo(openEquipmentId.value,'day')
+ getFanInfo(openEquipmentId.value, 'day')
}
};
const packageData = (item, type, flag) => {
@@ -230,27 +235,44 @@ const packageData = (item, type, flag) => {
}
}
//启动/停止
-const editOperate = (item,type) => {
- ElMessageBox.confirm(`是否${type}该风机?`,'系统提示',{
+const editOperate = (item, type) => {
+ ElMessageBox.confirm(`是否${type}该风机?`, '系统提示', {
type: 'warning',
closeOnClickModal: false
- }).then(()=>{
+ }).then(() => {
const data = packageData(item, item.running)
editFrequencyOperationSwitch(data).then(res => {
console.log('修改风机启动', res)
+ if (res.code === 1000) {
+ ElMessage.success(res.msg)
+ } else {
+ ElMessage.error(res.msg)
+ }
})
})
}
+
const changeFrequency = (item) => {
+ console.log('修改频率')
const data = packageData(item, item.frequencySetting, true)
editFrequency(data).then(res => {
console.log('修改风机频率', res)
+ if (res.code === 1000) {
+ ElMessage.success(res.msg)
+ } else {
+ ElMessage.warning(res.msg)
+ }
})
}
const changeModel = (item) => {
const data = packageData(item, item.autoMode)
editFrequencyModelSwitch(data).then(res => {
console.log('修改自动模式', res)
+ if (res.code === 1000) {
+ ElMessage.success(res.msg)
+ } else {
+ ElMessage.warning(res.msg)
+ }
})
}
const getFanInfo = (equipmentId, type = 'day') => {
@@ -268,10 +290,10 @@ const getFanInfo = (equipmentId, type = 'day') => {
const handleOpenChart = (item) => {
openEquipmentId.value = item.equipmentId
getFanInfo(item.equipmentId, 'day')
- if(item.equipmentId===22){
- fanIndex.value='一'
- }else {
- fanIndex.value='二'
+ if (item.equipmentId === 22) {
+ fanIndex.value = '一'
+ } else {
+ fanIndex.value = '二'
}
}
const getTransData = (data) => {
@@ -325,6 +347,7 @@ const getBasicData = (data) => {
autoMode: item.autoMode,//自动模式
breakdown: item.breakdown,//故障
running: item.running,//启动,
+ showTooltip:false,
frequencyFeedback: item.frequencyFeedback,
frequencySetting: item.frequencySetting
}
@@ -789,15 +812,17 @@ input[type="number"] {
}
.option-nav {
- display: flex;
- flex-direction: column;
+ //display: flex;
+ //flex-direction: column;
width: 70%;
> div:first-child {
margin-top: 48px;
display: flex;
align-items: center;
-
+ .changeMargin{
+ margin-top: -40px;
+ }
.state {
flex: 1;
display: flex;
@@ -876,43 +901,44 @@ input[type="number"] {
.edit-power {
margin-top: 10px;
display: flex;
+ flex-direction: column;
- > span:first-child {
- white-space: pre;
- margin-right: 14px;
- }
+ > div:first-child {
+ display: flex;
- //:deep(.is-disabled) {
- // .el-input__inner{
- // color: #FFFFFF!important;
- // }
- //}
- :deep(.el-input__wrapper) {
- width: 160px;
- height: 44px;
- background-color: transparent;
- box-shadow: none;
- border: 1px solid #38CAFB;
- transform: none;
- transition: none;
- margin-right: 10px;
-
- .el-input__inner {
+ > span:first-child {
+ white-space: pre;
+ margin-right: 14px;
+ }
+ :deep(.el-input__wrapper) {
+ width: 160px;
height: 44px;
- font-size: 30px;
- font-weight: bold;
- color: #38CAFB;
- }
+ background-color: transparent;
+ box-shadow: none;
+ border: 1px solid #38CAFB;
+ transform: none;
+ transition: none;
+ margin-right: 10px;
+
+ .el-input__inner {
+ height: 44px;
+ font-size: 30px;
+ font-weight: bold;
+ color: #38CAFB;
+ }
- .el-input__suffix-inner {
- font-size: 30px;
- color: #38CAFB;
- line-height: 40px;
- font-weight: bold;
+ .el-input__suffix-inner {
+ font-size: 30px;
+ color: #38CAFB;
+ line-height: 40px;
+ font-weight: bold;
+ }
}
+
}
+
//.units {
// position: relative;
//}