From d6f3654e03571698a10b0dfbfd5202232996219f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 26 Nov 2024 01:18:16 +0800
Subject: [PATCH] Merge branch 'main' of http://139.196.74.78:10010/r/zhyq/bigScreen
---
src/pages/layout/components/scomponents/layersControl.vue | 40 +++++++++
src/views/survey/components/box/fireTrend.vue | 18 ----
src/pages/layout/components/scomponents/tool/measure.vue | 55 ++++++-------
src/pages/layout/components/scomponents/toolList.vue | 74 +++++++++---------
4 files changed, 99 insertions(+), 88 deletions(-)
diff --git a/src/pages/layout/components/scomponents/layersControl.vue b/src/pages/layout/components/scomponents/layersControl.vue
index 56741ec..50b9712 100644
--- a/src/pages/layout/components/scomponents/layersControl.vue
+++ b/src/pages/layout/components/scomponents/layersControl.vue
@@ -71,6 +71,8 @@
import { onUnmounted } from 'vue'
import EventBus from 'utils/bus'
import { usePointStore } from 'store/usepoint'
+import { useRouter } from 'vue-router';
+const router = useRouter();
const pointStore = usePointStore()
const { VITE_APP_BASE } = import.meta.env
@@ -781,7 +783,7 @@
addTileLayers[item.layerName] = new DC.VectorLayer(item.layerName)
window.$viewer.addLayer(addTileLayers[item.layerName])
- function computeCircle (radius) {
+ function computeCircle(radius) {
var positions = []
for (var i = 0; i < 360; i++) {
var radians = DC.Math.toRadians(i)
@@ -853,7 +855,7 @@
})
}
-function findObjectById (data, id) {
+function findObjectById(data, id) {
// 遍历数据数组
for (let i = 0; i < data.length; i++) {
const item = data[i]
@@ -923,12 +925,44 @@
}, 3000)
})
+
+// 关闭所有选中的,除了倾斜，园区分布，空中全景
+const closeAll = () => {
+ EventBus.emit('restHandleDelChange', `2`)
+ EventBus.emit('restHandleDelChange', `3`)
+ EventBus.emit('restHandleDelChange', `3-1`)
+ EventBus.emit('restHandleDelChange', `3-2`)
+ EventBus.emit('restHandleDelChange', `3-3`)
+ EventBus.emit('restHandleDelChange', `3-3-1`)
+ EventBus.emit('restHandleDelChange', `3-3-2`)
+ EventBus.emit('restHandleDelChange', `3-3-3`)
+ EventBus.emit('restHandleDelChange', `3-3-4`)
+ EventBus.emit('restHandleDelChange', `3-4`)
+ EventBus.emit('restHandleDelChange', `3-5`)
+ EventBus.emit('restHandleDelChange', `3-6`)
+ EventBus.emit('restHandleDelChange', `3-7`)
+ EventBus.emit('restHandleDelChange', `3-8`)
+ EventBus.emit('restHandleDelChange', `3-9`)
+ EventBus.emit('restHandleDelChange', `4`)
+ EventBus.emit('restHandleDelChange', `4-1`)
+ EventBus.emit('restHandleDelChange', `4-2`)
+ EventBus.emit('restHandleDelChange', `8`)
+}
+
// const sharedData = computed(() => pointStore.sharedData);
// watch(sharedData, (newValue) => {
// });
+// 监听当前路由路径的变化
+watch(() => router.currentRoute.value.path,
+ (newPath, oldPath) => {
+ console.log(`Current path changed from ${oldPath} to ${newPath}`);
+ closeAll()
+ },
+ { immediate: true }
+)
// 销毁
-function destroy () {
+function destroy() {
let arr = Object.keys(addPupoLayers)
arr.filter(i => i != 'hgyq').forEach(i => {
addPupoLayers[i] && window.$viewer.removeLayer(addPupoLayers[i])
diff --git a/src/pages/layout/components/scomponents/tool/measure.vue b/src/pages/layout/components/scomponents/tool/measure.vue
index 238d11e..85acf55 100644
--- a/src/pages/layout/components/scomponents/tool/measure.vue
+++ b/src/pages/layout/components/scomponents/tool/measure.vue
@@ -55,16 +55,16 @@
function calcDistance() {
measure.distance()
}
-// 地面距离
+// 贴地距离
function distanceSurface() {
measure.distanceSurface()
}
-// 平面面积
+// 水平面积
function calcArea(item) {
console.log('calcArea********************************', item)
measure.area()
}
-// 地面面积
+// 贴地面积
function areaSurface() {
measure.areaSurface()
}
@@ -82,7 +82,7 @@
function calcHeight() {
measure.height()
}
-// 模型高度
+// 贴物高度
function calcModelHeight() {
measure.height({
clampToModel: true
@@ -127,11 +127,11 @@
imges: '../../../../../assets/images/add.png',
click: distanceSurface
},
- {
- label: '剖面',
- value: 'volume',
- imges: '../../../../../assets/images/add.png'
- },
+ // {
+ // label: '剖面',
+ // value: 'volume',
+ // imges: '../../../../../assets/images/add.png'
+ // },
{
label: '水平面积',
value: 'volume',
@@ -163,9 +163,10 @@
click: calcModelTriangleHeight
},
{
- label: '坐标测量',
+ label: '贴物高度',
value: 'volume',
- imges: '../../../../../assets/images/add.png'
+ imges: '../../../../../assets/images/add.png',
+ click: calcModelHeight
},
]
@@ -179,9 +180,7 @@
width: 230px;
display: flex;
flex-wrap: wrap;
- justify-content: center;
font-size: 12px;
- /* 水平居中 */
}
.icon_img {
@@ -190,18 +189,10 @@
}
.item {
- flex: 1 0 33.33%;
- /* 每个项占 1/3 的宽度 */
- display: flex;
- flex-direction: column;
- align-items: center;
- /* 水平居中 */
- justify-content: center;
- /* 垂直居中 */
- box-sizing: border-box;
- /* 确保 padding 和 border 不影响宽度 */
- padding: 10px;
- /* 可选：增加内边距 */
+ width: 60px;
+ margin: 8px;
+ text-align: center;
+ padding: 3px;
}
.button-clear {
@@ -211,17 +202,21 @@
}
.button-clear button {
- background-color: rgb(25, 0, 255);
- padding: 10px;
+ padding: 6px;
border: none;
+}
+
+.button-clear button:hover {
+ background-color: blue;
color: #fff;
}
-.container-box .text:hover {
- color: blue;
+.container-box .item:hover {
+ box-shadow: inset 0px 0px 30px 20px rgba(31, 139, 247, 0.949);
+ border-radius: 20%;
}
.text {
- color: pink;
+ // color: pink;
}
</style>
\ No newline at end of file
diff --git a/src/pages/layout/components/scomponents/toolList.vue b/src/pages/layout/components/scomponents/toolList.vue
index 309c0b0..21ed06a 100644
--- a/src/pages/layout/components/scomponents/toolList.vue
+++ b/src/pages/layout/components/scomponents/toolList.vue
@@ -40,55 +40,55 @@
title: '图上量算',
component: measure,
},
- {
- icon: 'fa fa-bar-chart',
- title: '空间分析',
- },
+ // {
+ // icon: 'fa fa-bar-chart',
+ // title: '空间分析',
+ // },
{
name: 'location',
icon: 'fa fa-map-pin',
title: '坐标定位',
component: location
},
- {
- icon: 'fa fa-paper-plane',
- title: '地区导航',
- },
- {
- icon: 'fa fa-edit',
- title: '我的标记',
- },
- {
- icon: 'fa fa-tags',
- title: '视角书签',
- },
+ // {
+ // icon: 'fa fa-paper-plane',
+ // title: '地区导航',
+ // },
+ // {
+ // icon: 'fa fa-edit',
+ // title: '我的标记',
+ // },
+ // {
+ // icon: 'fa fa-tags',
+ // title: '视角书签',
+ // },
{
name: 'exportScene',
icon: 'fa fa-download',
title: '场景导出',
component: exportScene
},
- {
- icon: 'fa fa-object-group',
- title: '图上标绘',
- },
- {
- icon: 'fa fa-helicopter',
- title: '飞行漫游',
- },
- {
- icon: 'fa fa-level-up',
- title: '路线导航',
- },
- {
- icon: 'fa fa-columns',
- title: '卷帘对比',
- component: curtain
- },
- {
- icon: 'fa fa-window-restore',
- title: '分屏对比',
- },
+ // {
+ // icon: 'fa fa-object-group',
+ // title: '图上标绘',
+ // },
+ // {
+ // icon: 'fa fa-helicopter',
+ // title: '飞行漫游',
+ // },
+ // {
+ // icon: 'fa fa-level-up',
+ // title: '路线导航',
+ // },
+ // {
+ // icon: 'fa fa-columns',
+ // title: '卷帘对比',
+ // component: curtain
+ // },
+ // {
+ // icon: 'fa fa-window-restore',
+ // title: '分屏对比',
+ // },
]
const showComponent = (component) => {
diff --git a/src/views/survey/components/box/fireTrend.vue b/src/views/survey/components/box/fireTrend.vue
index 8608b09..5d9c0fe 100644
--- a/src/views/survey/components/box/fireTrend.vue
+++ b/src/views/survey/components/box/fireTrend.vue
@@ -48,24 +48,6 @@
const goSubLayout = (item) => {
localStorage.setItem('companyInfo', JSON.stringify(item))
store.setLoadSub(true)
- EventBus.emit('restHandleDelChange', `2`)
- EventBus.emit('restHandleDelChange', `3`)
- EventBus.emit('restHandleDelChange', `3-1`)
- EventBus.emit('restHandleDelChange', `3-2`)
- EventBus.emit('restHandleDelChange', `3-3`)
- EventBus.emit('restHandleDelChange', `3-3-1`)
- EventBus.emit('restHandleDelChange', `3-3-2`)
- EventBus.emit('restHandleDelChange', `3-3-3`)
- EventBus.emit('restHandleDelChange', `3-3-4`)
- EventBus.emit('restHandleDelChange', `3-4`)
- EventBus.emit('restHandleDelChange', `3-5`)
- EventBus.emit('restHandleDelChange', `3-6`)
- EventBus.emit('restHandleDelChange', `3-7`)
- EventBus.emit('restHandleDelChange', `4`)
- EventBus.emit('restHandleDelChange', `4-1`)
- EventBus.emit('restHandleDelChange', `4-2`)
- EventBus.emit('restHandleDelChange', `8`)
-
router.push({
path: '/layout/sub/companyInfo'
})
--
Gitblit v1.9.3