Browse Source

调整图片路径,全景路径

sugb 10 months ago
parent
commit
ab4e2d0ac6
4 changed files with 11 additions and 14 deletions
  1. 1 0
      .gitignore
  2. 8 12
      src/components/OneMap/BasicMap.vue
  3. 2 1
      src/config/index.js
  4. 0 1
      src/views/onemap/mainMap.vue

+ 1 - 0
.gitignore

@@ -19,3 +19,4 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw*
+dist.zip

+ 8 - 12
src/components/OneMap/BasicMap.vue

@@ -662,9 +662,7 @@ export default {
     initActiveViewEvents() {
       if (this.mapView) {
         // PopupViewModel的触发动作被触发,然后检查动作id
-        this.mapView.popup.on('trigger-action', ({
-                                                   action
-                                                 }) => {
+        this.mapView.popup.on('trigger-action', ({action}) => {
           const actionId = action.id
           let {
             attributes
@@ -685,7 +683,6 @@ export default {
               this.result.实际占用土地面积 = parseFloat(this.resData.sjzytdmjPf).toFixed(2)
               /* this.result.实际_1=attributes.SJ_1.toFixed(2);*/
               this.result.其中证载使用土地面积 = parseFloat(this.resData.qzpztdmjPf).toFixed(2)
-
               this.result.实际使用建筑面积 = parseFloat(this.resData.sjsyjzmj).toFixed(2)
               this.result.其中证载使用建筑面积 = parseFloat(this.resData.qzpzsymj2).toFixed(2)
               this.result.是否共用宗 = this.resData.sfgyz
@@ -705,7 +702,6 @@ export default {
               //this.result.目前情况 = this.resData.MQQ;
               /*  this.result.规划地类=attributes.GHD;*/
               this.result.IMAGE = this.resData.images
-
               this.infoShow = true
               this.$refs.detail.loadDetail(this.result)
             }
@@ -742,12 +738,11 @@ export default {
               this.infoShow = true
               this.$refs.detail.loadDetail(this.result)
             }
-
           } else if (actionId == 'showAll') {
             if (this.resData.vr == null) {
               this.$message.warn('全景图片不存在!')
             } else {
-              window.open('/tdzcxx/vtour/tour.html?startscene=scene_' + this.resData.vr, '_blank')
+              window.open('/vtour/tour.html?startscene=scene_' + this.resData.vr, '_blank')
               //window.open('http://localhost:56122/?startscene=scene_'+this.resData.vr, '_blank')
             }
           } else {
@@ -756,15 +751,14 @@ export default {
         })
       }
     },
-
+    //TODO 点击地图时弹出信息
     selectChange(feature) {
+      //console.log('selectChange'+JSON.stringify(feature))
       let content = document.createElement('div')
       this.resData = []
-      if (feature.graphic.attributes.dkbh != ' ') {
+      if (feature.graphic.attributes.DKBH != ' ') {
         return new Promise((resolve, reject) => {
-          getAction('/qcsb/qcSsgqzysytdqk/queryBydkbh', {
-            DKBH: feature.graphic.attributes.dkbh
-          }).then((res) => {
+          getAction('/qcsb/qcSsgqzysytdqk/queryBydkbh', {DKBH: feature.graphic.attributes.DKBH}).then((res) => {
             if (res.code == 200) {
               this.resData = res.result
               resolve(this.resData)
@@ -773,6 +767,8 @@ export default {
             }
           })
         }).then((res) => {
+          console.log("获取的地块信息")
+          console.log(JSON.stringify(this.resData))
           if (res.sysOrgCode.slice(0, 3) == 'A04') {
             var dwmc = res.createBy
             var dkmc = res.dk

+ 2 - 1
src/config/index.js

@@ -6,7 +6,8 @@ window._CONFIG['domianURL'] = Vue.prototype.API_BASE_URL
 //单点登录地址
 window._CONFIG['casPrefixUrl'] = window._CONFIG.VUE_APP_CAS_BASE_URL?window._CONFIG.VUE_APP_CAS_BASE_URL:process.env.VUE_APP_CAS_BASE_URL
 window._CONFIG['onlinePreviewDomainURL'] =  window._CONFIG.VUE_APP_ONLINE_BASE_URL?window._CONFIG.VUE_APP_ONLINE_BASE_URL:process.env.VUE_APP_ONLINE_BASE_URL
-window._CONFIG['staticDomainURL'] = Vue.prototype.API_BASE_URL + '/sys/common/static'
+window._CONFIG['staticDomainURL'] = Vue.prototype.API_BASE_URL + '/images'
+//window._CONFIG['staticDomainURL'] = Vue.prototype.API_BASE_URL + '/sys/common/static'
 window._CONFIG['pdfDomainURL'] = Vue.prototype.API_BASE_URL+ '/sys/common/pdf/pdfPreviewIframe'
 
 window._CONFIG['domianURLs'] = "http://127.0.0.1:9001/jeecg-boot"

+ 0 - 1
src/views/onemap/mainMap.vue

@@ -22,7 +22,6 @@ export default {
   components: { BasicMap },
   data(){
     return{
-
       resConfigUrl:"/resManager.catalog/rescatalog/resListByUser",
       toolsConfigUrl:"/toolManage/toolmanage/toolListByUser"
     }