xuziqiang
/
SaaS-lib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix:修改参数为空判断

temp
zhaohy 3 weeks ago
parent
52fa3ff491
commit
3aca13f9bb
2 changed files with 32 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 59
      hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue
  2. 2
      hx-ai-intelligent/src/view/equipmentControl/electricDoor/index.vue

59
hx-ai-intelligent/src/view/equipmentControl/airConditioningSystem/index.vue
View File

@ -22,7 +22,7 @@
<template v-for="(item, index) in sensorData" :key="index"> <template v-for="(item, index) in sensorData" :key="index">
<div <div
style="position: absolute" style="position: absolute"
:style="{ left: item.styleText.left, bottom: item.styleText.bottom }"> :style="{ left: item?.styleText?.left, bottom: item?.styleText?.bottom }">
<singleModel :dataSource="item" /> <singleModel :dataSource="item" />
</div> </div>
</template> </template>
@ -32,7 +32,7 @@
<template v-for="(item, index) in peopleData" :key="index"> <template v-for="(item, index) in peopleData" :key="index">
<div <div
style="position: absolute" style="position: absolute"
:style="{ left: item.styleText.left, bottom: item.styleText.bottom }"> :style="{ left: item?.styleText?.left, bottom: item?.styleText?.bottom }">
<singleModel :dataSource="item" /> <singleModel :dataSource="item" />
</div> </div>
</template> </template>
@ -43,8 +43,8 @@
<div <div
style="position: absolute" style="position: absolute"
:style="{ :style="{
left: 'calc(' + item.styleText.left + ' - 14%)', left: 'calc(' + item?.styleText?.left + ' - 14%)',
bottom: 'calc(' + item.styleText.bottom + ' + 8%)', bottom: 'calc(' + item?.styleText?.bottom + ' + 8%)',
'z-index': 2, 'z-index': 2,
}"> }">
<doubleSingleModel :dataSource="item" /> <doubleSingleModel :dataSource="item" />
@ -52,14 +52,14 @@
<img <img
style="width: 50px; height: 75px; position: absolute" style="width: 50px; height: 75px; position: absolute"
:style="{ :style="{
left: 'calc(' + item.styleText.left + ' - 2%)', left: 'calc(' + item?.styleText?.left + ' - 2%)',
bottom: 'calc(' + item.styleText.bottom + ' + 4%)', bottom: 'calc(' + item?.styleText?.bottom + ' + 4%)',
transform: 'rotateY(180deg)', transform: 'rotateY(180deg)',
}" }"
src="../image/liftState/lift/line.png" /> src="../image/liftState/lift/line.png" />
<img <img
style="width: 42px; height: 42px; position: absolute; z-index: 2" style="width: 42px; height: 42px; position: absolute; z-index: 2"
:style="{ left: item.styleText.left, bottom: item.styleText.bottom }" :style="{ left: item?.styleText?.left, bottom: item?.styleText?.bottom }"
src="../image/airConditioningSystem/fan.png" /> src="../image/airConditioningSystem/fan.png" />
</template> </template>
</div> </div>
@ -81,24 +81,26 @@
<div <div
style="position: absolute; z-index: 2" style="position: absolute; z-index: 2"
:style="{ :style="{
left: 'calc(' + item.styleText.left + (item.lineType === 1 ? ' - 12.8%)' : ' - 13%)'), left:
'calc(' + item?.styleText?.left + (item.lineType === 1 ? ' - 12.8%)' : ' - 13%)'),
bottom: bottom:
'calc(' + item.styleText.bottom + (item.lineType === 1 ? ' + 7%)' : ' - 14%)'), 'calc(' + item?.styleText?.bottom + (item.lineType === 1 ? ' + 7%)' : ' - 14%)'),
}"> }">
<doubleSingleModel :dataSource="item" /> <doubleSingleModel :dataSource="item" />
</div> </div>
<img <img
style="width: 50px; height: 75px; position: absolute" style="width: 50px; height: 75px; position: absolute"
:style="{ :style="{
left: 'calc(' + item.styleText.left + (item.lineType === 1 ? ' - 1.5%)' : ' - 1.8%)'), left:
'calc(' + item?.styleText?.left + (item.lineType === 1 ? ' - 1.5%)' : ' - 1.8%)'),
bottom: bottom:
'calc(' + item.styleText.bottom + (item.lineType === 1 ? ' + 4.5%)' : ' - 9%)'), 'calc(' + item?.styleText?.bottom + (item.lineType === 1 ? ' + 4.5%)' : ' - 9%)'),
transform: item.lineType === 1 ? 'rotateY(180deg)' : 'rotate(180deg)', transform: item.lineType === 1 ? 'rotateY(180deg)' : 'rotate(180deg)',
}" }"
src="../image/liftState/lift/line.png" /> src="../image/liftState/lift/line.png" />
<img <img
style="width: 42px; height: 42px; position: absolute; z-index: 2" style="width: 42px; height: 42px; position: absolute; z-index: 2"
:style="{ left: item.styleText.left, bottom: item.styleText.bottom }" :style="{ left: item?.styleText?.left, bottom: item?.styleText?.bottom }"
src="../image/airConditioningSystem/conditioningIcon.png" /> src="../image/airConditioningSystem/conditioningIcon.png" />
</template> </template>
</div> </div>
@ -122,14 +124,14 @@
:key="index" :key="index"
style="display: flex" style="display: flex"
:style="{ :style="{
width: item.styleText.width, width: item?.styleText?.width,
height: item.styleText.height, height: item?.styleText?.height,
background: item.styleText.color, background: item?.styleText?.color,
marginLeft: item.styleText.mLeft, marginLeft: item?.styleText?.mLeft,
position: item.styleText.position, position: item?.styleText?.position,
top: item.styleText.top, top: item?.styleText?.top,
left: item.styleText.abLeft, left: item?.styleText?.abLeft,
border: item.styleText.border, border: item?.styleText?.border,
}"> }">
</div> </div>
</div> </div>
@ -148,23 +150,24 @@
style="position: absolute; z-index: 1" style="position: absolute; z-index: 1"
:style="{ :style="{
left: left:
'calc(' + item.styleText.left + (item.lineType === 1 ? ' - 12.9%)' : ' - 13.3%)'), 'calc(' + item?.styleText?.left + (item.lineType === 1 ? ' - 12.9%)' : ' - 13.3%)'),
bottom: bottom:
'calc(' + item.styleText.bottom + (item.lineType === 1 ? ' + 8%)' : ' - 14%)'), 'calc(' + item?.styleText?.bottom + (item.lineType === 1 ? ' + 8%)' : ' - 14%)'),
}"> }">
<doubleSingleModel :dataSource="item" /> <doubleSingleModel :dataSource="item" />
</div> </div>
<img <img
style="width: 50px; height: 75px; position: absolute" style="width: 50px; height: 75px; position: absolute"
:style="{ :style="{
left: 'calc(' + item.styleText.left + (item.lineType === 1 ? ' - 1.5%)' : ' - 2%)'), left: 'calc(' + item?.styleText?.left + (item.lineType === 1 ? ' - 1.5%)' : ' - 2%)'),
bottom: 'calc(' + item.styleText.bottom + (item.lineType === 1 ? ' + 4%)' : ' - 9%)'), bottom:
'calc(' + item?.styleText?.bottom + (item.lineType === 1 ? ' + 4%)' : ' - 9%)'),
transform: item.lineType === 1 ? 'rotateY(180deg)' : 'rotate(180deg)', transform: item.lineType === 1 ? 'rotateY(180deg)' : 'rotate(180deg)',
}" }"
src="../image/liftState/lift/line.png" /> src="../image/liftState/lift/line.png" />
<img <img
style="width: 42px; height: 42px; position: absolute; z-index: 1" style="width: 42px; height: 42px; position: absolute; z-index: 1"
:style="{ left: item.styleText.left, bottom: item.styleText.bottom }" :style="{ left: item?.styleText?.left, bottom: item?.styleText?.bottom }"
src="../image/airConditioningSystem/floorHeatingIcon.png" /> src="../image/airConditioningSystem/floorHeatingIcon.png" />
</template> </template>
</div> </div>
@ -174,9 +177,9 @@
:key="index" :key="index"
style="display: flex" style="display: flex"
:style="{ :style="{
width: item.styleText.width, width: item?.styleText?.width,
background: item.styleText.color, background: item?.styleText?.color,
border: item.styleText.border, border: item?.styleText?.border,
}"> }">
</div> </div>
</div> </div>

2
hx-ai-intelligent/src/view/equipmentControl/electricDoor/index.vue
View File

@ -92,7 +92,7 @@
</a-tag> </a-tag>
</template> </template>
<template v-if="column.dataIndex === 'time'"> <template v-if="column.dataIndex === 'time'">
{{ record.record.time.substring(11, 19) }} {{ record?.record?.time.substring(11, 19) }}
</template> </template>
</template> </template>
</a-table> </a-table>

Write Preview
Loading…
Cancel
Save