From 5df5a8d95c6d2a1e90bf6f9681468aeb1857c91b Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 26 十一月 2024 15:48:57 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/ITM_V2_2DModel
---
src/views/area/main-container.vue | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/views/area/main-container.vue b/src/views/area/main-container.vue
index e9a8b32..9310efa 100644
--- a/src/views/area/main-container.vue
+++ b/src/views/area/main-container.vue
@@ -273,7 +273,10 @@
const areaInfo = await getAreaModuleBycode(this.code)
if(areaInfo&&areaInfo.areaModuleItems){
let areaModuleItems=areaInfo.areaModuleItems
- this.totalElements = areaModuleItems.areaConfigNum === 0 ? 1000 : areaModuleItems.areaConfigNum;
+ if(areaModuleItems.areaConfigNum){
+ this.totalElements = areaModuleItems.areaConfigNum;
+ }
+
this.areaUrl =areaModuleItems.url
}
@@ -762,10 +765,7 @@
// 点击增加
handleClickToAddItem(index,item){
- debugger;
- // this.cur_device_info = item.deviceInfo
- // this.cur_device_info.areaRow=item.row
- // this.cur_device_info.areaCell=item.cell
+
this.cur_item=item
// 如果存在设备的话则直接返回
if(item?.deviceInfo?.id) return;
@@ -898,14 +898,16 @@
showDeviceInfo(index, item,event) {
this.isDragging = false;
event.stopPropagation(); // 阻止事件冒泡
+ if(item.deviceInfo){
// 如果点击的是同一个元素，则切换显示状态
if (this.selectedIndex === index) {
- this.show_device_info = !this.show_device_info;
- } else {
- // 切换到新元素，自动关闭之前的
- this.selectedIndex = index;
- this.show_device_info = true;
- this.cur_device_info = item.deviceInfo;
+ this.show_device_info = !this.show_device_info;
+ } else {
+ // 切换到新元素，自动关闭之前的
+ this.selectedIndex = index;
+ this.show_device_info = true;
+ this.cur_device_info = item.deviceInfo;
+ }
}
},
},
--
Gitblit v1.9.3