Merge remote-tracking branch 'origin/main'

This commit is contained in:
houwei 2024-12-16 14:04:00 +08:00
commit 2efb4da8d0

View File

@ -6,9 +6,9 @@
@click="handleClick(item)" @click="handleClick(item)"
@contextmenu.prevent="windContextMenu($event,item)" @contextmenu.prevent="windContextMenu($event,item)"
> >
<div class="FanList-panel" :class="{ <div class="FanList-panel wind-default" :class="{
'wind-mark': item.standard==1, '': item.standard==1,
'wind-default': item.standard==0, '': item.standard==0,
'wind-offline': item.attributeMap.processedoperationmode == 33 'wind-offline': item.attributeMap.processedoperationmode == 33
}"> }">
@ -95,6 +95,18 @@
class="control-btn" class="control-btn"
type="primary">锁定</el-button> type="primary">锁定</el-button>
<el-button @click="sendManualCommand(0)" v-else class="control-btn" type="primary">解锁</el-button> <el-button @click="sendManualCommand(0)" v-else class="control-btn" type="primary">解锁</el-button>
<el-button
class="control-btn"
type="primary"
@click=""
v-if="realTimeData.standard == 0"
>标杆设置</el-button>
<el-button
class="control-btn"
type="primary"
@click=""
v-else
>标杆取消</el-button>
</div> </div>
</template> </template>
</ContextMenu> </ContextMenu>
@ -121,13 +133,24 @@ const getAnimationStyle = (item) => {
const irotorspeed = item.attributeMap?.irotorspeed ?? 0 const irotorspeed = item.attributeMap?.irotorspeed ?? 0
let animationDuration; let animationDuration;
animationDuration = 60 / irotorspeed / 3 animationDuration = 60 / irotorspeed / 3
const processedoperationmode = item.attributeMap?.processedoperationmode ?? 0
if(processedoperationmode==33){
return {
'animation-duration': `0s`,
'animation-timing-function': 'linear',
'animation-iteration-count': 'infinite',
'animation-direction': 'normaL',
}
}else{
return { return {
'animation-duration': `${animationDuration}s`, 'animation-duration': `${animationDuration}s`,
'animation-timing-function': 'linear', 'animation-timing-function': 'linear',
'animation-iteration-count': 'infinite', 'animation-iteration-count': 'infinite',
'animation-direction': 'normaL', 'animation-direction': 'normaL',
} }
}
} }
@ -166,7 +189,8 @@ const realTimeData = ref<any>({
processedoperationmode: 1111, processedoperationmode: 1111,
locked: 0, locked: 0,
deviceId: '', deviceId: '',
name:'' name:'',
standard:''
}) })
const windContextMenu = (event: any,curnodeData) => { const windContextMenu = (event: any,curnodeData) => {
contextMenuPos.value.x = event.pageX contextMenuPos.value.x = event.pageX
@ -175,6 +199,7 @@ const windContextMenu = (event: any,curnodeData) => {
realTimeData.value.locked=curnodeData.attributeMap.locked realTimeData.value.locked=curnodeData.attributeMap.locked
realTimeData.value.deviceId=curnodeData.irn realTimeData.value.deviceId=curnodeData.irn
realTimeData.value.name=curnodeData.name realTimeData.value.name=curnodeData.name
realTimeData.value.standard=curnodeData.standard
OperateVisible.value = true OperateVisible.value = true
} }
const sendCommand = (type: 'setTurbineFastStart' | 'setTurbineStop' | 'setTurbineResetStatusCode') => { const sendCommand = (type: 'setTurbineFastStart' | 'setTurbineStop' | 'setTurbineResetStatusCode') => {