Просмотр исходного кода

Merge branch 'develop' of git.sagacloud.cn:web/wanda-bm-guide into develop

guoxiaohuan 4 лет назад
Родитель
Сommit
bea6ab9045
2 измененных файлов с 10 добавлено и 2 удалено
  1. 5 1
      src/components/Legend/src/legend.vue
  2. 5 1
      src/components/menuList.vue

+ 5 - 1
src/components/Legend/src/legend.vue

@@ -291,7 +291,11 @@ export default {
             let seq = this.$cookie.get('currentFloorId')
             let data = `categoryId=${categoryId}&projectId=${this.plazaId}&BuildingID=1&FloorID=${FloorID}&FloorName=${floorName}&fmapID=${this.fmapID}&seq=${seq}&token=${this.ssoToken}`
             let url = editerUrl + 'editer?' + encodeURIComponent(data)
-            window.open(url, true)
+            if (this.fmapID) {
+                window.open(url, true)
+            } else {
+                this.$message.error('请等待底图加载完成后再操作!')
+            }
         },
         isShow2() {
             this.show2 = !this.show2

+ 5 - 1
src/components/menuList.vue

@@ -126,7 +126,11 @@ export default {
                 { editerUrl } = conf
             let data = `projectId=${this.plazaId}&fmapID=${this.fmapID}&token=${this.$store.state.ssoToken}`
             let url = editerUrl + 'drafts?' + encodeURIComponent(data)
-            window.open(url, true)
+            if (this.fmapID) {
+                window.open(url, true)
+            } else {
+                this.$message.error('请等待底图加载完成后再操作!')
+            }
         },
         currentTime() {
             this.times = moment().format('YYYY.MM.DD HH:mm')