Selaa lähdekoodia

feat:更新样式

jinx 4 vuotta sitten
vanhempi
commit
41ecdb9648
7 muutettua tiedostoa jossa 22 lisäystä ja 19 poistoa
  1. 5 5
      css/style.css
  2. BIN
      img/icon/icon_load_n.png
  3. BIN
      img/icon/icon_load_s.png
  4. 13 13
      js/popindoorAPI2.7.1.js
  5. 2 1
      locat/addDataSet.html
  6. 1 0
      locat/style.css
  7. 1 0
      style.css

+ 5 - 5
css/style.css

@@ -318,7 +318,7 @@ sidebar-menu-item>li icon>i.fa-thumb-tack[iv-tooltip="坐标"] {
     background-size: 100% 100%;
 }
 
-sidebar-menu-item>li icon>i.fa-thumb-tack[iv-tooltip="GPS设置"] {
+sidebar-menu-item>li icon>i.fa-thumb-tack[iv-tooltip="控制点"] {
     background: url(../img/icon/icon_load_n.png?4)no-repeat;
     background-size: 100% 100%;
     width: 60px;
@@ -326,7 +326,7 @@ sidebar-menu-item>li icon>i.fa-thumb-tack[iv-tooltip="GPS设置"] {
     color: transparent;
 }
 
-.vertical-menu sidebar-menu-item.active>li icon>i.fa-thumb-tack[iv-tooltip="GPS设置"] {
+.vertical-menu sidebar-menu-item.active>li icon>i.fa-thumb-tack[iv-tooltip="控制点"] {
     background: url(../img/icon/icon_load_s.png?4)no-repeat;
     background-size: 100% 100%;
 }
@@ -1520,9 +1520,9 @@ translation-editor[selected-language="selectedLanguage"] .form-group:first-of-ty
 }
 
 
-/* GPS设置 */
+/* 控制点 */
 
-sidebar-menu-item li h4[title="GPS设置"]+sidebar-menu-items-collection.active {
+sidebar-menu-item li h4[title="控制点"]+sidebar-menu-items-collection.active {
     /* position: fixed; */
     /* width: calc(100% - 62px); */
     /* width: 440px;
@@ -1532,7 +1532,7 @@ sidebar-menu-item li h4[title="GPS设置"]+sidebar-menu-items-collection.active
     top: 124px !important; */
 }
 
-sidebar-menu-item li h4[title="GPS设置"]+sidebar-menu-items-collection.active .panel-autoscroll {
+sidebar-menu-item li h4[title="控制点"]+sidebar-menu-items-collection.active .panel-autoscroll {
     overflow: hidden;
 }
 

BIN
img/icon/icon_load_n.png


BIN
img/icon/icon_load_s.png


+ 13 - 13
js/popindoorAPI2.7.1.js

@@ -571,17 +571,17 @@ var LookupGeoLocation = function(main_view, main_scene, map_view) {
 
     function default_proj4() {
         proj4_setting = [{
-            geo_name: '本地坐标',
-            geo_proj4: 'local'
-        }, {
-            geo_name: '大地2000坐标',
-            geo_proj4: 'world'
-        }
-        // , {
-        //     geo_name: 'EPSG 4549:CGCS2000 / 3-degree Gauss-Kruger CM 120E',
-        //     geo_proj4: '+proj=tmerc +lat_0=0 +lon_0=120 +k=1 +x_0=500000 +y_0=0 +ellps=GRS80 +units=m +no_defs'
-        // }
-    ];
+                geo_name: '本地坐标',
+                geo_proj4: 'local'
+            }, {
+                geo_name: '大地2000坐标',
+                geo_proj4: 'world'
+            }
+            // , {
+            //     geo_name: 'EPSG 4549:CGCS2000 / 3-degree Gauss-Kruger CM 120E',
+            //     geo_proj4: '+proj=tmerc +lat_0=0 +lon_0=120 +k=1 +x_0=500000 +y_0=0 +ellps=GRS80 +units=m +no_defs'
+            // }
+        ];
     }
     IV.custom.init_coord = function() {
 
@@ -897,7 +897,7 @@ var addMinMap = function(main_view, main_scene, map_view) {
     var menuItems = IV.getMenuItems();
 
     var newItem = {
-        title: "GPS设置",
+        title: "控制点",
         icon: {
             className: "fa fa-thumb-tack"
         },
@@ -1018,7 +1018,7 @@ var Setting = function() {
             var highlightSiteModelLayer = new HighlightSiteModelLayer(main_view, main_scene, map_view, map_scene);
             map_view.addToScene(highlightSiteModelLayer);
         }
-        if(userService.isAdmin()){
+        if (userService.isAdmin()) {
             var myMap = new addMinMap(main_view, main_scene, map_view, map_scene);
             main_view.addToScene(myMap);
         }

+ 2 - 1
locat/addDataSet.html

@@ -34,6 +34,8 @@
 
                 <div class="main" v-if="!isEdit">
                     <!-- <div class="title">定位</div> -->
+                    <div class="editBtn" @click="isEdit=true">修改锚点</div>
+
                     <div class="main_item">
                         <p class="main_item_title">锚点1</p>
                         <div class="dataBox">
@@ -71,7 +73,6 @@
                         </div>
                     </div>
 
-                    <div class="editBtn" @click="isEdit=true">修改锚点</div>
                     <!-- <div class="main_item">
                         <div class="Setting">
                             <div class="msgBox">

+ 1 - 0
locat/style.css

@@ -456,6 +456,7 @@ input::-webkit-input-placeholder {
     text-align: center;
     line-height: 40px;
     cursor: pointer;
+    margin-bottom: 10px;
 }
 
 .editBtn:hover {

+ 1 - 0
style.css

@@ -456,6 +456,7 @@ input::-webkit-input-placeholder {
     text-align: center;
     line-height: 40px;
     cursor: pointer;
+    margin-bottom: 10px;
 }
 
 .editBtn:hover {