diff --git a/src/views/mapPage/realTimeMap/components-tool/BatchCopyingDialogForm.vue b/src/views/mapPage/realTimeMap/components-tool/BatchCopyingDialogForm.vue index 176da6fc..ef058e0a 100644 --- a/src/views/mapPage/realTimeMap/components-tool/BatchCopyingDialogForm.vue +++ b/src/views/mapPage/realTimeMap/components-tool/BatchCopyingDialogForm.vue @@ -8,25 +8,27 @@ @close="dialogClose" > - + - X轴往左为负值,往右为正值 - + - Y轴往上为负值,往下为正值 diff --git a/src/views/mapPage/realTimeMap/components-tool/editNodeProperties.vue b/src/views/mapPage/realTimeMap/components-tool/editNodeProperties.vue index cb1e6e34..b86e36ec 100644 --- a/src/views/mapPage/realTimeMap/components-tool/editNodeProperties.vue +++ b/src/views/mapPage/realTimeMap/components-tool/editNodeProperties.vue @@ -134,7 +134,7 @@ - + { form.value.dataJson = null form.value.dataObj = {} form.value.dataList = [] + form.value.locationTypeId = null if (type === 1) { form.value.layersNumber = null form.value.direction = null diff --git a/src/views/mapPage/realTimeMap/components-tool/layerSelectionToolDialog.vue b/src/views/mapPage/realTimeMap/components-tool/layerSelectionToolDialog.vue index 267b0f1d..f31b3566 100644 --- a/src/views/mapPage/realTimeMap/components-tool/layerSelectionToolDialog.vue +++ b/src/views/mapPage/realTimeMap/components-tool/layerSelectionToolDialog.vue @@ -22,19 +22,28 @@ const emit = defineEmits(['layerSelectionSuccess']) const list = ref([ { + category: 'node', type: 2, name: '库位点', isShow: true }, { + category: 'node', type: 1, name: '路径点', isShow: true }, { + category: 'node', type: 3, name: '设备点', isShow: true + }, + { + category: 'curve', + type: 4, + name: '曲线', + isShow: true } ]) @@ -44,9 +53,13 @@ const changeUnfold = () => { isUnfold.value = !isUnfold.value } const changeSelectList = (item) => { + if (item.category === 'node') { + const types = list.value.filter((item) => !item.isShow).map((item) => item.type) + emit('layerSelectionSuccess', types) + } else { + emit('isCurveDisplayChange') + } item.isShow = !item.isShow - const types = list.value.filter((item) => !item.isShow).map((item) => item.type) - emit('layerSelectionSuccess', types) } const open = (item) => {} @@ -59,8 +72,8 @@ defineExpose({ open }) // 提供 open 方法,用于打开弹窗 z-index: 999; background-color: #fff; position: absolute; - bottom: 22px; - left: 18px; + bottom: 0px; + left: 0px; width: 144px; cursor: pointer; diff --git a/src/views/mapPage/realTimeMap/editMap.vue b/src/views/mapPage/realTimeMap/editMap.vue index 2b82020a..215fe3d5 100644 --- a/src/views/mapPage/realTimeMap/editMap.vue +++ b/src/views/mapPage/realTimeMap/editMap.vue @@ -715,49 +715,51 @@ @@ -898,6 +900,7 @@ v-if="state.isShowLayer" ref="layerSelectionToolDialogRef" @layer-selection-success="layerSelectionSuccess" + @is-curve-display-change="isCurveDisplayChange" /> { @@ -3847,6 +3851,11 @@ const layerSelectionSuccess = (typeList) => { } }) } +//路线的图层筛选 +const isCurveDisplayChange = () => { + state.isCurveDisplay = !state.isCurveDisplay +} + //处理数据 考虑滚动条,缩放等各种情况的的坐标数据 const disposeEventPoints = (event) => { const rect = mapBackgroundRef.value.getBoundingClientRect() @@ -4196,7 +4205,7 @@ const findClosestPoint = (x, y) => { padding: 0 0 0 4px; .top-tool-list { - max-width: calc(100vw - 260px); + max-width: calc(100% - 200px); overflow-x: auto; display: flex; align-items: center; @@ -4352,6 +4361,7 @@ const findClosestPoint = (x, y) => { } .search-select { + padding-right: 20px; .search-icon { widows: 20px; height: 20px;