admin/Mars3D-screen_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2023-11-16 18:37:50 +08:00
parent 66aebd3a86
commit 7f0b656d3a
23 changed files with 519 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.env.development
View File

@ -2,7 +2,8 @@
NODE_ENV = 'development'
# 本地环境接口地址(/api/index.ts文件中使用)
VITE_API_URL = 'http://192.168.34.155:6677'
# VITE_API_URL = 'http://192.168.34.155:6677'
VITE_API_URL = 'http://139.9.66.234:60677'
VITE_WPAPI_URL = "http://182.90.224.147:8081"
# VITE_API_URL = "http://182.90.224.147:6688"

14
src/views/goverment/frontLargeScreen/components/coordinatePicking.vue
View File

@ -346,4 +346,18 @@ onUnmounted(() => {
}
}
}
// element 组件样式
:deep() {
.el-input__wrapper {
background-color: transparent;
}
.el-input__inner {
color: white;
}
.el-button {
background: rgba(51, 89, 181, 0.6);
border-radius: 6px;
border: 0;
}
}
</style>

59
src/views/goverment/frontLargeScreen/components/flyRoam.vue
View File

@ -20,13 +20,16 @@
<el-button type="primary" @click="expJSONFile">导出</el-button>
</div>
<div class="table-operate">
<el-table :data="tableData" rowKey="id">
<el-table
:data="tableData"
rowKey="id"
:header-cell-style="{ backgroundColor: '#3359B5', color: '#fff', borderColor: '#3F5C8E' }"
>
<el-table-column prop="name" align="center" label="名称" />
<el-table-column align="center" label="操作">
<template #default="{ row, $index }">
<el-button link type="primary" @click="flyToModel(row, $index)">漫游</el-button>
<!-- <el-button link type="primary">编辑</el-button> -->
<el-button link type="primary" @click="deleteRoute(row, $index)">删除</el-button>
<span style="color: white; cursor: pointer; margin-right: 10px" @click="flyToModel(row, $index)">漫游</span>
<span style="color: white; cursor: pointer" @click="deleteRoute(row, $index)">删除</span>
</template>
</el-table-column>
</el-table>
@ -509,4 +512,52 @@ onUnmounted(() => {
}
}
}
// element 组件样式
:deep() {
.el-input__wrapper {
background-color: transparent !important;
}
.el-input__inner {
color: white;
}
.el-button {
background: rgba(51, 89, 181, 0.6);
border-radius: 6px;
border: 0;
}
.el-table {
background-color: transparent;
tr {
background-color: transparent;
}
}
.el-table__border-left-patch {
background-color: #3f5c8e;
}
.el-table--border .el-table__inner-wrapper::after {
background-color: #3f5c8e;
}
.el-table--border::after {
background-color: #3f5c8e;
}
.el-table__inner-wrapper::before {
background-color: #3f5c8e;
}
.el-table td.el-table__cell {
border-color: #3f5c8e;
}
.el-table--border .el-table__cell {
border-color: #3f5c8e;
}
.cell {
color: white;
}
.el-table__row:hover {
background-color: transparent;
}
.el-table__body tr:hover > td {
// background-color: #008bff !important;
background-color: transparent !important;
}
}
</style>

20
src/views/goverment/frontLargeScreen/components/mapMark.vue
View File

@ -601,6 +601,7 @@ onUnmounted(() => {
margin: 0 auto;
display: flex;
flex-direction: column;
margin-top: 15px;
&-item {
display: flex;
color: white;
@ -699,4 +700,23 @@ onUnmounted(() => {
}
}
}
// element 组件样式
:deep() {
.el-input__wrapper {
background-color: transparent;
}
.el-input__inner {
color: white;
}
.el-input-number__increase,
.el-input-number__decrease {
background-color: transparent;
color: white;
}
.el-button {
background: rgba(51, 89, 181, 0.6);
border-radius: 6px;
border: 0;
}
}
</style>

16
src/views/goverment/frontLargeScreen/components/mapMeasurement.vue
View File

@ -26,7 +26,7 @@
<el-button type="primary" @click="emptyMeasure">清空测量数据</el-button>
</div>
</div>
<div class="echarts-content" v-if="echartShow">sss</div>
<!-- <div class="echarts-content" v-if="echartShow">sss</div> -->
</template>
<script lang="ts" setup>
@ -312,4 +312,18 @@ onUnmounted(() => {
color: white;
}
}
// element 组件样式
:deep() {
.el-input__wrapper {
background-color: transparent;
}
.el-input__inner {
color: white;
}
.el-button {
background: rgba(51, 89, 181, 0.6);
border-radius: 6px;
border: 0;
}
}
</style>

14
src/views/goverment/frontLargeScreen/components/mapPrint.vue
View File

@ -108,4 +108,18 @@ onUnmounted(() => {
}
}
}
// element 组件样式
:deep() {
.el-input__wrapper {
background-color: transparent;
}
.el-input__inner {
color: white;
}
.el-button {
background: rgba(51, 89, 181, 0.6);
border-radius: 6px;
border: 0;
}
}
</style>

60
src/views/goverment/frontLargeScreen/components/myTags.vue
View File

@ -28,12 +28,17 @@
</div>
</div>
<div class="table-operate">
<el-table :data="tableData" rowKey="key">
<el-table
:data="tableData"
rowKey="key"
border
:header-cell-style="{ backgroundColor: '#3359B5', color: '#fff', borderColor: '#3F5C8E' }"
>
<el-table-column prop="name" align="center" label="名称" />
<el-table-column align="center" label="操作">
<template #default="{ row, $index }">
<el-button link type="primary" @click="toPoint(row)">定位</el-button>
<el-button link type="primary" @click="deletePoint(row, $index)">删除</el-button>
<span style="color: white; cursor: pointer; margin-right: 10px" @click="toPoint(row)">定位</span>
<span style="color: white; cursor: pointer" @click="deletePoint(row, $index)">删除</span>
</template>
</el-table-column>
</el-table>
@ -362,6 +367,7 @@ onUnmounted(() => {
margin: 0 auto;
display: flex;
flex-direction: column;
margin-top: 15px;
&-item {
display: flex;
align-items: center;
@ -390,4 +396,52 @@ onUnmounted(() => {
margin: 0 auto;
}
}
// element 组件样式
:deep() {
.el-input__wrapper {
background-color: transparent !important;
}
.el-input__inner {
color: white;
}
.el-button {
background: rgba(51, 89, 181, 0.6);
border-radius: 6px;
border: 0;
}
.el-table {
background-color: transparent;
tr {
background-color: transparent;
}
}
.el-table__border-left-patch {
background-color: #3f5c8e;
}
.el-table--border .el-table__inner-wrapper::after {
background-color: #3f5c8e;
}
.el-table--border::after {
background-color: #3f5c8e;
}
.el-table__inner-wrapper::before {
background-color: #3f5c8e;
}
.el-table td.el-table__cell {
border-color: #3f5c8e;
}
.el-table--border .el-table__cell {
border-color: #3f5c8e;
}
.cell {
color: white;
}
.el-table__row:hover {
background-color: transparent;
}
.el-table__body tr:hover > td {
// background-color: #008bff !important;
background-color: transparent !important;
}
}
</style>

14
src/views/goverment/frontLargeScreen/components/regionalNavigation.vue
View File

@ -231,4 +231,18 @@ onUnmounted(() => {
}
}
}
// element 组件样式
:deep() {
.el-input__wrapper {
background-color: transparent !important;
}
.el-input__inner {
color: white;
}
.el-button {
background: rgba(51, 89, 181, 0.6);
border-radius: 6px;
border: 0;
}
}
</style>

23
src/views/goverment/frontLargeScreen/components/routeNavigation.vue
View File

@ -96,7 +96,7 @@ const productRoute = (obj: any, index: number) => {
id: obj.id + "-" + index,
name: "路线-" + index,
speed: 200,
positions: [...pointsArr],
positions: pointsArr,
clockLoop: false, // 是否循环播放
model: {
url: "//data.mars3d.cn/gltf/mars/jingche/jingche.gltf",
@ -223,7 +223,7 @@ const highLightRoute = (row: any) => {
const htmlDeal = (row: any) => {
console.log(row);
let passArr = [...new Set(row.road)];
let html = `全场${mars3d.MeasureUtil.formatDistance(row.allDistance)}公里，途径：${passArr.join(",")}`;
let html = `全场${mars3d.MeasureUtil.formatDistance(row.allDistance)}，途径：${passArr.join(",")}`;
return html;
};
// 查询路线规划
@ -514,4 +514,23 @@ onUnmounted(() => {
}
}
}
// element 组件样式
:deep() {
.el-input__wrapper {
background-color: transparent !important;
}
.el-input__inner {
color: white;
}
.el-input-number__increase,
.el-input-number__decrease {
background-color: transparent;
color: white;
}
.el-button {
background: rgba(51, 89, 181, 0.6);
border-radius: 6px;
border: 0;
}
}
</style>

25
src/views/goverment/frontLargeScreen/components/spaceAnalysis.vue
View File

@ -310,7 +310,7 @@ const allProperty = ref<any>({
minHeight: 0,
maxHeight: 0,
// 地形开挖数据
diffHeight: 0,
diffHeight: 20,
// 地下透明数据
enabled: false,
alpha: 0.5,
@ -685,7 +685,7 @@ const btnDrawExtent = () => {
},
success: (graphic: any) => {
const positions = graphic.getOutlinePositions(false);
graphicLayer.clear();
map.graphicLayer.clear();
console.log(JSON.stringify(mars3d.LngLatArray.toArray(positions))); // 打印下边界
@ -696,7 +696,7 @@ const btnDrawExtent = () => {
};
// 地形开挖数据操作
const areaOperate = (e: any, label: any) => {
terrainClip[label] = e;
terrainClip[label] = allProperty.value.diffHeight;
};
// 获取点选高度
const selectHeight = () => {
@ -1100,4 +1100,23 @@ onUnmounted(() => {
}
}
}
// element 组件样式
:deep() {
.el-input__wrapper {
background-color: transparent;
}
.el-input__inner {
color: white;
}
.el-input-number__increase,
.el-input-number__decrease {
background-color: transparent;
color: white;
}
.el-button {
background: rgba(51, 89, 181, 0.6);
border-radius: 6px;
border: 0;
}
}
</style>

14
src/views/goverment/frontLargeScreen/components/viewBookmark.vue
View File

@ -202,4 +202,18 @@ onUnmounted(() => {
}
}
}
// element 组件样式
:deep() {
.el-input__wrapper {
background-color: transparent;
}
.el-input__inner {
color: white;
}
.el-button {
background: rgba(51, 89, 181, 0.6);
border-radius: 6px;
border: 0;
}
}
</style>

13
src/views/goverment/frontLargeScreen/index.vue
View File

@ -635,6 +635,7 @@ const clickMenu = (name: any) => {
screenComparisonShow.value = true;
// 分屏对比
screenComparison();
initSplitScreenTree();
}
toolListShow.value = false;
};
@ -1208,6 +1209,7 @@ const findChild = (parent: any, list: any[]) => {
};
// 初始化分屏对比的树结构
const initSplitScreenTree = () => {
splitScreenTreeData.value.length = 0;
const layers = map.getLayers({
basemaps: false, // 是否取config.json中的basempas
layers: true // 是否取config.json中的layers
@ -2069,4 +2071,15 @@ onUnmounted(() => {
right: auto;
}
}
// element 组件样式
:deep() {
.el-select {
.el-input__wrapper {
background-color: transparent !important;
}
.el-input__inner {
color: white;
}
}
}
</style>

14
src/views/goverment/largeScreen/components/coordinatePicking.vue
View File

@ -346,4 +346,18 @@ onUnmounted(() => {
}
}
}
// element 组件样式
:deep() {
.el-input__wrapper {
background-color: transparent;
}
.el-input__inner {
color: white;
}
.el-button {
background: rgba(51, 89, 181, 0.6);
border-radius: 6px;
border: 0;
}
}
</style>

59
src/views/goverment/largeScreen/components/flyRoam.vue
View File

@ -20,13 +20,16 @@
<el-button type="primary" @click="expJSONFile">导出</el-button>
</div>
<div class="table-operate">
<el-table :data="tableData" rowKey="id">
<el-table
:data="tableData"
rowKey="id"
:header-cell-style="{ backgroundColor: '#3359B5', color: '#fff', borderColor: '#3F5C8E' }"
>
<el-table-column prop="name" align="center" label="名称" />
<el-table-column align="center" label="操作">
<template #default="{ row, $index }">
<el-button link type="primary" @click="flyToModel(row, $index)">漫游</el-button>
<!-- <el-button link type="primary">编辑</el-button> -->
<el-button link type="primary" @click="deleteRoute(row, $index)">删除</el-button>
<span style="color: white; cursor: pointer; margin-right: 10px" @click="flyToModel(row, $index)">漫游</span>
<span style="color: white; cursor: pointer" @click="deleteRoute(row, $index)">删除</span>
</template>
</el-table-column>
</el-table>
@ -509,4 +512,52 @@ onUnmounted(() => {
}
}
}
// element 组件样式
:deep() {
.el-input__wrapper {
background-color: transparent !important;
}
.el-input__inner {
color: white;
}
.el-button {
background: rgba(51, 89, 181, 0.6);
border-radius: 6px;
border: 0;
}
.el-table {
background-color: transparent;
tr {
background-color: transparent;
}
}
.el-table__border-left-patch {
background-color: #3f5c8e;
}
.el-table--border .el-table__inner-wrapper::after {
background-color: #3f5c8e;
}
.el-table--border::after {
background-color: #3f5c8e;
}
.el-table__inner-wrapper::before {
background-color: #3f5c8e;
}
.el-table td.el-table__cell {
border-color: #3f5c8e;
}
.el-table--border .el-table__cell {
border-color: #3f5c8e;
}
.cell {
color: white;
}
.el-table__row:hover {
background-color: transparent;
}
.el-table__body tr:hover > td {
// background-color: #008bff !important;
background-color: transparent !important;
}
}
</style>

20
src/views/goverment/largeScreen/components/mapMark.vue
View File

@ -601,6 +601,7 @@ onUnmounted(() => {
margin: 0 auto;
display: flex;
flex-direction: column;
margin-top: 15px;
&-item {
display: flex;
color: white;
@ -699,4 +700,23 @@ onUnmounted(() => {
}
}
}
// element 组件样式
:deep() {
.el-input__wrapper {
background-color: transparent;
}
.el-input__inner {
color: white;
}
.el-input-number__increase,
.el-input-number__decrease {
background-color: transparent;
color: white;
}
.el-button {
background: rgba(51, 89, 181, 0.6);
border-radius: 6px;
border: 0;
}
}
</style>

16
src/views/goverment/largeScreen/components/mapMeasurement.vue
View File

@ -26,7 +26,7 @@
<el-button type="primary" @click="emptyMeasure">清空测量数据</el-button>
</div>
</div>
<div class="echarts-content" v-if="echartShow">sss</div>
<!-- <div class="echarts-content" v-if="echartShow">sss</div> -->
</template>
<script lang="ts" setup>
@ -312,4 +312,18 @@ onUnmounted(() => {
color: white;
}
}
// element 组件样式
:deep() {
.el-input__wrapper {
background-color: transparent;
}
.el-input__inner {
color: white;
}
.el-button {
background: rgba(51, 89, 181, 0.6);
border-radius: 6px;
border: 0;
}
}
</style>

14
src/views/goverment/largeScreen/components/mapPrint.vue
View File

@ -108,4 +108,18 @@ onUnmounted(() => {
}
}
}
// element 组件样式
:deep() {
.el-input__wrapper {
background-color: transparent;
}
.el-input__inner {
color: white;
}
.el-button {
background: rgba(51, 89, 181, 0.6);
border-radius: 6px;
border: 0;
}
}
</style>

60
src/views/goverment/largeScreen/components/myTags.vue
View File

@ -28,12 +28,17 @@
</div>
</div>
<div class="table-operate">
<el-table :data="tableData" rowKey="key">
<el-table
:data="tableData"
rowKey="key"
border
:header-cell-style="{ backgroundColor: '#3359B5', color: '#fff', borderColor: '#3F5C8E' }"
>
<el-table-column prop="name" align="center" label="名称" />
<el-table-column align="center" label="操作">
<template #default="{ row, $index }">
<el-button link type="primary" @click="toPoint(row)">定位</el-button>
<el-button link type="primary" @click="deletePoint(row, $index)">删除</el-button>
<span style="color: white; cursor: pointer; margin-right: 10px" @click="toPoint(row)">定位</span>
<span style="color: white; cursor: pointer" @click="deletePoint(row, $index)">删除</span>
</template>
</el-table-column>
</el-table>
@ -362,6 +367,7 @@ onUnmounted(() => {
margin: 0 auto;
display: flex;
flex-direction: column;
margin-top: 15px;
&-item {
display: flex;
align-items: center;
@ -390,4 +396,52 @@ onUnmounted(() => {
margin: 0 auto;
}
}
// element 组件样式
:deep() {
.el-input__wrapper {
background-color: transparent !important;
}
.el-input__inner {
color: white;
}
.el-button {
background: rgba(51, 89, 181, 0.6);
border-radius: 6px;
border: 0;
}
.el-table {
background-color: transparent;
tr {
background-color: transparent;
}
}
.el-table__border-left-patch {
background-color: #3f5c8e;
}
.el-table--border .el-table__inner-wrapper::after {
background-color: #3f5c8e;
}
.el-table--border::after {
background-color: #3f5c8e;
}
.el-table__inner-wrapper::before {
background-color: #3f5c8e;
}
.el-table td.el-table__cell {
border-color: #3f5c8e;
}
.el-table--border .el-table__cell {
border-color: #3f5c8e;
}
.cell {
color: white;
}
.el-table__row:hover {
background-color: transparent;
}
.el-table__body tr:hover > td {
// background-color: #008bff !important;
background-color: transparent !important;
}
}
</style>

14
src/views/goverment/largeScreen/components/regionalNavigation.vue
View File

@ -231,4 +231,18 @@ onUnmounted(() => {
}
}
}
// element 组件样式
:deep() {
.el-input__wrapper {
background-color: transparent !important;
}
.el-input__inner {
color: white;
}
.el-button {
background: rgba(51, 89, 181, 0.6);
border-radius: 6px;
border: 0;
}
}
</style>

23
src/views/goverment/largeScreen/components/routeNavigation.vue
View File

@ -96,7 +96,7 @@ const productRoute = (obj: any, index: number) => {
id: obj.id + "-" + index,
name: "路线-" + index,
speed: 200,
positions: [...pointsArr],
positions: pointsArr,
clockLoop: false, // 是否循环播放
model: {
url: "//data.mars3d.cn/gltf/mars/jingche/jingche.gltf",
@ -223,7 +223,7 @@ const highLightRoute = (row: any) => {
const htmlDeal = (row: any) => {
console.log(row);
let passArr = [...new Set(row.road)];
let html = `全场${mars3d.MeasureUtil.formatDistance(row.allDistance)}公里，途径：${passArr.join(",")}`;
let html = `全场${mars3d.MeasureUtil.formatDistance(row.allDistance)}，途径：${passArr.join(",")}`;
return html;
};
// 查询路线规划
@ -514,4 +514,23 @@ onUnmounted(() => {
}
}
}
// element 组件样式
:deep() {
.el-input__wrapper {
background-color: transparent !important;
}
.el-input__inner {
color: white;
}
.el-input-number__increase,
.el-input-number__decrease {
background-color: transparent;
color: white;
}
.el-button {
background: rgba(51, 89, 181, 0.6);
border-radius: 6px;
border: 0;
}
}
</style>

26
src/views/goverment/largeScreen/components/spaceAnalysis.vue
View File

@ -310,7 +310,7 @@ const allProperty = ref<any>({
minHeight: 0,
maxHeight: 0,
// 地形开挖数据
diffHeight: 0,
diffHeight: 20,
// 地下透明数据
enabled: false,
alpha: 0.5,
@ -669,7 +669,6 @@ const btnDraw = () => {
map.graphicLayer.clear();
console.log(JSON.stringify(mars3d.LngLatArray.toArray(positions))); // 打印下边界
console.log(positions);
// 挖地区域
const areaItem = terrainClip.addArea(positions);
}
@ -685,7 +684,7 @@ const btnDrawExtent = () => {
},
success: (graphic: any) => {
const positions = graphic.getOutlinePositions(false);
graphicLayer.clear();
map.graphicLayer.clear();
console.log(JSON.stringify(mars3d.LngLatArray.toArray(positions))); // 打印下边界
@ -696,7 +695,7 @@ const btnDrawExtent = () => {
};
// 地形开挖数据操作
const areaOperate = (e: any, label: any) => {
terrainClip[label] = e;
terrainClip[label] = allProperty.value.diffHeight;
};
// 获取点选高度
const selectHeight = () => {
@ -1100,4 +1099,23 @@ onUnmounted(() => {
}
}
}
// element 组件样式
:deep() {
.el-input__wrapper {
background-color: transparent;
}
.el-input__inner {
color: white;
}
.el-input-number__increase,
.el-input-number__decrease {
background-color: transparent;
color: white;
}
.el-button {
background: rgba(51, 89, 181, 0.6);
border-radius: 6px;
border: 0;
}
}
</style>

14
src/views/goverment/largeScreen/components/viewBookmark.vue
View File

@ -202,4 +202,18 @@ onUnmounted(() => {
}
}
}
// element 组件样式
:deep() {
.el-input__wrapper {
background-color: transparent;
}
.el-input__inner {
color: white;
}
.el-button {
background: rgba(51, 89, 181, 0.6);
border-radius: 6px;
border: 0;
}
}
</style>

12
src/views/goverment/largeScreen/index.vue
View File

@ -1189,6 +1189,7 @@ const initTree = () => {
};
// 初始化分屏对比的树结构
const initSplitScreenTree = () => {
splitScreenTreeData.value.length = 0;
const layers = map.getLayers({
basemaps: false, // 是否取config.json中的basempas
layers: true // 是否取config.json中的layers
@ -2075,4 +2076,15 @@ onUnmounted(() => {
right: auto;
}
}
// element 组件样式
:deep() {
.el-select {
.el-input__wrapper {
background-color: transparent !important;
}
.el-input__inner {
color: white;
}
}
}
</style>