diff --git a/ui/dasadmin/src/views/backend/WindBlower/index.vue b/ui/dasadmin/src/views/backend/WindBlower/index.vue
index d270d7b1..8f9708a1 100644
--- a/ui/dasadmin/src/views/backend/WindBlower/index.vue
+++ b/ui/dasadmin/src/views/backend/WindBlower/index.vue
@@ -118,7 +118,7 @@
启动()
const overviewData = reactive({
- // iturbineoperationmode: '-',
+ // processedoperationmode: '-',
iwindspeed: '-',
iwinddirection: '-',
igenspeed: '-',
@@ -963,12 +963,12 @@ const createScroll = () => {
}
const realTimeData = ref
({
- iturbineoperationmode: 1111,
+ processedoperationmode: 1111,
locked: 0,
})
const realTimeDataState = computed(() => {
- switch (realTimeData.value.iturbineoperationmode) {
+ switch (realTimeData.value.processedoperationmode) {
case 20:
return '并网'
case 10:
@@ -1015,7 +1015,7 @@ const createRealTimeData = async () => {
try {
const modelList: any = await getModelList()
const realData: any = await getRealTimeData()
- realTimeData.value.iturbineoperationmode = getRealTimeState(realData)
+ realTimeData.value.processedoperationmode = getRealTimeState(realData)
realTimeData.value.locked = realData.locked
temperatureChartsData[0].value = getCutDecimalsValue(realData.itempoutdoor_1sec)
diff --git a/ui/dasadmin/src/views/backend/energyManage/index.vue b/ui/dasadmin/src/views/backend/energyManage/index.vue
index 8bd860b1..730cfd88 100644
--- a/ui/dasadmin/src/views/backend/energyManage/index.vue
+++ b/ui/dasadmin/src/views/backend/energyManage/index.vue
@@ -6,7 +6,14 @@
风机列表
-
+
已锁定
@@ -110,7 +117,7 @@
-
+
@@ -255,11 +262,13 @@ import { getAirBlowerListReq } from '/@/api/backend/airBlower/request'
import { getRealValueListReq, getRealValueRangeReq } from '/@/api/backend/deviceModel/request'
import { getRealTimeState, getCutDecimalsValue, getEnumToValue } from '/@/views/backend/equipment/airBlower/utils'
import { ElMessage, dayjs } from 'element-plus'
+import { debounce } from 'lodash-es'
import * as echarts from 'echarts'
const agcOnoffSwitch = ref(true)
const agcOnOff = ref(true)
const agcLocalRemoteSwitch = ref(false)
+const agcTargetValue = ref()
const agcAdd = ref(true)
const agcSub = ref(false)
const agcRecordList = ref([
@@ -273,6 +282,7 @@ const agcRecordList = ref([
const avcOnoffSwitch = ref(true)
const avcOnOff = ref(false)
const avcLocalRemoteSwitch = ref(false)
+const avcTargetValue = ref()
const avcAdd = ref(true)
const avcSub = ref(false)
const avcRecordList = ref([
@@ -287,34 +297,42 @@ const tableColumn = [
{
label: '编号',
prop: 'name',
+ width: '',
},
{
label: '风速m/s',
prop: 'iwindspeed',
+ width: '',
},
{
label: '转速rmp',
prop: 'igenspeed',
+ width: '',
},
{
label: '有功kW',
prop: 'igenpower',
+ width: '',
},
{
label: '有功给定kW',
prop: 'iactivepowersetpointvalue',
+ width: '',
},
{
label: '无功kVar',
prop: 'ireactivepower',
+ width: '',
},
{
label: '无功给定kVar',
prop: 'ireactivepowersetpointvalue',
+ width: '',
},
{
label: '状态',
prop: 'iturbineoperationmode',
+ width: '',
},
]
@@ -541,7 +559,6 @@ const createChartData = (data: { [k: string]: number }, time: string) => {
if (realDataSeries.length) {
const seriesItem = realDataSeries.find((series) => series.id === item)
- console.log(seriesItem, '------------------')
seriesItem.data.push(curVal)
return seriesItem
} else {
@@ -780,16 +797,23 @@ const getContainerHeight = () => {
containerHeight.value = `${height}px`
}
}
+const resizeChart = debounce(() => {
+ chartInstance?.resize()
+}, 500)
+const resizeFn = () => {
+ resizeChart()
+ getContainerHeight()
+}
onMounted(() => {
getContainerHeight()
autoUpdateAirBlower()
nextTick(() => {
createChart()
})
- window.addEventListener('resize', getContainerHeight)
+ window.addEventListener('resize', resizeFn)
})
onUnmounted(() => {
- window.removeEventListener('resize', getContainerHeight)
+ window.removeEventListener('resize', resizeFn)
timer && clearInterval(timer)
})
@@ -1000,6 +1024,7 @@ onUnmounted(() => {
@include record;
}
.centerContainer {
+ margin-bottom: 20px;
height: v-bind('containerHeight');
color: #4e5969;
.airBlowerList {
@@ -1032,7 +1057,7 @@ onUnmounted(() => {
}
.lineChart {
width: 100%;
- height: calc(100% - 132px);
+ height: calc(100% - 102px);
.chart {
width: 100%;
height: 100%;
@@ -1043,7 +1068,7 @@ onUnmounted(() => {
flex-wrap: wrap;
padding: 10px;
width: 100%;
- height: 100px;
+ height: 70px;
background-color: #f0f6ff;
.infoItem {
display: flex;
diff --git a/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue b/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
index 847bafd8..8be75286 100644
--- a/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
+++ b/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
@@ -6,13 +6,13 @@
{{ t('airBlower.status') }}
-
+
已锁定
- 并网
- 维护
- 限功率运行
- 离线
- 启动
- 正常停机
- 外部因素导致停机
- 停机
- 待机
- 解缆状态
- 电网故障停机
@@ -226,12 +226,12 @@ const router = useRouter()
const { t } = useI18n()
const airBlowerSelect = reactive
({
- iturbineoperationmode: 987654321,
+ processedoperationmode: 987654321,
belongLine: '全部',
})
const airBlowerSelectOptions = reactive<{ [K in SelectTypeKeyUnionType]: { label: string; value: string | number }[] }>({
- iturbineoperationmode: [
+ processedoperationmode: [
{
label: '全部',
value: 987654321,
@@ -289,33 +289,33 @@ const airBlowerSelectOptions = reactive<{ [K in SelectTypeKeyUnionType]: { label
})
const selectAirBlower = (type: SelectTypeKeyUnionType) => {
- if (airBlowerSelect.belongLine === '全部' && airBlowerSelect.iturbineoperationmode === 987654321) {
+ if (airBlowerSelect.belongLine === '全部' && airBlowerSelect.processedoperationmode === 987654321) {
tableData.value = originTableData.value
return
- } else if (airBlowerSelect.belongLine !== '全部' && airBlowerSelect.iturbineoperationmode !== 987654321) {
- if (type === 'iturbineoperationmode' && airBlowerSelect.iturbineoperationmode === 2) {
- const type1 = originTableData.value.filter((item) => item.iturbineoperationmode === 1)
- const type6 = originTableData.value.filter((item) => item.iturbineoperationmode === 6)
- const type2 = originTableData.value.filter((item) => item.iturbineoperationmode === 2)
+ } else if (airBlowerSelect.belongLine !== '全部' && airBlowerSelect.processedoperationmode !== 987654321) {
+ if (type === 'processedoperationmode' && airBlowerSelect.processedoperationmode === 2) {
+ const type1 = originTableData.value.filter((item) => item.processedoperationmode === 1)
+ const type6 = originTableData.value.filter((item) => item.processedoperationmode === 6)
+ const type2 = originTableData.value.filter((item) => item.processedoperationmode === 2)
const typeAll = [...type1, ...type6, ...type2]
tableData.value = typeAll.filter((item) => item.belongLine === airBlowerSelect.belongLine)
return
}
- const resData = originTableData.value.filter((item) => item.iturbineoperationmode === airBlowerSelect.iturbineoperationmode)
+ const resData = originTableData.value.filter((item) => item.processedoperationmode === airBlowerSelect.processedoperationmode)
tableData.value = resData.filter((item) => item.belongLine === airBlowerSelect.belongLine)
return
} else {
if (type === 'belongLine' && airBlowerSelect.belongLine === '全部') {
- tableData.value = originTableData.value.filter((item) => item.iturbineoperationmode === airBlowerSelect.iturbineoperationmode)
+ tableData.value = originTableData.value.filter((item) => item.processedoperationmode === airBlowerSelect.processedoperationmode)
return
- } else if (type === 'iturbineoperationmode' && airBlowerSelect.iturbineoperationmode === 987654321) {
+ } else if (type === 'processedoperationmode' && airBlowerSelect.processedoperationmode === 987654321) {
tableData.value = originTableData.value.filter((item) => item.belongLine === airBlowerSelect.belongLine)
return
}
- if (type === 'iturbineoperationmode' && airBlowerSelect.iturbineoperationmode === 2) {
- const type1 = originTableData.value.filter((item) => item.iturbineoperationmode === 1)
- const type6 = originTableData.value.filter((item) => item.iturbineoperationmode === 6)
- const type2 = originTableData.value.filter((item) => item.iturbineoperationmode === 2)
+ if (type === 'processedoperationmode' && airBlowerSelect.processedoperationmode === 2) {
+ const type1 = originTableData.value.filter((item) => item.processedoperationmode === 1)
+ const type6 = originTableData.value.filter((item) => item.processedoperationmode === 6)
+ const type2 = originTableData.value.filter((item) => item.processedoperationmode === 2)
tableData.value = [...type1, ...type6, ...type2]
return
}
@@ -396,7 +396,7 @@ const defaultColumn: TableColumnType[] = [
},
{
label: '风机状态',
- prop: 'iturbineoperationmode',
+ prop: 'processedoperationmode',
align: 'center',
custom: 'default',
width: 100,
@@ -522,7 +522,7 @@ const createTableReqParams = (airblowerList: { irn: string; name: string }[]) =>
airBlowerIds.push(item.irn)
return {
deviceId: item.irn,
- attributes: [...curTableKey, 'iturbineoperationmode', 'iyplevel', 'gridlostdetected', 'ibplevel'],
+ attributes: [...curTableKey, 'processedoperationmode', 'iyplevel', 'gridlostdetected', 'ibplevel'],
}
})
return { params, airBlowerInfo, airBlowerIds }
@@ -560,12 +560,12 @@ const getTableData = () => {
belongLine: airBlowerInfoObj[id].belongLine,
deviceCode: airBlowerInfoObj[id].deviceCode,
...realData,
- iturbineoperationmode: state,
+ processedoperationmode: state,
}
})
originTableData.value = data
- if (airBlowerSelect.belongLine === '全部' && airBlowerSelect.iturbineoperationmode === 987654321) {
+ if (airBlowerSelect.belongLine === '全部' && airBlowerSelect.processedoperationmode === 987654321) {
tableData.value = data
} else {
const irn = tableData.value.map((item) => item.irn)
diff --git a/ui/dasadmin/src/views/backend/equipment/airBlower/type.ts b/ui/dasadmin/src/views/backend/equipment/airBlower/type.ts
index c5666176..c66f0e6e 100644
--- a/ui/dasadmin/src/views/backend/equipment/airBlower/type.ts
+++ b/ui/dasadmin/src/views/backend/equipment/airBlower/type.ts
@@ -1,5 +1,5 @@
export type SelectTypeObjType = {
- iturbineoperationmode?: number
+ processedoperationmode?: number
belongLine: string
}
export type SelectTypeKeyUnionType = keyof SelectTypeObjType
@@ -12,7 +12,7 @@ export type TableDataObjType = {
name: string
model: string
iotModelId: string
- iturbineoperationmode: number
+ processedoperationmode: number
belongLine: string
iwindspeed: string
igenpower: string
diff --git a/ui/dasadmin/src/views/backend/equipment/airBlower/utils.ts b/ui/dasadmin/src/views/backend/equipment/airBlower/utils.ts
index ba5be2e8..2be383f4 100644
--- a/ui/dasadmin/src/views/backend/equipment/airBlower/utils.ts
+++ b/ui/dasadmin/src/views/backend/equipment/airBlower/utils.ts
@@ -3,14 +3,14 @@ import { useEnumStore } from '/@/stores/enums'
const enumStore = useEnumStore()
export const getRealTimeState = (data: any) => {
- if (data.iturbineoperationmode) {
- if (data.iturbineoperationmode > 1 && data.iturbineoperationmode < 6) {
+ if (data.processedoperationmode) {
+ if (data.processedoperationmode > 1 && data.processedoperationmode < 6) {
return 2
}
- if (data.iturbineoperationmode === 21) {
+ if (data.processedoperationmode === 21) {
return 20
}
- return data.iturbineoperationmode
+ return data.processedoperationmode
} else if (data.iyplevel === 10) {
return 1110
} else if (data.gridlostdetected === 1) {