Home Explore Help
Register Sign In
4dkankan
/
laser_v1
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

feat：修改样式

jinx 4 years ago
parent
38ec484e46
commit
6bfc5e408e
6 changed files with 180 additions and 24 deletions
Split View Show Diff Stats
  1. 61 6
      css/style.css
  2. BIN
      img/poi_navvis/generic_poi.png
  3. 52 13
      locat/addDataSet.html
  4. 33 2
      locat/style.css
  5. 33 2
      style.css
  6. 1 1
      translations/zh.json

+ 61 - 6
css/style.css
View File 

@@ -1523,12 +1523,13 @@ translation-editor[selected-language="selectedLanguage"] .form-group:first-of-ty
 
 /* GPS设置 */
 
 
 sidebar-menu-item li h4[title="GPS设置"]+sidebar-menu-items-collection.active {
 
-    position: fixed;
 
-    width: calc(100% - 62px);
 
-    height: calc(100% - 62px);
 
+    /* position: fixed; */
 
+    /* width: calc(100% - 62px); */
 
+    /* width: 440px;
 
+    height: calc(100% - 124px);
 
     right: 0;
 
     left: 60px !important;
 
-    top: 62px !important;
 
+    top: 124px !important; */
 
 }
 
 
 sidebar-menu-item li h4[title="GPS设置"]+sidebar-menu-items-collection.active .panel-autoscroll {
 
@@ -1651,7 +1652,7 @@ navbar-menu .navbar-default .navbar-custom>li.navbar-menu-item-user {
 
     /* display: none; */
 
 }
 
 
-.glyphicon-resize-full:before {
 
+.swap-views-button .glyphicon-resize-full:before {
 
     content: "" !important;
 
     width: 24px;
 
     height: 24px;
 
@@ -1660,7 +1661,7 @@ navbar-menu .navbar-default .navbar-custom>li.navbar-menu-item-user {
 
     background-size: 100% 100%;
 
 }
 
 
-.glyphicon-resize-full.active:before {
 
+.swap-views-button .glyphicon-resize-full.active:before {
 
     content: "" !important;
 
     width: 24px;
 
     height: 24px;
 
@@ -1800,4 +1801,58 @@ button[title="保存所选"] .material-icons {
 
     -webkit-border-radius: 1em;
 
     -moz-border-radius: 1em;
 
     border-radius: 1em;
 
+}
 
+
 
+.route-box .route-last-position .padding-horizontal {
 
+    color: #fff !important;
 
+}
 
+
 
+.route-box .route-last-position:hover {
 
+    background: transparent !important;
 
+}
 
+
 
+.route-box .form {
 
+    margin-left: -40px !important;
 
+}
 
+
 
+.route-box .btn-reverse-route {
 
+    right: 14px !important;
 
+}
 
+
 
+poi-translation-editor[selected-language="vm.selectedLanguage"] {
 
+    display: none !important;
 
+}
 
+
 
+optgroup {
 
+    background: rgba(0, 0, 0, .8) !important;
 
+    color: #fff !important;
 
+}
 
+
 
+button[title="切换到2D视图"]:hover {
 
+    background: rgba(0, 0, 0, .8) !important;
 
+    color: #15BEC8 !important;
 
+    border-color: rgba(0, 0, 0, .8) !important;
 
+}
 
+
 
+button[title="切换到3D视图"] {
 
+    color: #fff;
 
+}
 
+
 
+button[title="切换到3D视图"]:hover {
 
+    background: rgba(0, 0, 0, .8) !important;
 
+    color: #15BEC8 !important;
 
+    border-color: rgba(0, 0, 0, .8) !important;
 
+}
 
+
 
+#progress-wrapper {
 
+    display: none !important;
 
+}
 
+
 
+#cke_1_contents iframe {
 
+    display: none !important;
 
+}
 
+
 
+#editor_coord_froms {
 
+    text-align: left !important;
 
+    margin-left: 60px !important;
 
 }

BIN
img/poi_navvis/generic_poi.png
View File


+ 52 - 13
locat/addDataSet.html
View File 

@@ -16,25 +16,63 @@
 
         }
 
     </style>
 
     <!-- <script src="./ol.js"></script> -->
 
-    <title>控制点定位</title>
 
+    <title>定位</title>
 
 </head>
 
 
 <body>
 
     <div id="app" v-cloak>
 
         <div class="content">
 
 
-            <div class="rightBox">
 
+            <!-- <div class="rightBox">
 
                 <div class="map-layer">
 
                     <div id="map" class="map"></div>
 
                     <image-tranform :map-ol="map" v-if="map && showImageTranform" v-show="showImageTranform1" ref="imageTranform" />
 
                 </div>
 
 
-            </div>
 
+            </div> -->
 
             <div id="plane">
 
 
                 <div class="main" v-if="!isEdit">
 
-                    <div class="title">GPS 设置</div>
 
+                    <!-- <div class="title">定位</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>
 
+                            </div>
 
+
 
+                            <p>地理坐标</p>
 
+                            <div>
 
+                                <span>经度：{{alon}}</span>
 
+                                <span>纬度：{{alat}}</span>
 
+                                <span>高程：{{aalt}}</span>
 
+                            </div>
 
+                        </div>
 
+                    </div>
 
+                    <div class="main_item">
 
+                        <p class="main_item_title">锚点2</p>
 
+                        <div class="dataBox">
 
+                            <p>本地坐标</p>
 
+                            <div>
 
+                                <span>X：{{bx}}</span>
 
+                                <span>Y：{{by}}</span>
 
+                                <span>Z：{{bz}}</span>
 
+                            </div>
 
+
 
+                            <p>地理坐标</p>
 
+                            <div>
 
+                                <span>经度：{{blon}}</span>
 
+                                <span>纬度：{{blat}}</span>
 
+                                <span>高程：{{balt}}</span>
 
+                            </div>
 
+                        </div>
 
+                    </div>
 
+
 
+                    <div class="editBtn" @click="isEdit=true">修改锚点</div>
 
+                    <!-- <div class="main_item">
 
                         <div class="Setting">
 
                             <div class="msgBox">
 
                                 <p class="title">
 
@@ -45,8 +83,8 @@
 
                                 修改
 
                             </div>
 
                         </div>
 
-                    </div>
 
-                    <div class="main_item">
 
+                    </div> -->
 
+                    <!-- <div class="main_item" v-if="false">
 
                         <div class="Setting">
 
                             <div class="msgBox">
 
                                 <p class="title">
 
@@ -63,15 +101,16 @@
 
                                     思维展厅.PNG
 
                                 </div>
 
                                 <div class="fileBtn">
 
-                                    <!-- <div class="fileBtnicon fileDel"></div> -->
 
+
 
                                     <div class="fileBtnicon fileHide" @click="showImageTranform1 = !showImageTranform1"></div>
 
                                     <div class="fileBtnicon fileSave" @click="getImageTransform"></div>
 
-                                    <!-- <div class="fileBtnicon fileSave" @click="getImageTiled"></div> -->
 
+                                    <div class="fileBtnicon fileSave" @click="getImageTiled"></div>
 
+                                    <div class="fileBtnicon fileDel"></div>
 
 
                                 </div>
 
                             </div>
 
                         </div>
 
-                    </div>
 
+                    </div> -->
 
 
 
 
@@ -79,12 +118,12 @@
 
                 <div v-if="isEdit" class="scrollBox">
 
                     <!-- <button id="location1">定位1</button>
 
                     <button id="location2">定位2</button> -->
 
-                    <p class="title">地理坐标</p>
 
-                    <p class="desc">输入拍摄时记录的坐标，将数据集放置在真实世界地图中</p>
 
+                    <!-- <p class="title">定位</p>
 
+                    <p class="desc">输入拍摄时记录的坐标，将数据集放置在真实世界地图中</p> -->
 
                     <form>
 
                         <div class="tag">
 
                             <P class="formTitle">锚点1</P>
 
-                            <div class="localIcon" @click="set_location(1)"></div>
 
+                            <!-- <div class="localIcon" @click="set_location(1)"></div> -->
 
                         </div>
 
                         <div class="formItem">
 
                             <p class="itemTitle">本地坐标:</p>
 
@@ -138,7 +177,7 @@
 
 
                         <div class="tag">
 
                             <P class="formTitle">锚点2</P>
 
-                            <div class="localIcon" @click="set_location(2)"></div>
 
+                            <!-- <div class="localIcon" @click="set_location(2)"></div> -->
 
                         </div>
 
                         <div class="formItem">
 
                             <p class="itemTitle">本地坐标:</p>

+ 33 - 2
locat/style.css
View File 

@@ -48,7 +48,8 @@ body {
 
 }
 
 
 #plane {
 
-    width: 30%;
 
+    /* width: 30%; */
 
+    width: 100%;
 
     height: 100%;
 
     /* position: absolute; */
 
     /* top: 10px;
 
@@ -336,7 +337,7 @@ input::-webkit-input-placeholder {
 
     height: 100%;
 
     overflow-y: scroll;
 
     box-sizing: border-box;
 
-    padding: 30px 30px 80px 30px;
 
+    padding: 20px;
 
 }
 
 
 #plane .main .Setting {
 
@@ -429,4 +430,34 @@ input::-webkit-input-placeholder {
 
 .fileSave {
 
     background: url(../img/icon/icon_save.png)no-repeat;
 
     background-size: 100%;
 
+}
 
+
 
+.main_item_title {
 
+    margin-bottom: 20px;
 
+}
 
+
 
+.dataBox {
 
+    border: 1px solid rgba(255, 255, 255, .2);
 
+    padding: 10px;
 
+    box-sizing: border-box;
 
+    margin-bottom: 20px;
 
+}
 
+
 
+.dataBox>p {
 
+    margin: 10px 0;
 
+}
 
+
 
+.editBtn {
 
+    width: 100%;
 
+    height: 40px;
 
+    border: 1px solid #15BEC8;
 
+    border-radius: 4px;
 
+    box-sizing: border-box;
 
+    text-align: center;
 
+    line-height: 40px;
 
+    cursor: pointer;
 
+}
 
+
 
+.editBtn:hover {
 
+    background: #143537;
 
 }

+ 33 - 2
style.css
View File 

@@ -48,7 +48,8 @@ body {
 
 }
 
 
 #plane {
 
-    width: 30%;
 
+    /* width: 30%; */
 
+    width: 100%;
 
     height: 100%;
 
     /* position: absolute; */
 
     /* top: 10px;
 
@@ -336,7 +337,7 @@ input::-webkit-input-placeholder {
 
     height: 100%;
 
     overflow-y: scroll;
 
     box-sizing: border-box;
 
-    padding: 30px 30px 80px 30px;
 
+    padding: 20px;
 
 }
 
 
 #plane .main .Setting {
 
@@ -429,4 +430,34 @@ input::-webkit-input-placeholder {
 
 .fileSave {
 
     background: url(../img/icon/icon_save.png)no-repeat;
 
     background-size: 100%;
 
+}
 
+
 
+.main_item_title {
 
+    margin-bottom: 20px;
 
+}
 
+
 
+.dataBox {
 
+    border: 1px solid rgba(255, 255, 255, .2);
 
+    padding: 10px;
 
+    box-sizing: border-box;
 
+    margin-bottom: 20px;
 
+}
 
+
 
+.dataBox>p {
 
+    margin: 10px 0;
 
+}
 
+
 
+.editBtn {
 
+    width: 100%;
 
+    height: 40px;
 
+    border: 1px solid #15BEC8;
 
+    border-radius: 4px;
 
+    box-sizing: border-box;
 
+    text-align: center;
 
+    line-height: 40px;
 
+    cursor: pointer;
 
+}
 
+
 
+.editBtn:hover {
 
+    background: #143537;
 
 }

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