From f55ea1cfc0b5f60b01552e8b96f95e8a33c45bb8 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 15 Nov 2024 09:12:53 +0800
Subject: [PATCH] Merge branch 'main' of http://139.196.74.78:10010/r/zhyq/bigScreen

---
 src/pages/layout/components/scomponents/layersControl.vue |   37 ++++++++++++++++++++++++++++---------
 1 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/pages/layout/components/scomponents/layersControl.vue b/src/pages/layout/components/scomponents/layersControl.vue
index 96eea44..92c4fc5 100644
--- a/src/pages/layout/components/scomponents/layersControl.vue
+++ b/src/pages/layout/components/scomponents/layersControl.vue
@@ -2,26 +2,27 @@
  * @Author: shuishen 1109946754@qq.com
  * @Date: 2024-10-31 10:47:29
  * @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-11-12 13:29:29
+ * @LastEditTime: 2024-11-14 18:32:01
  * @FilePath: \bigScreen\src\pages\layout\components\scomponents\layersControl.vue
  * @Description:
  *
  * Copyright (c) 2024 by shuishen, All Rights Reserved.
 -->
 <template>
-  <public-box>
+  <public-box v-show="showLayerControl">
     <template #name>
       <div class="name"><i class="fa fa-tasks"></i>&nbsp;图层</div>
     </template>
 
     <template #close>
-      <div class="close" @click="$emit('close', 'layers')"><i class="fa fa-close"></i></div>
+      <div class="close cursor-p" @click="$emit('close', 'layers')"><i class="fa fa-close"></i></div>
     </template>
 
     <template #content>
       <div class="tree-content">
         <el-tree ref="treeRef" :data="data" draggable="" show-checkbox node-key="id" default-expand-all
-          :default-checked-keys="['1']" :props="defaultProps" :indent="treeProps['indent']" @check="handleCheckChange">
+          :default-checked-keys="indexPoint" :props="defaultProps" :indent="treeProps['indent']"
+          @check="handleCheckChange">
           <template v-slot:default="{ node }">
             <element-tree-line :node="node" :showLabelLine="treeProps['showLabelLine']" :indent="treeProps['indent']">
               <!-- 自定义label的slot -->
@@ -49,6 +50,13 @@
 </template>
 
 <script setup>
+const {
+  show: showLayerControl
+} = defineProps({
+  show: {
+    default: false
+  }
+})
 import panorama from './popup/panorama.vue'
 import { getPage } from '@/api/indParkInfo'
 import { getList } from "@/api/space/space"
@@ -61,8 +69,12 @@
 import ysgw from "@/assets/json/ysgw"
 import { onUnmounted } from 'vue'
 import EventBus from 'utils/bus'
+import { usePointStore } from 'store/usepoint'
+const pointStore = usePointStore()
 
 const { VITE_APP_BASE } = import.meta.env
+
+let indexPoint = ref(['1'])
 
 const treeRef = ref(null)
 const Cesium = DC.getLib('Cesium')
@@ -108,6 +120,7 @@
       size: 1000
     },
     backgroundIcon: VITE_APP_BASE + 'img/mapicon/qy.png',
+    className: 'qyfb-box',
     showPanel: false,
     layerName: 'qyfb'
   },
@@ -218,6 +231,7 @@
       size: 1000
     },
     showParams: 'category',
+    className: 'fxy-box',
     backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy.png',
     showPanel: false,
     layerName: 'fxy'
@@ -302,7 +316,7 @@
       ) {
         attrParams.url = attrParams.url.replace(
           "http://vr.jxpskj.com:180",
-          "/panorama/url"
+          "/panorama"
         )
       }
 
@@ -377,7 +391,6 @@
         } else {
           addTileLayers[item.layerName].forEach(i => i.show = true)
         }
-
         window.$viewer.flyTo(addTileLayers[item.layerName][0])
       } else if (item.subType == 'labelPoint') {
         if (!addTileLayers[item.layerName]) {
@@ -407,7 +420,7 @@
 
               let divIcon = new DC.DivIcon(
                 new DC.Position(i.lng, i.lat, 0),
-                `<div class="public-map-popup">
+                `<div class="public-map-popup ${item.className || ''}">
                     ${iconEl}
                   </div>`
               )
@@ -454,7 +467,7 @@
 
           function computeCircle (radius) {
             var positions = []
-            for (var i = 0; i < 1080; i++) {
+            for (var i = 0; i < 360; i++) {
               var radians = DC.Math.toRadians(i)
               positions.push({
                 x: radius * Math.cos(radians),
@@ -544,9 +557,15 @@
 EventBus.on('restHandleDelChange', restHandleDelChange)
 
 onMounted(() => {
-  handleCheckChange(data.filter(i => i.id == '1'))
+  handleCheckChange(data.filter(i => indexPoint.value.includes(i.id)))
 })
 
+// const sharedData = computed(() => pointStore.sharedData);
+// watch(sharedData, (newValue) => {
+// });
+
+
+
 onUnmounted(() => {
   tileLayers && window.$viewer.removeLayer(tileLayers)
   let arr = Object.keys(addTileLayers)

--
Gitblit v1.9.3