Compare commits

..

No commits in common. "efa6fcf288b1f6f17a93f6f87c4eb399def51c2a" and "95283058d60d3206a5b01ddbd88750aac24ebf39" have entirely different histories.

9 changed files with 24 additions and 73 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

View File

@ -169,14 +169,14 @@ const handleStartDispatch = () => {
.force-dispatch__level-label { .force-dispatch__level-label {
font-size: fs(18); font-size: fs(18);
font-family: SourceHanSansCN-Regular, sans-serif; font-family: SourceHanSansCN-Regular, sans-serif;
color: var(--text-white); color: rgba(255, 255, 255, 0.8);
} }
.force-dispatch__level-value { .force-dispatch__level-value {
font-size: fs(18); font-size: fs(18);
font-family: SourceHanSansCN-Bold, sans-serif; font-family: SourceHanSansCN-Bold, sans-serif;
font-weight: 600; font-weight: 600;
color: var(--text-white); color: rgba(255, 255, 255, 0.95);
} }
/* 智能应急方案按钮 */ /* 智能应急方案按钮 */
@ -210,7 +210,7 @@ const handleStartDispatch = () => {
font-size: fs(18); font-size: fs(18);
font-family: SourceHanSansCN-Medium, sans-serif; font-family: SourceHanSansCN-Medium, sans-serif;
font-weight: 500; font-weight: 500;
color: var(--text-white); color: rgba(255, 255, 255, 0.95);
} }
.force-dispatch__plan-icon { .force-dispatch__plan-icon {
@ -254,7 +254,7 @@ const handleStartDispatch = () => {
.force-dispatch__stat-label { .force-dispatch__stat-label {
font-size: fs(12); font-size: fs(12);
font-family: SourceHanSansCN-Regular, sans-serif; font-family: SourceHanSansCN-Regular, sans-serif;
color: var(--text-white); color: rgba(255, 255, 255, 0.7);
} }
.force-dispatch__stat-value { .force-dispatch__stat-value {
@ -272,7 +272,7 @@ const handleStartDispatch = () => {
font-size: fs(12); font-size: fs(12);
font-family: SourceHanSansCN-Regular, sans-serif; font-family: SourceHanSansCN-Regular, sans-serif;
font-weight: 400; font-weight: 400;
color: var(--text-white); color: rgba(255, 255, 255, 0.8);
margin-left: vw(2); margin-left: vw(2);
} }
@ -349,14 +349,14 @@ const handleStartDispatch = () => {
font-size: fs(14); font-size: fs(14);
font-family: SourceHanSansCN-Medium, sans-serif; font-family: SourceHanSansCN-Medium, sans-serif;
font-weight: 500; font-weight: 500;
color: var(--text-white); color: rgba(255, 255, 255, 0.9);
} }
.force-dispatch__circle-line2 { .force-dispatch__circle-line2 {
font-size: fs(13); font-size: fs(13);
font-family: SourceHanSansCN-Regular, sans-serif; font-family: SourceHanSansCN-Regular, sans-serif;
font-weight: 400; font-weight: 400;
color: var(--text-white); color: rgba(255, 255, 255, 0.8);
} }
/* 旋转动画 */ /* 旋转动画 */
@ -391,13 +391,13 @@ const handleStartDispatch = () => {
.force-dispatch__eta-label { .force-dispatch__eta-label {
font-size: fs(11); font-size: fs(11);
font-family: SourceHanSansCN-Regular, sans-serif; font-family: SourceHanSansCN-Regular, sans-serif;
color: var(--text-white); color: rgba(255, 255, 255, 0.6);
} }
.force-dispatch__eta-value { .force-dispatch__eta-value {
font-size: fs(13); font-size: fs(13);
font-family: SourceHanSansCN-Bold, sans-serif; font-family: SourceHanSansCN-Bold, sans-serif;
font-weight: 600; font-weight: 600;
color: var(--text-white); color: rgba(255, 255, 255, 0.95);
} }
</style> </style>

View File

@ -106,7 +106,7 @@ const handleBack = () => {
.logo-section { .logo-section {
.logo-image { .logo-image {
width: vw(42); width: vw(42);
height: vw(42); height: vh(30);
border-radius: 50%; border-radius: 50%;
} }
} }

View File

@ -1,17 +1,16 @@
<template> <template>
<div class="collaboration-info" :class="{ 'is-collapsed': isCollapsed }"> <div class="collaboration-info">
<div class="collaboration-info__header"> <div class="collaboration-info__header">
<img <img
src="../../assets/images/SketchPng5d7d0c9a19ebbe31859bb19ed24fd41e757f04c7980ce640abb9c2c693b54728.png" src="../../assets/images/SketchPng5d7d0c9a19ebbe31859bb19ed24fd41e757f04c7980ce640abb9c2c693b54728.png"
alt="info" alt="info"
class="header-icon" class="header-icon"
@click="toggleCollapse"
/> />
</div> </div>
<div class="collaboration-info__list"> <div class="collaboration-info__list">
<div <div
v-for="(info, index) in displayedInfo" v-for="info in collaborationInfo"
:key="info.id" :key="info.id"
class="info-item" class="info-item"
> >
@ -26,28 +25,10 @@
</template> </template>
<script setup> <script setup>
import { inject, ref, computed } from 'vue' import { inject } from 'vue'
const { collaborationInfo } = inject('disasterData') const { collaborationInfo } = inject('disasterData')
//
const isCollapsed = ref(false)
//
const toggleCollapse = () => {
isCollapsed.value = !isCollapsed.value
}
//
const displayedInfo = computed(() => {
if (isCollapsed.value && collaborationInfo.value.length > 0) {
//
return [collaborationInfo.value[0]]
}
//
return collaborationInfo.value
})
// //
const getSourceColor = (source) => { const getSourceColor = (source) => {
const colorMap = { const colorMap = {
@ -61,7 +42,7 @@ const getSourceColor = (source) => {
'宣传部门': '#00D68F' // 绿 '宣传部门': '#00D68F' // 绿
} }
return colorMap[source] || '#4A9EFF' // return colorMap[source] || '#4A9EFF' // <EFBFBD><EFBFBD><EFBFBD>
} }
</script> </script>
@ -78,19 +59,13 @@ const getSourceColor = (source) => {
&__header { &__header {
position: absolute; position: absolute;
top: 10px; top: vh(16);
right: vw(5); right: vw(5);
z-index: 1; z-index: 1;
.header-icon { .header-icon {
width: vw(20); width: vw(20);
height: vh(20); height: vh(20);
cursor: pointer;
transition: all 0.3s ease;
&:hover {
opacity: 0.8;
}
} }
} }
@ -101,8 +76,6 @@ const getSourceColor = (source) => {
padding: vw(8) vw(16); padding: vw(8) vw(16);
max-height: vh(200); max-height: vh(200);
overflow-y: auto; overflow-y: auto;
transition: max-height 0.4s cubic-bezier(0.4, 0, 0.2, 1), opacity 0.3s ease;
opacity: 1;
&::-webkit-scrollbar { &::-webkit-scrollbar {
width: vw(4); width: vw(4);
@ -141,27 +114,5 @@ const getSourceColor = (source) => {
} }
} }
} }
//
&.is-collapsed {
.header-icon {
transform: rotate(180deg);
}
.collaboration-info__list {
max-height: vh(30); //
overflow: hidden;
.info-item:not(:first-child) {
opacity: 0;
transform: translateY(-10px);
}
}
}
//
.info-item {
transition: opacity 0.3s ease, transform 0.3s ease;
}
} }
</style> </style>

View File

@ -30,18 +30,18 @@ export function use3DTiles() {
const tileset = await Cesium.Cesium3DTileset.fromUrl(url, { const tileset = await Cesium.Cesium3DTileset.fromUrl(url, {
skipLevelOfDetail: true, skipLevelOfDetail: true,
baseScreenSpaceError: 1024, baseScreenSpaceError: 100,
skipScreenSpaceErrorFactor: 16, skipScreenSpaceErrorFactor: 16,
skipLevels: 1, skipLevels: 1,
immediatelyLoadDesiredLevelOfDetail: false, immediatelyLoadDesiredLevelOfDetail: false,
loadSiblings: false, loadSiblings: false,
maximumScreenSpaceError: 2.0, // 降低到2.0以提高模型精细度原来是16.0 maximumScreenSpaceError: 16.0, // 进一步增大最大限度减少瓦片细化之前是8.0
dynamicScreenSpaceError: true, // 启用动态屏幕空间误差调整 dynamicScreenSpaceError: false, // 禁用动态屏幕空间误差调整
dynamicScreenSpaceErrorDensity: 0.00278, // 启用密度调整 dynamicScreenSpaceErrorDensity: 0, // 禁用密度调整
dynamicScreenSpaceErrorFactor: 4.0, // 动态因子 dynamicScreenSpaceErrorFactor: 1, // 禁用动态因子
foveatedScreenSpaceError: true, // 启用视锥细化 foveatedScreenSpaceError: false, // 禁用视锥细化
foveatedConeSize: 0.1, // 视锥大小 foveatedConeSize: 0.1, // 减小视锥大小
foveatedMinimumScreenSpaceErrorRelaxation: 0.0 // 最小放松 foveatedMinimumScreenSpaceErrorRelaxation: 0 // 禁用放松
}) })
// 将tileset添加到viewer的primitives // 将tileset添加到viewer的primitives

View File

@ -132,7 +132,7 @@
<!-- 加载动画层 - 一键启动后显示 --> <!-- 加载动画层 - 一键启动后显示 -->
<div v-if="showLoading" class="situational-awareness__loading-layer"> <div v-if="showLoading" class="situational-awareness__loading-layer">
<img <img
src="./assets/images/加载.gif" src="./assets/images/加载gif.gif"
alt="加载中" alt="加载中"
class="situational-awareness__loading-gif" class="situational-awareness__loading-gif"
/> />