Merge remote-tracking branch 'origin/master' into master

lyfO_o

2022-05-23 08bf6da5e3164a1b3ee5c79bb5d666e6385b4653

 src/components/Tab/Plot.vue

@@ -44,12 +44,13 @@
                        circle
                        @click="() => focusHandle(label.attr.id)"
                    />
                    <el-button
                        icon="el-icon-edit"
                        size="mini"
                        circle
                        @click="() => editHandle(label)"
                    />

<!--                    <el-button-->
<!--                        icon="el-icon-edit"-->
<!--                        size="mini"-->
<!--                        circle-->
<!--                        @click="() => editHandle(label)"-->
<!--                    />-->
                    <el-button
                        icon="el-icon-delete"
                        type="danger"
@@ -70,8 +71,8 @@
        >
            <p>请输入内容：</p>
            <el-input v-model="label.name" placeholder="请输入内容" />
            <p>请输入内容：</p>
            <el-select v-model="color" placeholder="请输入内容" >
            <p>请选择风险等级：</p>
            <el-select v-model="color" placeholder="请选择" >
                <el-option
                v-for="item in colorList"
                :key="item.id"
@@ -193,7 +194,7 @@
                        })
                    }
                }
     


            },
            closeCreateHandle() {
@@ -233,21 +234,21 @@
                            },
                        },
                        (entity) => {
                            debugger
                            console.log(wutu3d.draw.attr.getCoordinates(entity));
                            this._initLabel();
                            this.$store.dispatch('map/updateTimestamp');
                            this.form = {
                                id:'',
                                etype:this.type,
                                "type": "Feature",
                                "properties": 
                                "properties":
                                    JSON.stringify(entity.attribute),
                                "geometry": JSON.stringify({
                                "type": "Polygon",
                                "coordinates": [
                                

                                    wutu3d.draw.attr.getCoordinates(entity)
                                     

                                    ]
                                })
                            }