From 46be41e8cb2a03f9859ea32d39f984d56afeb953 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Thu, 04 Sep 2025 16:19:36 +0800
Subject: [PATCH] Merge branch 'feature/v5.0/5.0.5' into test
---
src/views/resource/components/spotDetails.vue | 41 ++++++++++++++++++++++++++++++++---------
src/views/resource/patchManagement.vue | 2 ++
src/views/resource/patchTypeManagement.vue | 2 ++
3 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/src/views/resource/components/spotDetails.vue b/src/views/resource/components/spotDetails.vue
index dca0aac..aec18a0 100644
--- a/src/views/resource/components/spotDetails.vue
+++ b/src/views/resource/components/spotDetails.vue
@@ -28,7 +28,7 @@
<el-select
v-model="item.value"
placeholder="请选择图斑类型"
- style="width: 100%"
+ style="width: 102%"
>
<el-option
v-for="opt in spotTypeOptions"
@@ -39,11 +39,11 @@
</el-select>
</template>
<template v-else-if="item.name === '文件名称'">
- <el-input v-model="item.value" />
+ <el-input style="width: 102%" v-model="item.value" />
</template>
</template>
- <template v-else>
- <div class="itemValue">{{ item.value }}</div>
+ <template v-else >
+ <div class="itemValue" :class="{ 'error-text': item.name === '异常图斑数量' }">{{ item.value }}</div>
</template>
</div>
</div>
@@ -59,9 +59,9 @@
<div class="tabname">图斑列表</div>
<el-table
ref="polygonTableEle"
- highlight-current-row
+ highlight-current-row
:row-class-name="tableRowClassName"
- :data="tableData"
+ :data="tableData"
@row-click="handleLocationPolygon"
>
<el-table-column type="index" align="center" width="30" label="序号">
@@ -228,7 +228,7 @@
};
const params = ref({
page: 1,
- pageSize: 20,
+ pageSize: 10,
});
// 图斑管理表格
const getTableList = () => {
@@ -278,6 +278,7 @@
};
// 初始化所有图斑
const entitiesAddSpot = () => {
+ viewer?.entities.removeAll(); //清除旧实体
tableData.value.forEach(item => {
// 取出当中经纬度
const numbersWithCommas = item.dkfw.match(/\d+(\.\d+)?/g);
@@ -323,6 +324,11 @@
const boundingSphere = Cesium.BoundingSphere.fromPoints(positions);
homeViewer.value?.camera.flyToBoundingSphere(boundingSphere, {
duration: 0,
+ offset: new Cesium.HeadingPitchRange(
+ Cesium.Math.toRadians(-45),
+ Cesium.Math.toRadians(-90),
+
+ ),
});
}
viewInstance.value?.removeLeftClickEvent('spotHighlighting');
@@ -518,6 +524,7 @@
}
destroyMap();
}
+ refreshonload();
});
onMounted(() => {});
onBeforeUnmount(() => {
@@ -597,11 +604,19 @@
line-height: 33px;
padding-right: 10px;
margin: 0 -10px 0 -10px;
+ border-right: 1px solid #e8e8e8;
}
.itemContent {
flex: 1;
padding-left: 10px;
+ .itemValue {
+ padding-left: 6px;
+ color: #7B7B7B;
+ }
+ .error-text{
+ color: #FF0A0A;
+ }
}
}
}
@@ -619,7 +634,7 @@
z-index: 99;
width: 277px;
overflow: hidden;
- background: rgba(0, 0, 0, 0.4);
+ background: rgba(0, 0, 0, 0.6);
// backdrop-filter: blur(5px);
border-radius: 8px 8px 8px 8px;
padding: 6px 10px 0 10px;
@@ -638,6 +653,7 @@
font-size: 14px;
color: #ffffff;
}
+
// 表格样式
:deep(.el-table) {
// 清除表格内部横线和竖线
@@ -700,7 +716,14 @@
background-color: var(--el-table-current-row-bg-color) !important;
}
}
-
+:deep(.el-table__body) {
+ tr {
+ height: 46px;
+ }
+ td {
+ padding: 8px 0;
+ }
+}
.operationspan {
cursor: pointer;
}
diff --git a/src/views/resource/patchManagement.vue b/src/views/resource/patchManagement.vue
index 38a021e..6adeb8f 100644
--- a/src/views/resource/patchManagement.vue
+++ b/src/views/resource/patchManagement.vue
@@ -158,6 +158,8 @@
searchMenuPosition: 'right',
border: true,
index: true,
+ indexLabel: '序号',
+ indexWidth: 60,
selection: true,
grid: false,
menuWidth: 240,
diff --git a/src/views/resource/patchTypeManagement.vue b/src/views/resource/patchTypeManagement.vue
index 8d6f2eb..7c7eb4e 100644
--- a/src/views/resource/patchTypeManagement.vue
+++ b/src/views/resource/patchTypeManagement.vue
@@ -71,6 +71,8 @@
searchMenuPosition: 'right',
border: true,
index: true,
+ indexLabel: '序号',
+ indexWidth: 60,
selection: true,
grid: false,
menuWidth: 180,
--
Gitblit v1.9.3