Merge branch 'master' of http://47.101.207.123:3000/sharedExchange/sjfxfn

src/units/map/AddLayer.js

@@ -659,6 +659,14 @@ export function setMapCircleWatch(isShow) {
  })
 }
 
+
+//环视-内圈
+export function setMapCircleWatchInner(isShow) {
+ invokeParams('ChangeViewFlightCircle',{
+  "status": isShow?"show":'hide'
+ })
+}
+
 //水波特效
 export function setMapWaterEffect(isShow) {
  invokeParams('ChangeWaterEffect',{

src/view/show-platform/ShowPlatform.vue

@@ -12,7 +12,7 @@
     <address-search v-if="toolType=='addressSearch'" />
     <space-statistics v-if="toolType=='spaceStatistics'" @setToolType ="setToolType"  @setToolDetailType="setToolDetailType" @setLoading = "setLoading"  />
     <space-statistics-result v-if="toolDetailType=='spaceStatisticsResult'" @setToolDetailType="setToolDetailType" @setLoading = "setLoading"  />
-
+    <round-view v-if="toolType=='roundView'"  />
 
     <buffer-analysis v-if="toolType=='bufferAnalysis'" @setToolType ="setToolType" @setToolDetailType="setToolDetailType" @setLoading = "setLoading" />
     <fly-way v-if="toolType=='flyWay'" @setToolDetailType="setToolDetailType" />
@@ -70,6 +70,7 @@ import GreenbeltAnalysisDynamicResult from "@/view/show-platform/common/tool-com
 import CoordinateTransform from "@/view/show-platform/common/tool-component/coordinateTransform/CoordinateTransform";
 import CoordinateTransformResult from "@/view/show-platform/common/tool-component/coordinateTransform/CoordinateTransformResult";
 import SpaceStatisticsResult from "@/view/show-platform/common/tool-component/space-statistics/SpaceStatisticsResult";
+import RoundView from "@/view/show-platform/common/tool-component/roundView/RoundView";
 import {
   addBufferLayer,
   calculation3D,
@@ -86,7 +87,7 @@ export default {
     SingleLayerDetailModel,FlyWay,FlyItem,Bookmark,MoreScreen,SingleScreenSelect,
     PerspectiveAnalysis,PerspectiveArea,SpaceStatistics,GreenbeltAnalysis,CompositionAnalysis,
     CompositionResult,BufferAnalysis,ComposiAna,BaseMapChange,BufferAnalysisResult,Greenbelt,GreenbeltAnalysisDynamic,
-    GreenbeltAnalysisDynamicResult,CoordinateTransform,CoordinateTransformResult,SpaceStatisticsResult},
+    GreenbeltAnalysisDynamicResult,CoordinateTransform,CoordinateTransformResult,SpaceStatisticsResult,RoundView},
   data(){
     return{
       loading: false,

src/view/show-platform/common/MapUse.vue

@@ -31,8 +31,8 @@ export default {
       // url:'http://192.168.100.229/mapvue/#/mapvpn',
       // url:'http://192.168.100.141/mapvue/#/mapvpn',
       // url: 'https://192.168.10.92/mapvue/#/mapvpn?theme=light',
-       url: 'http://10.81.66.1:8080/mapvue/?theme=light', //建科发布
-      // url: 'http://localhost:8081/mapvue#/mapjk',
+      // url: 'http://10.81.66.1:8080/mapvue/?theme=light', //建科发布
+       url: 'http://localhost:8081/mapvue#/mapjk',
       // url:'http://geodatasvr.cn.smism.com//mapvue-t/#/maptest?theme=light', //ces版
       //   url:'http://geodatasvr.cn.smism.com//mapvue-t/#/mapnew?theme=light', //正式版,
       // url: "https://geoscene.geosceneonline.cn/mapvue/#/mapnew?theme=light",

src/view/show-platform/common/MyHeader.vue

@@ -2,7 +2,7 @@
   <div id="my-header">
 
     <div class="title_left">
-      <span>数据分析赋能系统</span>
+      <span @click="clickFn('showPlatform')" style="cursor: pointer">数据分析赋能系统</span>
     </div>
     <div class="title_right">
       <ul class="navbar-nav">

src/view/show-platform/common/RightTool.vue

@@ -168,13 +168,13 @@ export default {
                 setMapSumAna(false)
               }
               break;
-            case 'roundView':
-              if(this.toolList[i].chosen){
-                setMapCircleWatch(true)
-              }else{
-                setMapCircleWatch(false)
-              }
-              break;
+            // case 'roundView':
+            //   if(this.toolList[i].chosen){
+            //     setMapCircleWatch(true)
+            //   }else{
+            //     setMapCircleWatch(false)
+            //   }
+            //   break;
             case 'slice':
               if(this.toolList[i].chosen){
                 changeShowSlice("open")

src/view/show-platform/common/tool-component/roundView/RoundView.vue

@@ -0,0 +1,99 @@
+<template>
+  <div id="round-view">
+    <ul class="screen-list">
+      <li v-for="item in roundViewList" :key="item.id" :title="item.name" @click="selectTool(item)">
+        <img :src="imgSrc(item)" class="screen-img" />
+      </li>
+    </ul>
+  </div>
+</template>
+
+<script>
+import {setMapCircleWatchInner, setMapCircleWatch} from "@/units/map/AddLayer";
+
+export default {
+  name: "RoundView",
+  data(){
+    return{
+      roundViewList:[
+        {
+          id:'0001',
+          name:'外圈环视',
+          chosen:false,
+        },
+        {
+          id:'0002',
+          name:'内圈环视',
+          chosen:false,
+        },
+      ],
+    }
+  },
+  methods:{
+    imgSrc(item){
+      if(item.chosen){
+        return require('../../../../../assets/imgs/mainPage/可视域-选中.png')
+      }else{
+        return require('../../../../../assets/imgs/mainPage/可视域-未选中.png')
+      }
+    },
+    selectTool(item){
+      setMapCircleWatch(false);
+      for(let i=0;i<this.roundViewList.length;i++){
+        if(item.name ==this.roundViewList[i].name) {
+          this.roundViewList[i].chosen = !this.roundViewList[i].chosen;
+          if(this.roundViewList[i].chosen){
+            switch (this.roundViewList[i].name){
+              case "外圈环视":
+                setMapCircleWatch(true)
+                break;
+              case "内圈环视":
+                setMapCircleWatchInner(true)
+                break;
+            }
+          }else{
+            switch (this.roundViewList[i].name){
+              case "外圈环视":
+                setMapCircleWatch(false)
+                break;
+              case "内圈环视":
+                setMapCircleWatchInner(false)
+                break;
+            }
+          }
+        }
+        else{
+          this.roundViewList[i].chosen = false
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+#round-view{
+  position: absolute;
+  right:70px;
+  top:650px;
+  z-index: 1;
+  text-align: center;
+  background: rgba(0, 31, 112, 0.6);
+  border-radius: 4px;
+  border: 1px solid #00a1ff;
+  color: #fff;
+  .screen-list{
+    padding: 10px 0px 10px 0px;
+    margin: 0;
+  }
+  .screen-list li{
+    list-style: none;
+    cursor: pointer;
+    padding: 2px 0px 2px 0px;
+  }
+  .screen-img{
+    width: 35px;
+    height: 35px;
+  }
+}
+</style>

src/view/show-platform/common/tool-component/single-layer-detail/SingleLayerDetailModel.vue

@@ -454,9 +454,10 @@
     }
   },
   mounted() {
-    this.selectDirectiorById("D04010101201506");
-    this.selectMetadataId("D04010101201506");
-    this.selectServiceDetail("D04010101201506");
+    debugger
+    this.selectDirectiorById(this.layerCode);
+    this.selectMetadataId(this.layerCode);
+    this.selectServiceDetail(this.layerCode);
   },
   methods:{
     changeActiveId(id){
@@ -606,7 +607,14 @@
       });
 
     }
-  }
+  },
+    watch:{
+      dialogVisible(){
+        this.selectDirectiorById(this.layerCode);
+        this.selectMetadataId(this.layerCode);
+        this.selectServiceDetail(this.layerCode);
+      }
+    }
 
 }
 </script>