diff --git a/src/assets/imgs/indexPage/yanjing_xianshi_o.png b/src/assets/imgs/indexPage/yanjing_xianshi_o.png new file mode 100644 index 00000000..ed7b7eec Binary files /dev/null and b/src/assets/imgs/indexPage/yanjing_xianshi_o.png differ diff --git a/src/assets/imgs/indexPage/yanjing_yincang_o.png b/src/assets/imgs/indexPage/yanjing_yincang_o.png new file mode 100644 index 00000000..1c754799 Binary files /dev/null and b/src/assets/imgs/indexPage/yanjing_yincang_o.png differ diff --git a/src/assets/imgs/indexPage/zhankai@2x.png b/src/assets/imgs/indexPage/zhankai@2x.png new file mode 100644 index 00000000..a82c225b Binary files /dev/null and b/src/assets/imgs/indexPage/zhankai@2x.png differ diff --git a/src/assets/imgs/indexPage/编组 12.png b/src/assets/imgs/indexPage/编组 12.png new file mode 100644 index 00000000..28378388 Binary files /dev/null and b/src/assets/imgs/indexPage/编组 12.png differ diff --git a/src/assets/imgs/indexPage/编组 14.png b/src/assets/imgs/indexPage/编组 14.png new file mode 100644 index 00000000..3992dd1e Binary files /dev/null and b/src/assets/imgs/indexPage/编组 14.png differ diff --git a/src/assets/imgs/indexPage/编组 15.png b/src/assets/imgs/indexPage/编组 15.png new file mode 100644 index 00000000..4b4acd3f Binary files /dev/null and b/src/assets/imgs/indexPage/编组 15.png differ diff --git a/src/assets/imgs/indexPage/编组 22.png b/src/assets/imgs/indexPage/编组 22.png new file mode 100644 index 00000000..90d0ff19 Binary files /dev/null and b/src/assets/imgs/indexPage/编组 22.png differ diff --git a/src/utils/drag.ts b/src/utils/drag.ts index c4765e7d..5c08d990 100644 --- a/src/utils/drag.ts +++ b/src/utils/drag.ts @@ -2,7 +2,7 @@ export const vDrag = { mounted(el, binding) { const enableDrag = binding.value; // 获取指令绑定的值 - if (!enableDrag) return; // 如果为 false,则不执行后续拖拽逻辑 + // if (!enableDrag) return; // 如果为 false,则不执行后续拖拽逻辑 el.style.position = 'absolute'; // 记录元素的初始位置 @@ -39,8 +39,16 @@ export const vDrag = { // 保存初始位置,以便后续还原 el.__vDragInitialTop = initialTop; el.__vDragInitialLeft = initialLeft; + if(!enableDrag){ + // 如果之前启用,现在禁用,移除 mousedown 事件监听器 + el.removeEventListener('mousedown', el.__vDragMousedown); + // 确保在禁用时停止正在进行的拖拽 + document.removeEventListener('mousemove', el.__vDragMousemove); + document.removeEventListener('mouseup', el.__vDragMouseup); + } }, updated(el, binding) { + console.log('会走这边吗'); const enableDrag = binding.value; const prevEnableDrag = binding.oldValue; @@ -65,6 +73,7 @@ export const vDrag = { // 定义一个还原位置的函数 export const resetDragPosition = (el) => { + console.log(el); if (el.__vDragInitialTop!== undefined && el.__vDragInitialLeft!== undefined) { el.style.top = `${el.__vDragInitialTop}px`; el.style.left = `${el.__vDragInitialLeft}px`; diff --git a/src/views/mapPage/realTimeMap/components/indexPage.vue b/src/views/mapPage/realTimeMap/components/indexPage.vue index 2284fce7..515674a2 100644 --- a/src/views/mapPage/realTimeMap/components/indexPage.vue +++ b/src/views/mapPage/realTimeMap/components/indexPage.vue @@ -1,35 +1,17 @@ diff --git a/src/views/mapPage/realTimeMap/index.vue b/src/views/mapPage/realTimeMap/index.vue index 40180ae2..9f7bb877 100644 --- a/src/views/mapPage/realTimeMap/index.vue +++ b/src/views/mapPage/realTimeMap/index.vue @@ -42,6 +42,7 @@ const downAgv = async () => { const data = await MapApi.agvDownload() download.zip(data, `agv-${new Date().getTime()}.zip`) } +// 筛选出对应的区域对象 const findChildrenByValues = (tree, values) => { if (!tree || tree.length === 0) { return null