Merge branch 'master' of http://192.168.0.115:3000/4dkankan/laser_v1

css/style.css

@@ -2106,4 +2106,8 @@ rotate-panel .rotate-icon {
 
 .arrow.mirrored:hover {
     background: #15BEC8 !important;
+}
+
+point-cloud-viewport .viewport-label {
+    z-index: 10;
 }

locat/addDataSet.html

@@ -197,13 +197,17 @@
                     </div>
                     <div class="defaultPic itemBox active">
                         <div class="ctrlBox">
-                            <p class="ctrlTitle">默认平面图</p>
+                            <div class="ctrlTitle">
+                                默认平面图
+                                <div class="tipBox" title="修改点云或数据集后，请更新平面图"></div>
+                            </div>
+                            <!-- <p>默认平面图</p> -->
                             <el-popconfirm placement="top" title="系统将创建新的平面图，您上传的平面图将被清除，是否继续？" :hide-icon="true" @confirm="refreshConfirm">
                                 <el-button slot="reference">
                                     <div class="ctrlBtn">
                                         <i class="ctrlIcon refreshIcon"></i>
                                         <p class="ctrlText">更新</p>
-                                        <!-- <div class="tipBox" title="修改点云或数据集后，请更新平面图"></div> -->
+
 
                                     </div>
                                 </el-button>
@@ -232,11 +236,12 @@
                                     <p class="ctrlText">下载</p>
 
                                 </div>
-                                <div class="ctrlBtn">
+                                <div class="ctrlBtn" lable="files">
                                     <i class="ctrlIcon uploadIcon"></i>
                                     <p class="ctrlText">上传</p>
 
                                 </div>
+                                <input type="file" id="files" @change="uploadPic">
                             </div>
 
                         </div>
@@ -634,6 +639,22 @@
                 },
                 delConfirm() {
                     console.log('delConfirm')
+                },
+                uploadPic(e) {
+                    let file = e.target.files[0]
+                    let params = new FormData()
+                    params.append('file', file)
+                    axios.post(`/api/${sceneNum}/uploadPic`, params).then(res => {
+
+                    }).catch(err => {
+                        this.$message({
+                            message: '上传失败',
+                            type: 'error',
+                            duration: 2000,
+                        });
+
+                    })
+
                 }
 
 

style.css

@@ -809,8 +809,9 @@ input::-webkit-input-placeholder {
 .itemBox .ctrlBox {}
 
 .itemBox .ctrlBox .ctrlTitle {
-    font-style: 18px;
     color: #fff;
+    position: relative;
+    margin-bottom: 10px;
 }
 
 .btnBox {
@@ -831,6 +832,15 @@ input::-webkit-input-placeholder {
     margin-right: 10px;
 }
 
+#files {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    opacity: 0;
+    z-index: 10;
+    cursor: pointer;
+}
+
 .ctrlBox .el-button {
     border: none;
     background: transparent;