|
@@ -1,10 +1,7 @@
|
|
|
<template>
|
|
|
<div class="menu-content">
|
|
|
<div class="gradient-text title">实时标绘</div>
|
|
|
- <div v-show="collaboration" style="display: flex; align-items: center; justify-content: flex-end; height: 90px">
|
|
|
- <div class="btn2" style="margin-left: 10px" @click="handleCloseCollaboration">关闭协同</div>
|
|
|
- <div class="btn2" style="margin-left: 10px" @click="handleSaveCollaboration">保存</div>
|
|
|
- </div>
|
|
|
+ <CollaborativeOperationBar v-model="collaboration" />
|
|
|
<div class="line">
|
|
|
<div class="tabs1">
|
|
|
<div v-for="(item, index) in menu" :key="index" :class="menuActive1 === index ? 'tab tab_active' : 'tab'" @click="clickTab(index)">
|
|
@@ -190,11 +187,9 @@
|
|
|
<div v-show="tipTitle !== ''" class="tipTitle">{{ tipTitle }}</div>
|
|
|
<!--保存修改弹窗-->
|
|
|
<EditDialog v-if="showEdit" v-model="showEdit" :edit-data="editData" @submit="handleSubmit" />
|
|
|
- <Contact v-if="shareState.showShare" v-model="shareState.showShare" @close="handleCloseShare"
|
|
|
- @confirm="handleShareConfirm" />
|
|
|
+ <Contact v-if="shareState.showShare" v-model="shareState.showShare" @close="handleCloseShare" @confirm="handleShareConfirm" />
|
|
|
<!--修改预案-->
|
|
|
- <Dialog v-if="showForm" v-model="showForm" custom-show title="协同标绘" height="auto" type="xs"
|
|
|
- @close="showForm = false" @confirm="handleSendForm">
|
|
|
+ <Dialog v-if="showForm" v-model="showForm" custom-show title="协同标绘" height="auto" type="xs" @close="showForm = false" @confirm="handleSendForm">
|
|
|
<div style="display: flex; align-items: center">
|
|
|
<div style="font-size: 36px">预案名称:</div>
|
|
|
<el-input v-model="form.pattern_name" class="custom-input" placeholder="请输入" style="flex: 1" />
|
|
@@ -242,6 +237,7 @@ import * as turf from '@turf/turf';
|
|
|
import Style from 'ol/style/Style';
|
|
|
import Icon from 'ol/style/Icon';
|
|
|
import useMapStore from '@/store/modules/map';
|
|
|
+import CollaborativeOperationBar from '@/views/globalMap/RightMenu/OnlinePlotting/CollaborativeOperationBar.vue';
|
|
|
|
|
|
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
|
|
|
const mapStore = useMapStore();
|
|
@@ -907,6 +903,7 @@ const handleShowPatternData = () => {
|
|
|
confirmData.value = [];
|
|
|
};
|
|
|
const handleSaveCollaboration = () => {
|
|
|
+
|
|
|
};
|
|
|
let showForm = ref(false);
|
|
|
let form = ref({
|
|
@@ -955,7 +952,9 @@ const getWebSocketData = (data) => {
|
|
|
if (parseContent.type === 'marker' && !!parseContent.icon) {
|
|
|
parseContent.icon = getImageUrl(parseContent.icon);
|
|
|
}
|
|
|
- data2.push(parseContent);
|
|
|
+ if (item.visible === '1') {
|
|
|
+ data2.push(parseContent);
|
|
|
+ }
|
|
|
}
|
|
|
});
|
|
|
const res = mapUtils.drawData(data2);
|