diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue
index f74ac336..8f02ba4c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue
@@ -40,7 +40,7 @@
-
@@ -300,6 +300,17 @@ export default {
this.data = dData;
},
methods: {
+ getLabelName(index) {
+ if (this.upsList.length <= 2) {
+ // 如果 upsList 长度 ≤ 2,全部显示为 UPS 格式
+ return `UPS${index + 1}`;
+ } else {
+ // 如果 upsList 长度 > 2,前两个显示为 UPS,后续显示为分中心
+ return index < 2
+ ? `UPS${index + 1}`
+ : `分中心${index - 1}`;
+ }
+ },
bindNearLoad(e) {
for (let i of this.cameraMaps) {
if (e.indexOf(i.iotDeviceId) !== -1) {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/door/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/door/index.vue
index fe489669..279a6142 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/door/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/door/index.vue
@@ -43,7 +43,7 @@
/>
-
+
@@ -169,8 +169,8 @@ export default {
console.log(result)
result.rows.forEach(e=>{
e.deviceTypeName = _.find(deviceTypeOptions,{value:parseInt(e.deviceType)}).label
- e.directionName = e.direction === 1 ? '菏泽方向' :
- (e.direction === 3 ? '济南方向' : '双向');
+ e.directionName = e.direction == 1 ? '菏泽方向' :
+ (e.direction == 3 ? '济南方向' : '双向');
e.warningTime = moment(e.createTime).format('YYYY-MM-DD HH:mm:ss')
e.stateName = (e.status==='0'?'未处理':(e.status==='1'?'已处理':'自动处理'))
})
@@ -193,6 +193,8 @@ export default {
result.rows.forEach(e=>{
e.deviceTypeName = _.find(deviceTypeOptions,{value:parseInt(e.deviceType)}).label
e.warningTime = moment(e.createTime).format('YYYY-MM-DD HH:mm:ss')
+ e.directionName = e.direction == 1 ? '菏泽方向' :
+ (e.direction == 3 ? '济南方向' : '双向');
})
this.tableData = result.rows;
this.total = result.total;