Explorar el Código

feat:新增打开地图订阅方法

jinx hace 4 años
padre
commit
94cbeb6651
Se han modificado 4 ficheros con 42 adiciones y 9 borrados
  1. 10 2
      components/upload-Pointclound/index.js
  2. 20 4
      css/style.css
  3. 11 3
      locat/addDataSet.html
  4. 1 0
      main.js

+ 10 - 2
components/upload-Pointclound/index.js

@@ -89,8 +89,10 @@
                         type: 'success',
                         duration: 2000,
                     });
+                    window.eventBus
                     IV.api.AuthenticationService.sendAuthenticationChanged()
-                        // IV.SidebarMenuService.goToItem(IV.SidebarMenuService.items[1])
+
+                    // IV.SidebarMenuService.goToItem(IV.SidebarMenuService.items[1])
 
                 }, 2000);
                 // this.$confirm('此操作将永久删除该文件, 是否继续?', {
@@ -111,7 +113,8 @@
             },
             delConfirm() {
                 console.log(1)
-            }
+            },
+
         },
         computed: {
 
@@ -120,7 +123,12 @@
 
         },
         mounted() {
+            window.eventBus.off('openMap', openMap);
+            window.eventBus.on('openMap', openMap);
 
+            function openMap() {
+                IV.swapScenes()
+            }
         },
     })
 })();

+ 20 - 4
css/style.css

@@ -688,8 +688,6 @@ input {
     background: transparent !important;
     border: 1px solid rgba(255, 255, 255, 0.4) !important;
     color: #fff !important;
-    width: 100%;
-    height: 100%;
 }
 
 .ui-widget-content {
@@ -1085,6 +1083,10 @@ form[class="ng-valid ng-dirty ng-valid-parse"] .panel .panel-body .add-building:
 }
 
 form[class="ng-valid ng-dirty ng-valid-parse"] .panel .panel-body .btn-block:nth-of-type(n+2) {
+    /* display: none; */
+}
+
+form[class="ng-valid ng-dirty ng-valid-parse"] .panel .panel-body .btn-block[ng-click="vm.exportSiteModel()"] {
     display: none;
 }
 
@@ -1145,8 +1147,8 @@ download-button .dropdown-toggle {
     background: #15BEC8 !important;
 }
 
-.vertical-menu-content ul .selected {
-    background: #15BEC8 !important;
+.site-model-collection .site-model-button.selected {
+    background: #143537 !important;
 }
 
 download-button .input-group .btn-primary {
@@ -1725,6 +1727,16 @@ navbar-menu .navbar-default .navbar-custom>li.navbar-menu-item-user {
     width: 24px;
     height: 24px;
     display: block;
+    /* background: url(../img/icon/icon_location_s.png)no-repeat; */
+    background: url(../img/icon/icon_location_n.png)no-repeat;
+    background-size: 100% 100%;
+}
+
+.swap-views-button .glyphicon-resize-full:hover:before {
+    content: "" !important;
+    width: 24px;
+    height: 24px;
+    display: block;
     background: url(../img/icon/icon_location_s.png)no-repeat;
     background-size: 100% 100%;
 }
@@ -1756,6 +1768,10 @@ point-cloud-viewport .view-switcher__holder {
     justify-content: center;
 }
 
+.uncollapse-btn .button-padding-left:hover {
+    background: #15BEC8;
+}
+
 .uncollapse-btn .button-padding-leftimg[alt="arrow_icon"] {
     width: 24px;
     height: 24px;

+ 11 - 3
locat/addDataSet.html

@@ -297,7 +297,6 @@
 
             mounted() {
                 // alert(sceneNum)
-
                 this.getContorlPoint()
                     // this.sceneNum = window.location.pathname.split('/')[2]
                     // this.$nextTick(() => {
@@ -442,7 +441,11 @@
                             // id: 1
                         })
                         .catch(function(error) {
-                            alert('控制点上传失败')
+                            this.$message({
+                                message: '控制点上传失败',
+                                type: 'error',
+                                duration: 2000,
+                            });
                         }),
 
                         // this.getImageTransform()
@@ -451,7 +454,12 @@
                         // })
                     ]).then(() => {
                         this.getContorlPoint()
-                        alert('控制点上传成功')
+                        this.$message({
+                            message: '控制点上传成功',
+                            type: 'success',
+                            duration: 2000,
+                        });
+                        // alert('控制点上传成功')
                     })
 
                 },

+ 1 - 0
main.js

@@ -174958,6 +174958,7 @@ and limitations under the License.
                    return t.loadSecondaryFonts()
                }
                ), 3e3)
+				window.eventBus.emit('openMap')
            }
            ,
            e.prototype.initData = function(t) {