修改一张图地块详情显示方式

src/components/OneMap/BasicMap.vue

@@ -344,9 +344,7 @@ export default {
           this.$message.error(error.message)
         }
       )
-
       this.initLayers()
-
       this.initSplitMaps()
       this.initActiveViewEvents()
       this.initMapEvents()
@@ -400,7 +398,6 @@ export default {
         })
       })
     },
-
     initLayers() {
       if (this.layerList.length == 0) {
         this.$message.warn('未查询到图层相关配置')
@@ -549,7 +546,6 @@ export default {
         if (this.layerNum == this.layerCount) {
           this.$emit('layer-loadAll', true)
           this.mapView.extent = this.initExtent
-          // this.initBaseLayer() // 此处会导致进入地图页面后影像消失，所以注释掉
         }
       })
       if (parseInt(layerItem.zIndex)) {
@@ -559,7 +555,6 @@ export default {
         esriMap.add(layer_opacity)
       }
     },
-
     initBaseLayer() {
       let baseRasterLayer = new WMTSLayer({
         url: this.baseRasterLayerUrl,
@@ -678,55 +673,8 @@ export default {
           if (actionId === 'showDKDetail' && this.resData.sysOrgCode != null) {
             //获取弹出的popup所归属的graphic的attributes
             // getAction("")
-            if (this.resData.sysOrgCode.slice(0, 3) == 'A04') {
-              // this.result.单位名称 = this.resData.createBy
-              // this.result.地块名称 = this.resData.dk
-              // this.result.文件类型 = this.resData.wjlx
-              // this.result.文件编号 = this.resData.wjbh
-              // this.result.土地使用权人 = this.resData.tdsyqr
-              // this.result.实际占用土地面积 = parseFloat(this.resData.sjzytdmj).toFixed(2)+'㎡'
-              // this.result.其中证载使用土地面积 = parseFloat(this.resData.qzpzsymj).toFixed(2)+'㎡'
-              // this.result.实际使用建筑面积 = parseFloat(this.resData.sjsyjzmj).toFixed(2)+'㎡'
-              // this.result.其中证载使用建筑面积 = parseFloat(this.resData.qzpzsymj2).toFixed(2)+'㎡'
-              // this.result.是否共用宗 = this.resData.sfgyz
-              // this.result.容积率 = parseFloat(this.resData.sjrjl).toFixed(2)
-              // this.result.使用权使用方式 = this.resData.syqsyfs
-              // this.result.坐落位置 = this.resData.zlwz
-              // this.result.实际用途 = this.resData.sjytText
-              // this.result.权属起始时间 = this.resData.qsqssj
-              // this.result.权属结束时间 = this.resData.qsdqsj
-              // this.result.担保 = this.resData.dbdycfqk
-              // this.result.备注 = this.resData.BZ
-              // this.result.土地使用现状 = this.resData.tdsyxz
-              // this.result.地块编号 = this.resData.dkbh
-              // this.result.IMAGE = this.resData.images
-              this.infoShow = true
-              this.$refs.detail.loadDetail(this.resData)
-            }
-            if (this.resData.sysOrgCode.slice(0, 3) == 'A03') {
-              // this.result.单位名称 = this.resData.createBy
-              // this.result.地块名称 = this.resData.dk
-              // this.result.文件类型 = this.resData.zslx
-              // this.result.文件编号 = this.resData.wjbh
-              // this.result.土地使用权人 = this.resData.tdsyqr
-              // this.result.实际占用土地面积 = parseFloat(this.resData.sjzytdmj).toFixed(2)+'㎡'
-              // this.result.其中证载使用土地面积 = parseFloat(this.resData.qzpzsymj).toFixed(2)+'㎡'
-              // this.result.实际使用建筑面积 = parseFloat(this.resData.sjsyjzmj).toFixed(2)+'㎡'
-              // this.result.其中证载使用建筑面积 = parseFloat(this.resData.qzpzsymj2).toFixed(2)+'㎡'
-              // this.result.使用权使用方式 = this.resData.syqsyfs
-              // this.result.坐落位置 = this.resData.zlwz
-              // this.result.实际用途 = this.resData.sjyt
-              // this.result.权属起始时间 = this.resData.qsqssj
-              // this.result.权属结束时间 = this.resData.qsdqsj
-              // this.result.担保 = this.resData.dbdycfqk
-              // this.result.土地使用现状 = this.resData.tdsyxz
-              // this.result.备注 = this.resData.BZ
-              // this.result.地块编号 = this.resData.dkbh
-              // this.result.IMAGE = this.resData.images
-              this.infoShow = true
-              this.$refs.detail.loadDetail(this.resData)
-              //this.$refs.detail.loadDetail(this.result)
-            }
+            this.infoShow = true
+            this.$refs.detail.loadDetail(this.resData)
           } else if (actionId == 'showAll') {
             if (this.resData.vr == null) {
               this.$message.warn('全景图片不存在！')
@@ -740,8 +688,9 @@ export default {
         })
       }
     },
-    //TODO 点击地图时弹出信息
+    /*点击地图时弹出信息*/
     selectChange(feature) {
+      this.isVr=false;
       //console.log('selectChange'+JSON.stringify(feature))
       let content = document.createElement('div')
       this.resData = []
@@ -764,17 +713,12 @@ export default {
             var sjyd = res.sjytText
             var sjzytdmj = res.sjzytdmj
             var sjsyjzmj = res.sjsyjzmj
-            // <!--<div class="ant-tag" style="background-color: #feeeeb ;color: #d57a55;border:1px solid #d57a55 " >其中批准使用土地面积：</div><div class="ant-tag" style="background-color: #feeeeb ;color: #d57a55;border:1px solid #d57a55 " >其中批准使用建筑面积：</div>-->
             content.innerHTML =
               `<div><span style="font-weight: bold;">企业名称：</span> <span>${dwmc}<span/></div>
                              <div><span style="font-weight: bold;">地块名称：</span> <span>${dkmc}</span></div>
                              <div><span style="font-weight: bold;">实际用地：</span> <span>${sjyd}</span></div>
-                             <div class="ant-tag" style="background-color: #feeeeb;margin-top: 5px;color: #d57a55;border:1px solid #d57a55 " >实际占用土地面积：${
-                sjzytdmj || 0
-              }²</div>
-                              <div class="ant-tag" style="background-color: #feeeeb ;color: #d57a55;border:1px solid #d57a55 " >实际使用建筑面积：${
-                sjsyjzmj || 0
-              }²</div>`
+                             <div class="ant-tag" style="background-color: #feeeeb;margin-top: 5px;color: #d57a55;border:1px solid #d57a55 " >实际占用土地面积：${sjzytdmj || 0}²</div>
+                             <div class="ant-tag" style="background-color: #feeeeb ;color: #d57a55;border:1px solid #d57a55 " >实际使用建筑面积：${sjsyjzmj || 0}²</div>`
             return content
           } else {
             var dwmc = res.createBy
@@ -783,26 +727,20 @@ export default {
             var sjzytdmj = res.sjzytdmj
             var sjsyjzmj = res.sjsyjzmj
             let content = document.createElement('div')
-            // <!--<div class="ant-tag" style="background-color: #feeeeb ;color: #d57a55;border:1px solid #d57a55 " >其中批准使用土地面积：</div><div class="ant-tag" style="background-color: #feeeeb ;color: #d57a55;border:1px solid #d57a55 " >其中批准使用建筑面积：</div>-->
             content.innerHTML =
               `<div><span style="font-weight: bold;">企业名称：</span> <span>${dwmc}<span/></div>
                              <div><span style="font-weight: bold;">地块名称：</span> <span>${dkmc}</span></div>
                              <div><span style="font-weight: bold;">实际用地：</span> <span>${sjyd}</span></div>
-                             <div class="ant-tag" style="background-color: #feeeeb;margin-top: 5px;color: #d57a55;border:1px solid #d57a55 " >实际占用土地面积：${
-                sjzytdmj || 0
-              }²</div>
-                              <div class="ant-tag" style="background-color: #feeeeb ;color: #d57a55;border:1px solid #d57a55 " >实际使用建筑面积：${
-                sjsyjzmj || 0
-              }²</div>
-                               `
+                             <div class="ant-tag" style="background-color: #feeeeb;margin-top: 5px;color: #d57a55;border:1px solid #d57a55 " >实际占用土地面积：${sjzytdmj || 0}²</div>
+                             <div class="ant-tag" style="background-color: #feeeeb ;color: #d57a55;border:1px solid #d57a55 " >实际使用建筑面积：${sjsyjzmj || 0}²</div>`
             return content
           }
         })
       } else {
         return (content.innerHTML =
-            `  <div><span style="font-weight: bold;">企业名称：</span> <span>${feature.graphic.attributes.DWMC}<span/></div>
-                             <div><span style="font-weight: bold;">证书编号：</span> <span>${feature.graphic.attributes.ZSBH}</span></div>
-    <div class="ant-tag" style="background-color: #feeeeb;margin-top: 5px;color: #d57a55;border:1px solid #d57a55 " >地块信息未上报</div>`
+            `<div><span style="font-weight: bold;">企业名称：</span> <span>${feature.graphic.attributes.DWMC}<span/></div>
+             <div><span style="font-weight: bold;">证书编号：</span> <span>${feature.graphic.attributes.ZSBH}</span></div>
+             <div class="ant-tag" style="background-color: #feeeeb;margin-top: 5px;color: #d57a55;border:1px solid #d57a55 " >地块信息未上报</div>`
         )
         // this.$info({
         //   title: '说明',

src/components/OneMap/widgets/QueryInfo.vue

@@ -285,12 +285,13 @@ export default {
         if (StringImage.includes(',')) {
           img = StringImage.split(',')
           for (let i = 0; i < img.length; i++) {
-            result = '/tdzcxx/images/' + img[i]
+            result = '/images/' + img[i]
             //result="http://localhost:8080/jeecg-boot/sys/common/statics/"+img[i]
             this.images.push(result)
           }
         } else if (StringImage != null) {
-          result = '/tdzcxx/images/' + StringImage
+          // result = '/tdzcxx/images/' + StringImage
+          result = '/images/' + StringImage
           //result="http://localhost:8080/jeecg-boot/sys/common/statics/"+StringImage
           this.images.push(result)
         }
@@ -352,7 +353,6 @@ export default {
 }
 .descriptions-container {
   width: 100%;
-  max-width: 1600px; /* 或者根据需要设置一个合适的宽度 */
   margin: auto;
 }
 /* 增加 label 的宽度 */

src/components/jeecg/JUpload.vue

@@ -63,6 +63,7 @@
     name: 'JUpload',
     data(){
       return {
+        ///sys/common/upload 为上传接口地址
         uploadAction:window._CONFIG['domianURL']+"/sys/common/upload",
         headers:{},
         fileList: [],
@@ -332,6 +333,7 @@
             } else {
                 let filename=file.name.toLowerCase();
                 if(filename.endsWith('.pdf')){
+                    //pdf访问地址
                     let pdfUrl = window._CONFIG['domianURL'] + "/generic/web/viewer.html?file=" + encodeURIComponent(file.url);
                     window.open(pdfUrl,"_blank");
                 } else if(filename.endsWith('.jpeg')|| filename.endsWith('.jpg')|| filename.endsWith('.png')|| filename.endsWith('.bmp')){

src/config/index.js

@@ -1,13 +1,14 @@
 /** init domain config */
 import Vue from 'vue'
-//设置全局API_BASE_URL
+//设置全局API_BASE_URL VUE_APP_API_BASE_URL=/jeecg-boot
 Vue.prototype.API_BASE_URL = window._CONFIG.VUE_APP_API_BASE_URL?window._CONFIG.VUE_APP_API_BASE_URL:process.env.VUE_APP_API_BASE_URL
 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 + '/images'
-window._CONFIG['staticDomainURL'] = Vue.prototype.API_BASE_URL + '/sys/common/static'
+//window._CONFIG['staticDomainURL'] = Vue.prototype.API_BASE_URL + '/sys/common/static'
+window._CONFIG['staticDomainURL'] ='/images/upload'
 window._CONFIG['pdfDomainURL'] = Vue.prototype.API_BASE_URL+ '/sys/common/pdf/pdfPreviewIframe'
 
 window._CONFIG['domianURLs'] = "http://127.0.0.1:9001/jeecg-boot"

src/views/sydwqcsb/sydwxx/QcQyxxList2.vue

@@ -44,16 +44,11 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-
       <!--   <a-button v-if='!this.dataSource.length>0' @click="handleAdd" type="primary" icon="plus">补充用地单位信息</a-button>-->
-   <a-button type="primary" icon="download" @click="handleExportXls('事业单位占有使用土地情况调查')">导出</a-button> <!--
-||||||| .r1156
+   <a-button type="primary" icon="download" @click="handleExportXls('事业单位占有使用土地情况调查')">导出</a-button>
+      <!--
       <a-button v-if='!this.dataSource.length>0' @click="handleAdd" type="primary" icon="plus">补充用地单位信息</a-button>
-     <!-- <a-button type="primary" icon="download" @click="handleExportXls('用地单位信息')">导出</a-button>
-=======
-    <!--  <a-button v-if='!this.dataSource.length>0' @click="handleAdd" type="primary" icon="plus">补充用地单位信息</a-button>-->
-     <!-- <a-button type="primary" icon="download" @click="handleExportXls('用地单位信息')">导出</a-button>
->>>>>>> .r1159
+     <a-button type="primary" icon="download" @click="handleExportXls('用地单位信息')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
@@ -140,7 +135,6 @@
 
       </a-table>
     </div>
-
     <qc-qyxx-modal ref="modalForm" @ok="modalFormOk"></qc-qyxx-modal>
   </a-card>
 </template>