@@ -999,14 +1017,16 @@ const createRealTimeData = async () => {
const dataFor138And139: { name: string; value: string }[] = []
const dataFor140: { name: string; value: string }[] = []
const dataFor199: { name: string; value: string }[] = []
- const realDataForSub: any = [
- { type138: [], type140: [], type199: [] },
- { type138: [], type140: [], type199: [] },
- { type138: [], type140: [], type199: [] },
- { type138: [], type140: [], type199: [] },
- { type138: [], type140: [], type199: [] },
- { type138: [], type140: [], type199: [] },
- ]
+ // const realDataForSub: any = [
+ // { type138: [], type140: [], type199: [] },
+ // { type138: [], type140: [], type199: [] },
+ // { type138: [], type140: [], type199: [] },
+ // { type138: [], type140: [], type199: [] },
+ // { type138: [], type140: [], type199: [] },
+ // { type138: [], type140: [], type199: [] },
+ // ]
+ const realDataForSub: any = subSystem.map(() => ({ type138: [], type140: [], type199: [] }))
+
modelList.forEach((item: any) => {
const realVal = realData[item.attributeCode.toLowerCase()]
let val = getCutDecimalsValue(realVal)
@@ -1017,8 +1037,8 @@ const createRealTimeData = async () => {
realTimeDataForSingle.value[item.attributeCode.toLowerCase()] = val === '-' ? val : val
}
if (overviewDatakeys.includes(item.attributeCode.toLowerCase())) {
- if (enumStore.keys.includes(item.attributeCode)) {
- overviewData[item.attributeCode.toLowerCase() as keyof typeof overviewData] = val as string
+ if (enumStore.keys.includes(item.attributeCode)) {
+ overviewData[item.attributeCode.toLowerCase() as keyof typeof overviewData] = val as string
} else {
overviewData[item.attributeCode.toLowerCase() as keyof typeof overviewData] = val === '-' ? val : val + item.unit
}
@@ -1034,66 +1054,74 @@ const createRealTimeData = async () => {
} else if (item.attributeType === 199) {
dataFor199.push(showData)
}
- if (item.subSystem === '变桨系统' || item.subSystem === '轮毂') {
- if (item.attributeType === 138 || item.attributeType === 139) {
- realDataForSub[0].type138.push(showData)
- } else if (item.attributeType === 140) {
- realDataForSub[0].type140.push(showData)
- } else if (item.attributeType === 199) {
- realDataForSub[0].type199.push(showData)
- }
- } else if (item.subSystem === '轴承' || item.subSystem === '传动链' || item.subSystem === '齿轮箱') {
- if (item.attributeType === 138 || item.attributeType === 139) {
- realDataForSub[1].type138.push(showData)
- } else if (item.attributeType === 140) {
- realDataForSub[1].type140.push(showData)
- } else if (item.attributeType === 199) {
- realDataForSub[1].type199.push(showData)
- }
- } else if (item.subSystem === '发电机') {
- if (item.attributeType === 138 || item.attributeType === 139) {
- realDataForSub[2].type138.push(showData)
- } else if (item.attributeType === 140) {
- realDataForSub[2].type140.push(showData)
- } else if (item.attributeType === 199) {
- realDataForSub[2].type199.push(showData)
- }
- } else if (item.subSystem === '机舱') {
- if (item.attributeType === 138 || item.attributeType === 139) {
- realDataForSub[3].type138.push(showData)
- } else if (item.attributeType === 140) {
- realDataForSub[3].type140.push(showData)
- } else if (item.attributeType === 199) {
- realDataForSub[3].type199.push(showData)
- }
- } else if (item.subSystem === '控制系统') {
- if (item.attributeType === 138 || item.attributeType === 139) {
- realDataForSub[4].type138.push(showData)
- } else if (item.attributeType === 140) {
- realDataForSub[4].type140.push(showData)
- } else if (item.attributeType === 199) {
- realDataForSub[4].type199.push(showData)
- }
- } else if (item.subSystem === '环境' || item.subSystem === '气象') {
- if (item.attributeType === 138 || item.attributeType === 139) {
- realDataForSub[5].type138.push(showData)
- } else if (item.attributeType === 140) {
- realDataForSub[5].type140.push(showData)
- } else if (item.attributeType === 199) {
- realDataForSub[5].type199.push(showData)
+
+ if (subSystem.includes(item.subSystem)) {
+ const index = subSystem.indexOf(item.subSystem)
+ if (index >= 0) {
+ if (item.attributeType === 138 || item.attributeType === 139) {
+ realDataForSub[index].type138.push(showData)
+ } else if (item.attributeType === 140) {
+ realDataForSub[index].type140.push(showData)
+ } else if (item.attributeType === 199) {
+ realDataForSub[index].type199.push(showData)
+ }
}
}
+ // if (item.subSystem === '变桨系统' || item.subSystem === '轮毂') {
+ // if (item.attributeType === 138 || item.attributeType === 139) {
+ // realDataForSub[0].type138.push(showData)
+ // } else if (item.attributeType === 140) {
+ // realDataForSub[0].type140.push(showData)
+ // } else if (item.attributeType === 199) {
+ // realDataForSub[0].type199.push(showData)
+ // }
+ // } else if (item.subSystem === '轴承' || item.subSystem === '传动链' || item.subSystem === '齿轮箱') {
+ // if (item.attributeType === 138 || item.attributeType === 139) {
+ // realDataForSub[1].type138.push(showData)
+ // } else if (item.attributeType === 140) {
+ // realDataForSub[1].type140.push(showData)
+ // } else if (item.attributeType === 199) {
+ // realDataForSub[1].type199.push(showData)
+ // }
+ // } else if (item.subSystem === '发电机') {
+ // if (item.attributeType === 138 || item.attributeType === 139) {
+ // realDataForSub[2].type138.push(showData)
+ // } else if (item.attributeType === 140) {
+ // realDataForSub[2].type140.push(showData)
+ // } else if (item.attributeType === 199) {
+ // realDataForSub[2].type199.push(showData)
+ // }
+ // } else if (item.subSystem === '机舱') {
+ // if (item.attributeType === 138 || item.attributeType === 139) {
+ // realDataForSub[3].type138.push(showData)
+ // } else if (item.attributeType === 140) {
+ // realDataForSub[3].type140.push(showData)
+ // } else if (item.attributeType === 199) {
+ // realDataForSub[3].type199.push(showData)
+ // }
+ // } else if (item.subSystem === '控制系统') {
+ // if (item.attributeType === 138 || item.attributeType === 139) {
+ // realDataForSub[4].type138.push(showData)
+ // } else if (item.attributeType === 140) {
+ // realDataForSub[4].type140.push(showData)
+ // } else if (item.attributeType === 199) {
+ // realDataForSub[4].type199.push(showData)
+ // }
+ // } else if (item.subSystem === '环境' || item.subSystem === '气象') {
+ // if (item.attributeType === 138 || item.attributeType === 139) {
+ // realDataForSub[5].type138.push(showData)
+ // } else if (item.attributeType === 140) {
+ // realDataForSub[5].type140.push(showData)
+ // } else if (item.attributeType === 199) {
+ // realDataForSub[5].type199.push(showData)
+ // }
+ // }
})
overviewSlotData.type138 = dataFor138And139
overviewSlotData.type140 = dataFor140
overviewSlotData.type199 = dataFor199
- realTimeForSubSystem.type1 = realDataForSub[0]
- realTimeForSubSystem.type2 = realDataForSub[1]
- realTimeForSubSystem.type3 = realDataForSub[2]
- realTimeForSubSystem.type4 = realDataForSub[3]
- realTimeForSubSystem.type5 = realDataForSub[4]
- realTimeForSubSystem.type6 = realDataForSub[5]
+ realTimeForSubSystem.value = realDataForSub
} catch (err) {
console.log(err)
}
@@ -1107,47 +1135,18 @@ const handleClose = (done: () => void) => {
}
const dialogradioactiveName = ref(138)
-const realTimeForSubSystem = reactive
({
- type1: null,
- type2: null,
- type3: null,
- type4: null,
- type5: null,
- type6: null,
-})
-const curSubSystem = ref('type1')
+const realTimeForSubSystem = ref([])
+const curSubSystem = ref(0)
const subSystemDataList = computed(() => {
const type = dialogradioactiveName.value === 138 ? 'type138' : dialogradioactiveName.value === 140 ? 'type140' : 'type199'
- return realTimeForSubSystem[curSubSystem.value][type]
+ return realTimeForSubSystem.value[curSubSystem.value][type]
})
+const subSystem = ['变桨1', '变桨2', '变桨3', '传动链齿轮箱', '发电机', '机舱', '控制系统', '轮毂', '偏航系统', '气象', '塔基', '箱变']
+
const openSubSystem = (type: number) => {
- switch (type) {
- case 1:
- subSystemName.value = '变桨/轮毂系统'
- curSubSystem.value = 'type1'
- break
- case 2:
- subSystemName.value = '轴承/传动链/齿轮箱系统'
- curSubSystem.value = 'type2'
- break
- case 3:
- subSystemName.value = '发电机系统'
- curSubSystem.value = 'type3'
- break
- case 4:
- subSystemName.value = '机舱系统'
- curSubSystem.value = 'type4'
- break
- case 5:
- subSystemName.value = '控制系统'
- curSubSystem.value = 'type5'
- break
- case 6:
- subSystemName.value = '环境/气象系统'
- curSubSystem.value = 'type6'
- break
- }
+ subSystemName.value = subSystem[type]
+ curSubSystem.value = type
visible.value = true
}
@@ -1443,6 +1442,7 @@ $labelHeight: 38px;
// overflow-y: auto;
// overflow-x: hidden;
.PitchPart {
+ width: calc(100% - 10px);
.Pitchitem {
border: 1px solid #e1edf6;
display: flex;
@@ -1607,8 +1607,7 @@ $labelHeight: 38px;
position: absolute;
width: 15px;
height: 15px;
- border-radius: 10px;
- background-color: #ff7e00;
+ background-color: rgba(255, 255, 255, 0);
&:hover {
cursor: pointer;
}
@@ -1618,28 +1617,83 @@ $labelHeight: 38px;
}
}
.index-1 {
- left: 25%;
- top: 60%;
+ left: 24%;
+ top: 1%;
+ width: 12%;
+ height: 48%;
}
.index-2 {
- left: 52%;
- top: 53%;
+ left: 30%;
+ top: 83%;
+ width: 15%;
+ height: 16%;
}
.index-3 {
- left: 65%;
- top: 60%;
+ left: 12.5%;
+ top: 69%;
+ width: 4%;
+ height: 25%;
}
+
.index-4 {
- left: 83%;
- top: 54%;
+ left: 46%;
+ top: 49%;
+ width: 12%;
+ height: 15%;
}
.index-5 {
- left: 75%;
- top: 28%;
+ left: 66%;
+ top: 35%;
+ width: 8%;
+ height: 14%;
+ transform: rotate(-51deg);
}
.index-6 {
+ left: 60%;
+ top: 63%;
+ width: 27%;
+ height: 5%;
+ transform: rotate(-15deg);
+ }
+ .index-7 {
left: 73%;
- top: 4%;
+ top: 48%;
+ width: 7%;
+ height: 11%;
+ transform: rotate(-13deg);
+ }
+
+ .index-8 {
+ left: 23%;
+ top: 53%;
+ width: 19%;
+ height: 26%;
+ }
+ .index-9 {
+ left: 50%;
+ top: 66%;
+ width: 9%;
+ height: 13%;
+ }
+
+ .index-10 {
+ left: 67%;
+ top: 1%;
+ width: 12%;
+ height: 12%;
+ }
+
+ .index-11 {
+ right: 16%;
+ bottom: 3%;
+ width: 13%;
+ height: 23%;
+ }
+ .index-12 {
+ right: 2%;
+ bottom: 3%;
+ width: 13%;
+ height: 23%;
}
}
.Parameters {
diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue
index af2d389c..f3976d59 100644
--- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue
+++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue
@@ -62,7 +62,9 @@
+
+