Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/views/farmlandProtection/components/fxjg.vue

@@ -117,7 +117,6 @@ export default {
 
   methods: {
     download() {
-      console.log(this.resultData.xmxx,'this.$props.fxjgObj');
       window.open(
         window.axiosURI +
           "/analyse/fzss/DownloadReport?filePath=" +
@@ -152,12 +151,10 @@ export default {
           this.$nextTick(() => {
             this.$refs.echartRef.setOptions({ data, type }, 1);
           });
-
-          // this.$refs.echartRef.res
           this.resultData = res.data;
-
-          // this.drawWktPloygon(res.data.xmxx.geom, "#ff0000", "all"); //res.data.bsm
-          this.loadGeoJSON(parse(res.data.xmxx.geom), "#ff0000", "all");
+          if (res.data.xmxx.geom) {
+            this.loadGeoJSON(parse(res.data.xmxx.geom), "#ff0000", "all");
+          }
         } else {
           this.$message.error(res.message);
         }
@@ -172,8 +169,7 @@ export default {
             this.loadGeoJSON(parse(res.geom), res.itemStyle.color, "all");
           }
         }
-
-      })
+      });
     },
     drawWktPloygon(item, itemColor, id) {
       // console.log(geometry, "geometry");
@@ -190,7 +186,7 @@ export default {
     },
     // 加载GeoJSON数据
     loadGeoJSON(geojson, yanse, id, height, name) {
-      viewer.dataSources.removeAll()
+      viewer.dataSources.removeAll();
       let _this = this;
       let fcolor =
         id && id != "all"
@@ -247,11 +243,11 @@ export default {
   overflow-x: hidden;
   padding-right: 10px;
   line-height: 40px;
-.echartCon{
-  height: 350px;
-  overflow: hidden;
-  overflow-y: auto;
-}
+  .echartCon {
+    height: 350px;
+    overflow: hidden;
+    overflow-y: auto;
+  }
   .echart {
     // width: 19rem;
     // height: 350px;

src/views/farmlandProtection/components/interDetails.vue

@@ -98,7 +98,6 @@
               </div>
             </div>
           </el-tab-pane>
-          <!-- -->
           <el-tab-pane label="基本信息" name="jbxx">
             <div class="inter_result" v-if="activeTabs == 'jbxx'">
               <el-table
@@ -126,11 +125,11 @@
                 >
                 </el-table-column>
               </el-table>
-              <el-carousel indicator-position="outside">
+              <!-- <el-carousel indicator-position="outside">
                 <el-carousel-item v-for="item in 4" :key="item">
                   <h3>{{ item }}</h3>
                 </el-carousel-item>
-              </el-carousel>
+              </el-carousel> -->
             </div>
           </el-tab-pane>
         </el-tabs>

src/views/farmlandProtection/index.vue

@@ -20,7 +20,8 @@
         </el-tab-pane>
       </el-tabs>
     </div>
-    <RzDtails :rzBsm="rzBsm" :rzMc="nowObj.xmmc" @updateParent="changeData"></RzDtails>
+    <RzDtails :rzBsm="rzBsm" @updateParent="changeData" :interObj="interObj" v-if="showInter"></RzDtails>
+
   </div>
 </template>
 
@@ -28,7 +29,7 @@
 import FZJCYP from "./components/fzjcyp.vue";
 import FXJG from "./components/fxjg.vue";
 import Lsjl from "../complianceAnalysis/components/lsjl.vue";
-import RzDtails from "../complianceAnalysis/components/rzDtails.vue";
+import RzDtails from "./components/interDetails.vue";
 export default {
   name: "farmlandProtection",
   components: {
@@ -72,7 +73,7 @@ export default {
         this.$nextTick(() => {
           this.$refs.fxjg.initData();
         });
-      } else {
+      }else{
         this.showInter = false
       }
     },