|
@@ -585,7 +585,7 @@ const initDrawMethod = (options) => {
|
|
|
data.radius = geometry.getRadius();
|
|
|
} else {
|
|
|
const coordinates = geometry.getCoordinates();
|
|
|
- if (['rectangle', 'polygon', 'anyLine', 'measureArea'].includes(options.type)) {
|
|
|
+ if (options.type !== 'straightLine') {
|
|
|
data.path = coordinates[0];
|
|
|
} else {
|
|
|
data.path = coordinates;
|
|
@@ -595,14 +595,7 @@ const initDrawMethod = (options) => {
|
|
|
if (options.type == 'measureArea') {
|
|
|
// 计算区域面积
|
|
|
const area = turf.area(turf.polygon([data.path]));
|
|
|
- // const text = new AMap.Text({
|
|
|
- // position: data.path[data.path.length - 1],
|
|
|
- // text: '区域面积' + area + '平方米',
|
|
|
- // offset: new AMap.Pixel(-20, -20)
|
|
|
- // });
|
|
|
data.area = area;
|
|
|
- // map.add(text);
|
|
|
- // overlays.push([feature, text]);
|
|
|
overlays.push(feature);
|
|
|
overlaysData.push(data);
|
|
|
commit(deepClone(overlaysData));
|
|
@@ -659,13 +652,6 @@ const sendWebSocket = (data) => {
|
|
|
visible: '1'
|
|
|
})
|
|
|
);
|
|
|
- console.log('fs', {
|
|
|
- operation: 'add', // 必填
|
|
|
- id: data.id,
|
|
|
- name: data.title, // 必填
|
|
|
- content: JSON.stringify(data), // 必填
|
|
|
- visible: '1'
|
|
|
- });
|
|
|
};
|
|
|
// 图形右击事件
|
|
|
let rightClickObj;
|
|
@@ -916,15 +902,15 @@ const handleSendForm = () => {
|
|
|
if (!form.value.pattern_name) {
|
|
|
return proxy?.$modal.msgWarning('请填写预案名称');
|
|
|
}
|
|
|
- webSock = createWebSocket('uhvw60vX7MpeWSWcXqK8S', getWebSocketData);
|
|
|
- patternId.value = 'uhvw60vX7MpeWSWcXqK8S';
|
|
|
- // createCollaboration(form.value).then(() => {
|
|
|
- // patternId.value = form.value.pattern_id;
|
|
|
- // webSock = createWebSocket(form.value.pattern_id, getWebSocketData);
|
|
|
+ // webSock = createWebSocket('uhvw60vX7MpeWSWcXqK8S', getWebSocketData);
|
|
|
+ // patternId.value = 'uhvw60vX7MpeWSWcXqK8S';
|
|
|
+ createCollaboration(form.value).then(() => {
|
|
|
+ patternId.value = form.value.pattern_id;
|
|
|
+ webSock = createWebSocket(form.value.pattern_id, getWebSocketData);
|
|
|
showForm.value = false;
|
|
|
collaboration.value = true;
|
|
|
proxy?.$modal.msgSuccess('开启协同标绘成功');
|
|
|
- // });
|
|
|
+ });
|
|
|
};
|
|
|
const handleShowDialog = () => {
|
|
|
editData.value = {
|