瀏覽代碼

feat:更新样式

jinx 4 年之前
父節點
當前提交
7241d60e9a
共有 5 個文件被更改,包括 85 次插入40 次删除
  1. 20 4
      css/style.css
  2. 62 35
      locat/addDataSet.html
  3. 1 0
      locat/style.css
  4. 1 0
      style.css
  5. 1 1
      translations/zh.json

+ 20 - 4
css/style.css

@@ -1504,6 +1504,14 @@ results-element .checkbox,
     color: #fff !important;
 }
 
+.context-menu-item:nth-of-type(2) {
+    display: none !important;
+}
+
+.context-menu-item:nth-of-type(5) {
+    display: none !important;
+}
+
 .context-menu-item:hover {
     background: #15BEC8 !important;
 }
@@ -1848,11 +1856,19 @@ button[title="切换到3D视图"]:hover {
     display: none !important;
 }
 
-#cke_1_contents iframe {
-    display: none !important;
-}
-
 #editor_coord_froms {
     text-align: left !important;
     margin-left: 60px !important;
+}
+
+#editPoi .modal-body .poiModalForm .form-group:nth-of-type(3) {
+    display: none !important;
+}
+
+#editPoi .modal-body .poiModalForm permission-editor[class="ng-isolate-scope"] {
+    display: none !important;
+}
+
+#upload_panel .fa-upload {
+    display: none !important;
 }

+ 62 - 35
locat/addDataSet.html

@@ -34,23 +34,23 @@
 
                 <div class="main" v-if="!isEdit">
                     <!-- <div class="title">定位</div> -->
-                    <div class="editBtn" @click="isEdit=true">修改锚点</div>
+                    <div class="editBtn" @click="openEdit">修改控制点</div>
 
                     <div class="main_item">
                         <p class="main_item_title">锚点1</p>
                         <div class="dataBox">
                             <p>本地坐标</p>
                             <div>
-                                <span>X:{{ax}}</span>
-                                <span>Y:{{ay}}</span>
-                                <span>Z:{{az}}</span>
+                                <span>X:{{showData.ax}}</span>
+                                <span>Y:{{showData.ay}}</span>
+                                <span>Z:{{showData.az}}</span>
                             </div>
 
                             <p>地理坐标</p>
                             <div>
-                                <span>经度:{{alon}}</span>
-                                <span>纬度:{{alat}}</span>
-                                <span>高程:{{aalt}}</span>
+                                <span>经度:{{showData.alon}}</span>
+                                <span>纬度:{{showData.alat}}</span>
+                                <span>高程:{{showData.aalt}}</span>
                             </div>
                         </div>
                     </div>
@@ -59,16 +59,16 @@
                         <div class="dataBox">
                             <p>本地坐标</p>
                             <div>
-                                <span>X:{{bx}}</span>
-                                <span>Y:{{by}}</span>
-                                <span>Z:{{bz}}</span>
+                                <span>X:{{showData.bx}}</span>
+                                <span>Y:{{showData.by}}</span>
+                                <span>Z:{{showData.bz}}</span>
                             </div>
 
                             <p>地理坐标</p>
                             <div>
-                                <span>经度:{{blon}}</span>
-                                <span>纬度:{{blat}}</span>
-                                <span>高程:{{balt}}</span>
+                                <span>经度:{{showData.blon}}</span>
+                                <span>纬度:{{showData.blat}}</span>
+                                <span>高程:{{showData.balt}}</span>
                             </div>
                         </div>
                     </div>
@@ -121,9 +121,16 @@
                     <button id="location2">定位2</button> -->
                     <!-- <p class="title">定位</p>
                     <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>
                     <form>
                         <div class="tag">
-                            <P class="formTitle">锚点1</P>
+                            <P class="formTitle">控制点1</P>
                             <!-- <div class="localIcon" @click="set_location(1)"></div> -->
                         </div>
                         <div class="formItem">
@@ -177,7 +184,7 @@
                         </div>
 
                         <div class="tag">
-                            <P class="formTitle">点2</P>
+                            <P class="formTitle">控制点2</P>
                             <!-- <div class="localIcon" @click="set_location(2)"></div> -->
                         </div>
                         <div class="formItem">
@@ -229,13 +236,6 @@
                             </div>
                         </div>
 
-                        <!-- <p class="itemTitle">EPSG 坐标系 </p>
-                        <div class="formItem">
-                            <div class="allIpt">
-                                <input type="text" v-model="EPSG" name="EPSG" id="EPSG" />
-                            </div>
-
-                        </div> -->
 
 
 
@@ -314,7 +314,7 @@
                     blon: '123',
                     blat: '22',
                     balt: '0',
-                    EPSG: 'EPSG:99999',
+                    EPSG: 'EPSG:4490',
                     ageControlLocation1: [],
                     ageControlLocation2: [],
                     gpsControlCoordinate1: [],
@@ -347,13 +347,20 @@
                         size: '256'
                     },
                     // 优化
-                    list: [{
-                        ageControlLocation1: [0, 0, 0],
-                        gpsControlCoordinate1: [120, 22, 0]
-                    }, {
-                        ageControlLocation2: [0, 0, 0],
-                        gpsControlCoordinate2: [123, 22, 0]
-                    }]
+                    showData: {
+                        ax: '',
+                        ay: '',
+                        az: '',
+                        alon: '120',
+                        alat: '22',
+                        aalt: '0',
+                        bx: '',
+                        by: '',
+                        bz: '',
+                        blon: '123',
+                        blat: '22',
+                        balt: '0'
+                    }
 
                 }
             },
@@ -508,11 +515,12 @@
                             alert('数据集位置上传失败')
                         }),
 
-                        this.getImageTransform()
-                        .catch(_ => {
-                            alert('地图数据上传失败')
-                        })
+                        // this.getImageTransform()
+                        // .catch(_ => {
+                        //     alert('地图数据上传失败')
+                        // })
                     ]).then(() => {
+                        this.getContorlPoint()
                         alert('成功')
                     })
 
@@ -556,7 +564,6 @@
                     })
                 },
                 initContorlPoint(data) {
-                    console.log(data)
 
 
                     this.ax = data.ageControlLocation1[0]
@@ -568,6 +575,26 @@
                     this.blon = data.gpsControlCoordinate2[0]
                     this.blat = data.gpsControlCoordinate2[1]
 
+                    this.showData.ax = data.ageControlLocation1[0]
+                    this.showData.ay = data.ageControlLocation1[1]
+                    this.showData.bx = data.ageControlLocation2[0]
+                    this.showData.by = data.ageControlLocation2[1]
+                    this.showData.alon = data.gpsControlCoordinate1[0]
+                    this.showData.alat = data.gpsControlCoordinate1[1]
+                    this.showData.blon = data.gpsControlCoordinate2[0]
+                    this.showData.blat = data.gpsControlCoordinate2[1]
+
+                },
+                openEdit() {
+                    this.isEdit = true
+                    this.ax = this.showData.ax
+                    this.ay = this.showData.ay
+                    this.bx = this.showData.bx
+                    this.by = this.showData.by
+                    this.alon = this.showData.alon
+                    this.alat = this.showData.alat
+                    this.blon = this.showData.blon
+                    this.blat = this.showData.blat
                 }
 
 

+ 1 - 0
locat/style.css

@@ -216,6 +216,7 @@ input::-webkit-input-placeholder {
     border: none;
     outline: none;
     color: rgba(255, 255, 255, 0.6);
+    border: none !important;
 }
 
 .bottom {

+ 1 - 0
style.css

@@ -216,6 +216,7 @@ input::-webkit-input-placeholder {
     border: none;
     outline: none;
     color: rgba(255, 255, 255, 0.6);
+    border: none !important;
 }
 
 .bottom {

File diff suppressed because it is too large
+ 1 - 1
translations/zh.json