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

css/style.css

@@ -842,7 +842,32 @@ site-model-editor .btn-primary:hover {
     background: #15BEC8;
 }
 
-form[class="ng-pristine ng-valid"] .panel {
+/* 空间模型 */
+form[class="ng-pristine ng-valid"] .panel.panel-default {
+    border-color: rgba(255, 255, 255, .2);
+}
+
+form[class="ng-pristine ng-valid"] .panel .panel-heading {
+    color: #fff;
+    border-color: rgba(255, 255, 255, .2);
+}
+
+form[class="ng-pristine ng-valid"] .panel .panel-body .add-building {
+    background: #15BEC8;
+    color: #fff;
+       border-color: #15BEC8;
+}
+
+form[class="ng-pristine ng-valid"] .panel .panel-body .add-building:hover {
+    background: #15BEC8;
+    color: #fff;
+}
+
+form[class="ng-pristine ng-valid"] .panel .panel-body .btn-block:nth-of-type(n+2) {
+    display: none;
+}
+
+form[class="ng-pristine ng-valid"] .panel .panel-body label.btn-block {
     display: none;
 }
 
@@ -907,11 +932,23 @@ attributes-editor .form-group .btn-primary:hover {
 .panel-body .panel-group .panel:nth-of-type(-n+5) {
     display: none;
 }
+
 /* 导入/导出兴趣点 */
-poi-export-import .collapse-style{
-      display: none !important;
+poi-export-import .collapse-style {
+    display: none !important;
 }
+
 /* 第三方许可 */
-#third-party-licenses-button{
+#third-party-licenses-button {
     display: none;
+}
+
+#floorChanger {
+    background: rgba(0, 0, 0, 0.8) !important;
+}
+
+floor-changer .btn-group-vertical button[ng-repeat="floorName in vm.floorNames | reverse"] {
+    background: transparent !important;
+    border-radius: 4px !important;
+    color: #15BEC8 !important;
 }

locat/addDataSet.html

@@ -59,7 +59,7 @@
                             </div>
                         </div>
                         <div class="formItem">
-                            <p class="itemTitle">Wgs84坐标:</p>
+                            <p class="itemTitle">地理坐标:</p>
                             <div class="inputItem">
                                 <div class="name">经度</div>
                                 <div class="ipt">
@@ -115,7 +115,7 @@
                         </div>
 
                         <div class="formItem">
-                            <p class="itemTitle">Wgs84坐标:</p>
+                            <p class="itemTitle">地理坐标:</p>
                             <div class="inputItem">
                                 <div class="name">经度</div>
                                 <div class="ipt">