feat: 提交合并数据集

components/upload-Pointclound/index.js

@@ -5,11 +5,11 @@
         template: `<div id="uploadBox" >
                     <h4>添加数据集 </h4>
                     <div class="selectBox">
-                        <el-select v-model="value" filterable :filter-method="searchScene" placeholder="请选择">
-                            <el-option v-for="item in options" :key="item.code" :label="item.code" :value="item.code">
+                        <el-select v-model="value" filterable @click.native="options = dataList" :filter-method="searchScene" placeholder="请选择">
+                            <el-option v-for="item in options" :key="item.id" :label="item.title" :value="item.id">
                                 <div class="sceneName">
-                                    <p class="code">{{item.code}}</p>
-                                    <span class="name">来自场景：{{item.name}}</span>
+                                    <p class="code">{{item.title}}</p>
+                                    <span class="name">数据集：{{item.id}}</span>
                                 </div>
 
                             </el-option>
@@ -43,73 +43,92 @@
                 </div>`,
         data() {
             return {
+                dataList: [],
                 options: [{
                     id: 1,
                     name: "港2",
-                    code: 't-iksBApb'
                 }, {
                     id: 2,
                     name: "港2",
-                    code: 't-iksBA2pb'
                 }, {
                     id: 3,
                     name: "港2",
-                    code: 't-iksBA3pb'
                 }, {
                     id: 4,
                     name: "港2",
-                    code: 't-iksBA4pb'
                 }, {
                     id: 5,
                     name: "港2",
-                    code: 't-iksBA5pb'
                 }, {
                     id: 6,
-                    name: "港2",
-                    code: 't-iksBA6pb'
+                    title: "港2",
                 }],
                 value: '',
             }
         },
         methods: {
-            searchScene() {
-                let t = setTimeout(() => {
-                    console.log(1)
 
-                    clearTimeout(t)
-                }, 3000);
+            getSceneData() {
+                let params = {
+                    "pageNum": 0,
+                    "pageSize": 12,
+                    "searchKey": "",
+                    "userId": 477
+                }
+                axios.post(`/indoor/scene/list`, params).then(res => {
+                    console.log(res)
+                    this.dataList = res.data.data.content
+                    this.options = res.data.data.content
+                }).catch(err => {
+
+                })
+            },
+            searchScene(e) {
+                console.log(e)
+                let res = this.dataList.filter(i => {
+                    if (i.id.indexOf(e) != -1 || i.title.indexOf(e) != -1) {
+                        return i
+                    }
+                })
+                console.log(res)
+                this.options = res
+
             },
             openUpload() {
+                // 
+
                 this.$parent.showLoading()
-                setTimeout(() => {
+
+                axios.post(`/indoor/${sceneNum}/api/merge/${this.value}`).then(res => {
+                    this.$parent.hideLoading()
+                    this.value = ''
+                    if (res.data.code == 0) {
+                        this.$message({
+                            message: '数据集添加成功',
+                            type: 'success',
+                            duration: 2000,
+                        });
+                        IV.api.AuthenticationService.sendAuthenticationChanged()
+                    } else {
+                        this.$message({
+                            message: '数据集添加失败',
+                            type: 'error',
+                            duration: 2000,
+                        });
+                    }
+
+                }).catch(err => {
                     this.value = ''
                     this.$parent.hideLoading()
                     this.$message({
-                        message: '恭喜你，这是一条成功消息',
-                        type: 'success',
+                        message: '数据集添加失败',
+                        type: 'error',
                         duration: 2000,
                     });
-                    window.eventBus
-                    IV.api.AuthenticationService.sendAuthenticationChanged()
-
-                    // IV.SidebarMenuService.goToItem(IV.SidebarMenuService.items[1])
-
-                }, 2000);
-                // this.$confirm('此操作将永久删除该文件, 是否继续?', {
-                //     confirmButtonText: '确定',
-                //     cancelButtonText: '取消',
-                //     center: true
-                // }).then(() => {
-                //     // this.$message({
-                //     //     type: 'success',
-                //     //     message: '删除成功!'
-                //     // });
-                // }).catch(() => {
-                //     // this.$message({
-                //     //     type: 'info',
-                //     //     message: '已取消删除'
-                //     // });
-                // });
+
+                })
+
+
             },
             delConfirm() {
                 console.log(1)
@@ -123,12 +142,13 @@
 
         },
         mounted() {
-            window.eventBus.off('openMap', openMap);
-            window.eventBus.on('openMap', openMap);
+            // window.eventBus.off('openMap', openMap);
+            // window.eventBus.on('openMap', openMap);
 
-            function openMap() {
-                IV.swapScenes()
-            }
+            // function openMap() {
+            //     IV.swapScenes()
+            // }
+            this.getSceneData()
         },
     })
 })();

css/style.css

@@ -2091,4 +2091,19 @@ rotate-panel .rotate-icon {
     -webkit-border-radius: 1em;
     -moz-border-radius: 1em;
     border-radius: 1em;
+}
+
+.arrow.mirrored {
+    transform: rotate(0deg) !important;
+    height: 40px;
+    width: 40px;
+    background: #141414;
+    border-radius: 50%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.arrow.mirrored:hover {
+    background: #15BEC8 !important;
 }

locat/addDataSet.html

@@ -51,79 +51,80 @@
 
 
                 </div>
-                <div v-if="isEdit" class="scrollBox">
-
-                    <h4>修改控制点 </h4>
-                    <p class="desc">通过两个控制点坐标确定点云在地图上的位置</p>
-                    <p class="itemTitle">EPSG 坐标系 </p>
-                    <div class="formItem">
-                        <div class="allIpt">
-                            <input type="text" disabled v-model="EPSG" name="EPSG" id="EPSG" />
-                        </div>
+                <div class="control_box" v-if="isEdit">
+                    <div class="scrollBox">
 
-                    </div>
-                    <form>
-                        <div class="tag">
-                            <P class="formTitle">控制点1</P>
-                            <!-- <div class="localIcon" @click="set_location(1)"></div> -->
-                        </div>
+                        <h4>修改控制点 </h4>
+                        <p class="desc">通过两个控制点坐标确定点云在地图上的位置</p>
+                        <p class="itemTitle">EPSG 坐标系 </p>
                         <div class="formItem">
-                            <p class="itemTitle">本地坐标:</p>
-                            <div class="inputItem">
-                                <div class="name"> X</div>
-                                <div class="ipt">
-                                    <input @input="limtInput('ax')" type="text" v-model="ax" name="ax" id="ax" />
-                                </div>
-                                <span class="unit">m</span>
-                            </div>
-                            <div class="inputItem">
-                                <div class="name"> Y</div>
-                                <div class="ipt">
-                                    <input @input="limtInput('ay')" type="text" v-model="ay" name="ay" id="ay" />
-                                </div>
-                                <span class="unit">m</span>
+                            <div class="allIpt">
+                                <input type="text" disabled v-model="EPSG" name="EPSG" id="EPSG" />
                             </div>
 
                         </div>
-                        <div class="formItem">
-                            <p class="itemTitle">地理坐标:</p>
-                            <div class="inputItem">
-                                <div class="name">经度</div>
-                                <div class="ipt">
-                                    <input type="text" @input="limtInput('alon')" v-model="alon" name="alon" id="alon" value="120" />
-                                </div>
+                        <form>
+                            <div class="tag">
+                                <P class="formTitle">控制点1</P>
+                                <!-- <div class="localIcon" @click="set_location(1)"></div> -->
                             </div>
-                            <div class="inputItem">
-                                <div class="name">纬度</div>
-                                <div class="ipt">
-                                    <input type="text" @input="limtInput('alat')" v-model="alat" name="alat" id="alat" value="22" />
+                            <div class="formItem">
+                                <p class="itemTitle">本地坐标:</p>
+                                <div class="inputItem">
+                                    <div class="name"> X</div>
+                                    <div class="ipt">
+                                        <input @input="limtInput('ax')" type="text" v-model="ax" name="ax" id="ax" />
+                                    </div>
+                                    <span class="unit">m</span>
                                 </div>
+                                <div class="inputItem">
+                                    <div class="name"> Y</div>
+                                    <div class="ipt">
+                                        <input @input="limtInput('ay')" type="text" v-model="ay" name="ay" id="ay" />
+                                    </div>
+                                    <span class="unit">m</span>
+                                </div>
+
                             </div>
+                            <div class="formItem">
+                                <p class="itemTitle">地理坐标:</p>
+                                <div class="inputItem">
+                                    <div class="name">经度</div>
+                                    <div class="ipt">
+                                        <input type="text" @input="limtInput('alon')" v-model="alon" name="alon" id="alon" value="120" />
+                                    </div>
+                                </div>
+                                <div class="inputItem">
+                                    <div class="name">纬度</div>
+                                    <div class="ipt">
+                                        <input type="text" @input="limtInput('alat')" v-model="alat" name="alat" id="alat" value="22" />
+                                    </div>
+                                </div>
 
 
-                        </div>
+                            </div>
 
-                        <div class="tag">
-                            <P class="formTitle">控制点2</P>
-                            <!-- <div class="localIcon" @click="set_location(2)"></div> -->
-                        </div>
-                        <div class="formItem">
-                            <p class="itemTitle">本地坐标:</p>
-                            <div class="inputItem">
-                                <div class="name"> X</div>
-                                <div class="ipt">
-                                    <input type="text" @input="limtInput('bx')" v-model="bx" name="bx" id="bx" />
-                                </div>
-                                <span class="unit">m</span>
+                            <div class="tag">
+                                <P class="formTitle">控制点2</P>
+                                <!-- <div class="localIcon" @click="set_location(2)"></div> -->
                             </div>
-                            <div class="inputItem">
-                                <div class="name"> Y</div>
-                                <div class="ipt">
-                                    <input type="text" @input="limtInput('by')" v-model="by" name="by" id="by" />
+                            <div class="formItem">
+                                <p class="itemTitle">本地坐标:</p>
+                                <div class="inputItem">
+                                    <div class="name"> X</div>
+                                    <div class="ipt">
+                                        <input type="text" @input="limtInput('bx')" v-model="bx" name="bx" id="bx" />
+                                    </div>
+                                    <span class="unit">m</span>
                                 </div>
-                                <span class="unit">m</span>
-                            </div>
-                            <!-- <div class="inputItem">
+                                <div class="inputItem">
+                                    <div class="name"> Y</div>
+                                    <div class="ipt">
+                                        <input type="text" @input="limtInput('by')" v-model="by" name="by" id="by" />
+                                    </div>
+                                    <span class="unit">m</span>
+                                </div>
+                                <!-- <div class="inputItem">
                                 <div class="name"> Z</div>
                                 <div class="ipt">
                                     <input type="text" v-model="bz" name="bz" id="bz" />
@@ -132,49 +133,51 @@
                             </div> -->
 
 
-                        </div>
+                            </div>
 
-                        <div class="formItem">
-                            <p class="itemTitle">地理坐标:</p>
-                            <div class="inputItem">
-                                <div class="name">经度</div>
-                                <div class="ipt">
-                                    <input type="text" @input="limtInput('blon')" v-model="blon" name="blon" id="blon" value="123" />
+                            <div class="formItem">
+                                <p class="itemTitle">地理坐标:</p>
+                                <div class="inputItem">
+                                    <div class="name">经度</div>
+                                    <div class="ipt">
+                                        <input type="text" @input="limtInput('blon')" v-model="blon" name="blon" id="blon" value="123" />
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="inputItem">
-                                <div class="name">纬度</div>
-                                <div class="ipt">
-                                    <input type="text" @input="limtInput('blat')" v-model="blat" name="blat" id="blat" value="22" />
+                                <div class="inputItem">
+                                    <div class="name">纬度</div>
+                                    <div class="ipt">
+                                        <input type="text" @input="limtInput('blat')" v-model="blat" name="blat" id="blat" value="22" />
+                                    </div>
                                 </div>
-                            </div>
-                            <!-- <div class="inputItem">
+                                <!-- <div class="inputItem">
                                 <div class="name">高程</div>
                                 <div class="ipt">
                                     <input type="text" v-model="balt" name="balt" id="balt" value="0" />
                                 </div>
                             </div> -->
-                        </div>
+                            </div>
 
 
 
 
-                    </form>
-                </div>
+                        </form>
+                    </div>
 
-                <div v-if="isEdit" class="bottom">
-                    <div class="style"></div>
-                    <!-- <input type="submit" class="submitBtn" value="提交" />
+                    <div class="bottom">
+                        <div class="style"></div>
+                        <!-- <input type="submit" class="submitBtn" value="提交" />
                     <button id="clear">取消</button> -->
-                    <!-- <div id="clear" @click="getImageTransform">提交地图信息</div> -->
-                    <!-- <div id="clear" @click="clearMap">取消</div> -->
-                    <div id="clear" @click="isEdit=false">取消</div>
-                    <div class="submitBtn" @click="commit()">
-                        保存
-                    </div>
+                        <!-- <div id="clear" @click="getImageTransform">提交地图信息</div> -->
+                        <!-- <div id="clear" @click="clearMap">取消</div> -->
+                        <div id="clear" @click="isEdit=false">取消</div>
+                        <div class="submitBtn" @click="commit()">
+                            保存
+                        </div>
 
+                    </div>
                 </div>
 
+
                 <upload-pointClound v-if="isUpload" />
                 <!-- <image-tranform ref="imageTranform" /> -->
             </div>
@@ -191,7 +194,7 @@
 
     <!-- <script src="./js/proj4.js"></script>
     <script src="./js/three.js"></script> -->
-    <script src="./components/image-transform/index.js"></script>
+    <!-- <script src="./components/image-transform/index.js"></script> -->
     <script src="./components/upload-pointClound/index.js"></script>
     <script type="text/javascript">
         //输入经纬度就可以定位

locat/components/upload-Pointclound/index.js

@@ -85,7 +85,7 @@
                     this.value = ''
                     this.$parent.hideLoading()
                     this.$message({
-                        message: '恭喜你，这是一条成功消息',
+                        message: '数据集添加成功',
                         type: 'success',
                         duration: 2000,
                     });

style.css

@@ -60,6 +60,12 @@ body {
     position: relative;
 }
 
+.control_box {
+    width: 100%;
+    height: 100%;
+    position: relative;
+}
+
 .scrollBox {
     width: 100%;
     height: 100%;