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-18 15:51:49 +08:00
parent cf332b3d7f
commit 0b1fa274c8
14 changed files with 151 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist/assets/png/leftGover-633bf0db.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 410 B

2
dist/index.html vendored
View File

@ -1,4 +1,4 @@
<!doctype html><html lang="en"><head><meta charset="UTF-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title></title><script type="module" crossorigin src="./assets/js/index-3a789d4b.js"></script><link rel="stylesheet" href="./assets/css/index-3a232b61.css"></head><body><div id="app"><style>#app,body,html{width:100%;height:100%;padding:0;margin:0}.loading-box{display:flex;flex-direction:column;align-items:center;justify-content:center;width:100%;height:100%}.loading-box .loading-wrap{display:flex;align-items:center;justify-content:center;padding:98px}.dot{position:relative;box-sizing:border-box;display:inline-block;width:32px;height:32px;font-size:32px;transform:rotate(45deg);animation:ant-rotate 1.2s infinite linear}.dot i{position:absolute;display:block;width:14px;height:14px;background-color:#409eff;border-radius:100%;opacity:.3;transform:scale(.75);transform-origin:50% 50%;animation:ant-spin-move 1s infinite linear alternate}.dot i:first-child{top:0;left:0}.dot i:nth-child(2){top:0;right:0;animation-delay:.4s}.dot i:nth-child(3){right:0;bottom:0;animation-delay:.8s}.dot i:nth-child(4){bottom:0;left:0;animation-delay:1.2s}@keyframes ant-rotate{to{transform:rotate(405deg)}}@keyframes ant-spin-move{to{opacity:1}}</style><div class="loading-box"><div class="loading-wrap"><span class="dot dot-spin"><i></i><i></i><i></i><i></i></span></div></div></div><script>const globalState = JSON.parse(window.localStorage.getItem("GlobalState"));
<!doctype html><html lang="en"><head><meta charset="UTF-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title></title><script type="module" crossorigin src="./assets/js/index-dab91818.js"></script><link rel="stylesheet" href="./assets/css/index-3a232b61.css"></head><body><div id="app"><style>#app,body,html{width:100%;height:100%;padding:0;margin:0}.loading-box{display:flex;flex-direction:column;align-items:center;justify-content:center;width:100%;height:100%}.loading-box .loading-wrap{display:flex;align-items:center;justify-content:center;padding:98px}.dot{position:relative;box-sizing:border-box;display:inline-block;width:32px;height:32px;font-size:32px;transform:rotate(45deg);animation:ant-rotate 1.2s infinite linear}.dot i{position:absolute;display:block;width:14px;height:14px;background-color:#409eff;border-radius:100%;opacity:.3;transform:scale(.75);transform-origin:50% 50%;animation:ant-spin-move 1s infinite linear alternate}.dot i:first-child{top:0;left:0}.dot i:nth-child(2){top:0;right:0;animation-delay:.4s}.dot i:nth-child(3){right:0;bottom:0;animation-delay:.8s}.dot i:nth-child(4){bottom:0;left:0;animation-delay:1.2s}@keyframes ant-rotate{to{transform:rotate(405deg)}}@keyframes ant-spin-move{to{opacity:1}}</style><div class="loading-box"><div class="loading-wrap"><span class="dot dot-spin"><i></i><i></i><i></i><i></i></span></div></div></div><script>const globalState = JSON.parse(window.localStorage.getItem("GlobalState"));
if (globalState) {
const color = globalState.themeConfig.primary;
const isDark = globalState.themeConfig.isDark;

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

@ -397,7 +397,7 @@ const drawMarker = () => {
graphicLayer.startDraw({
type: "billboard",
style: {
image: "src/assets/images/Mars3DImg/marker/mark-red.png",
image: "@/assets/images/Mars3DImg/marker/mark-red.png",
horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
label: {

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

@ -180,7 +180,7 @@ function addParticleSystem(property: any) {
const particleSystem = new mars3d.graphic.ParticleSystem({
position: property,
style: {
image: "src/assets/images/Mars3DImg/particle/smoke.png",
image: "@/assets/images/Mars3DImg/particle/smoke.png",
particleSize: 12, // 粒子大小（单位：像素）
emissionRate: 20.0, // 发射速率 （单位：次/秒）
pitch: 40, // 俯仰角
@ -211,7 +211,7 @@ const highLightRoute = (row: any) => {
graphic.entityGraphic.width = 5;
graphic.entityGraphic.material = mars3d.MaterialUtil.createMaterialProperty(mars3d.MaterialType.LineFlow, {
color: Cesium.Color.CHARTREUSE,
image: "src/assets/images/Mars3DImg/textures/line-color-yellow.png",
image: "@/assets/images/Mars3DImg/textures/line-color-yellow.png",
speed: 20
});
@ -315,7 +315,7 @@ const startPicking = () => {
.startDraw({
type: "billboard",
style: {
image: "src/assets/images/Mars3DImg/marker/route-start.png",
image: "@/assets/images/Mars3DImg/marker/route-start.png",
horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
verticalOrigin: Cesium.VerticalOrigin.BOTTOM
}
@ -339,7 +339,7 @@ const endPicking = () => {
.startDraw({
type: "billboard",
style: {
image: "src/assets/images/Mars3DImg/marker/route-end.png",
image: "@/assets/images/Mars3DImg/marker/route-end.png",
horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
verticalOrigin: Cesium.VerticalOrigin.BOTTOM
}

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

@ -360,8 +360,8 @@ onMounted(() => {
// 地形开挖
terrainClip = new mars3d.thing.TerrainClip({
diffHeight: allProperty.value.diffHeight, // 井的深度
image: "src/assets/images/Mars3DImg/textures/poly-stone.jpg",
imageBottom: "src/assets/images/Mars3DImg/textures/poly-soil.jpg",
image: "@/assets/images/Mars3DImg/textures/poly-stone.jpg",
imageBottom: "@/assets/images/Mars3DImg/textures/poly-soil.jpg",
splitNum: 80, // 井边界插值数
enabled: true
});

50
src/views/goverment/frontLargeScreen/config.json
View File

@ -75,7 +75,7 @@
"id": 2021,
"pid": 10,
"name": "谷歌影像",
"icon": "src/assets/images/Mars3DImg/basemaps/google_img.png",
"icon": "@/assets/images/Mars3DImg/basemaps/google_img.png",
"type": "google",
"layer": "img_d",
"show": true
@ -83,7 +83,7 @@
{
"pid": 10,
"name": "天地图影像",
"icon": "src/assets/images/Mars3DImg/basemaps/tdt_img.png",
"icon": "@/assets/images/Mars3DImg/basemaps/tdt_img.png",
"type": "group",
"layers": [
{ "name": "底图", "type": "tdt", "layer": "img_d" },
@ -94,7 +94,7 @@
{
"pid": 10,
"name": "天地图电子",
"icon": "src/assets/images/Mars3DImg/basemaps/tdt_vec.png",
"icon": "@/assets/images/Mars3DImg/basemaps/tdt_vec.png",
"type": "group",
"layers": [
{ "name": "底图", "type": "tdt", "layer": "vec_d" },
@ -105,7 +105,7 @@
"pid": 10,
"name": "高德影像",
"type": "group",
"icon": "src/assets/images/Mars3DImg/basemaps/gaode_img.png",
"icon": "@/assets/images/Mars3DImg/basemaps/gaode_img.png",
"layers": [
{ "name": "底图", "type": "gaode", "layer": "img_d" },
{ "name": "注记", "type": "gaode", "layer": "img_z" }
@ -115,14 +115,14 @@
"pid": 10,
"name": "高德电子",
"type": "gaode",
"icon": "src/assets/images/Mars3DImg/basemaps/gaode_vec.png",
"icon": "@/assets/images/Mars3DImg/basemaps/gaode_vec.png",
"layer": "vec"
},
{
"pid": 10,
"name": "百度影像",
"type": "group",
"icon": "src/assets/images/Mars3DImg/basemaps/bd-img.png",
"icon": "@/assets/images/Mars3DImg/basemaps/bd-img.png",
"layers": [
{ "name": "底图", "type": "baidu", "layer": "img_d" },
{ "name": "注记", "type": "baidu", "layer": "img_z" }
@ -131,14 +131,14 @@
{
"pid": 10,
"name": "百度电子",
"icon": "src/assets/images/Mars3DImg/basemaps/bd-vec.png",
"icon": "@/assets/images/Mars3DImg/basemaps/bd-vec.png",
"type": "baidu",
"layer": "vec"
},
{
"pid": 10,
"name": "腾讯影像",
"icon": "src/assets/images/Mars3DImg/basemaps/tencent_img.png",
"icon": "@/assets/images/Mars3DImg/basemaps/tencent_img.png",
"type": "group",
"layers": [
{ "name": "底图", "type": "tencent", "layer": "img_d" },
@ -148,14 +148,14 @@
{
"pid": 10,
"name": "腾讯电子",
"icon": "src/assets/images/Mars3DImg/basemaps/tencent_vec.png",
"icon": "@/assets/images/Mars3DImg/basemaps/tencent_vec.png",
"type": "tencent",
"layer": "vec"
},
{
"pid": 10,
"name": "ArcGIS影像",
"icon": "src/assets/images/Mars3DImg/basemaps/esriWorldImagery.png",
"icon": "@/assets/images/Mars3DImg/basemaps/esriWorldImagery.png",
"type": "xyz",
"url": "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
"enablePickFeatures": false
@ -163,7 +163,7 @@
{
"pid": 10,
"name": "微软影像",
"icon": "src/assets/images/Mars3DImg/basemaps/bingAerial.png",
"icon": "@/assets/images/Mars3DImg/basemaps/bingAerial.png",
"type": "bing",
"layer": "Aerial"
},
@ -172,7 +172,7 @@
"pid": 10,
"name": "暗色底图",
"type": "gaode",
"icon": "src/assets/images/Mars3DImg/basemaps/blackMarble.png",
"icon": "@/assets/images/Mars3DImg/basemaps/blackMarble.png",
"layer": "vec",
"invertColor": true,
"filterColor": "#4e70a6",
@ -185,7 +185,7 @@
{
"pid": 10,
"name": "蓝色底图",
"icon": "src/assets/images/Mars3DImg/basemaps/bd-c-midnight.png",
"icon": "@/assets/images/Mars3DImg/basemaps/bd-c-midnight.png",
"type": "xyz",
"url": "http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}",
"chinaCRS": "GCJ02",
@ -194,7 +194,7 @@
{
"pid": 10,
"name": "黑色底图",
"icon": "src/assets/images/Mars3DImg/basemaps/bd-c-dark.png",
"icon": "@/assets/images/Mars3DImg/basemaps/bd-c-dark.png",
"type": "tencent",
"layer": "custom",
"style": "4"
@ -203,7 +203,7 @@
"pid": 10,
"name": "离线地图 (供参考)",
"type": "group",
"icon": "src/assets/images/Mars3DImg/basemaps/google_img.png",
"icon": "@/assets/images/Mars3DImg/basemaps/google_img.png",
"layers": [
{
"name": "全球",
@ -235,15 +235,15 @@
{
"pid": 10,
"name": "单张图片 (本地离线)",
"icon": "src/assets/images/Mars3DImg/basemaps/offline.png",
"icon": "@/assets/images/Mars3DImg/basemaps/offline.png",
"type": "image",
"url": "//data.mars3d.cn/filesrc/assets/images/Mars3DImg/world/world.jpg"
"url": "//data.mars3d.cn/file@/assets/images/Mars3DImg/world/world.jpg"
},
{
"id": 2023,
"pid": 10,
"name": "无底图",
"icon": "src/assets/images/Mars3DImg/basemaps/null.png",
"icon": "@/assets/images/Mars3DImg/basemaps/null.png",
"type": "grid",
"color": "#ffffff",
"alpha": 0.03,
@ -577,7 +577,7 @@
"url": "{dataServer}/file/geojson/xizangyakou.json",
"symbol": {
"styleOptions": {
"image": "src/assets/images/Mars3DImg/marker/mark-red.png",
"image": "@/assets/images/Mars3DImg/marker/mark-red.png",
"scaleByDistance": true,
"scaleByDistance_far": 5000000,
"scaleByDistance_farValue": 0.5,
@ -620,7 +620,7 @@
"url": "{dataServer}/file/geojson/hfty-point.json",
"symbol": {
"styleOptions": {
"image": "src/assets/images/Mars3DImg/marker/mark-red.png",
"image": "@/assets/images/Mars3DImg/marker/mark-red.png",
"scale": 1,
"scaleByDistance": true,
"scaleByDistance_far": 20000,
@ -705,7 +705,7 @@
"symbol": {
"type": "billboardP",
"styleOptions": {
"image": "src/assets/images/Mars3DImg/marker/mark-red.png",
"image": "@/assets/images/Mars3DImg/marker/mark-red.png",
"scaleByDistance": true,
"scaleByDistance_far": 20000,
"scaleByDistance_farValue": 0.6,
@ -740,7 +740,7 @@
"symbol": {
"type": "billboardP",
"styleOptions": {
"image": "src/assets/images/Mars3DImg/marker/mark-blue.png",
"image": "@/assets/images/Mars3DImg/marker/mark-blue.png",
"scaleByDistance": true,
"scaleByDistance_far": 20000,
"scaleByDistance_farValue": 0.6,
@ -761,9 +761,9 @@
},
"styleField": "address",
"styleFieldOptions": {
"AB03": { "image": "src/assets/images/Mars3DImg/marker/mark-red.png" },
"A980": { "image": "src/assets/images/Mars3DImg/marker/mark-blue.png" },
"A900": { "image": "src/assets/images/Mars3DImg/marker/mark-green.png" }
"AB03": { "image": "@/assets/images/Mars3DImg/marker/mark-red.png" },
"A980": { "image": "@/assets/images/Mars3DImg/marker/mark-blue.png" },
"A900": { "image": "@/assets/images/Mars3DImg/marker/mark-green.png" }
}
},
"popup": "名称：{NAME}<br />地址：{address}",

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

@ -67,7 +67,7 @@
:class="{ 'active-card': active === item.id }"
@click="changeBaseMaps(item.id)"
>
<div><img class="icon" :src="`${item.options.icon || 'src/assets/images/Mars3DImg/basemaps/bingAerial.png'}`" /></div>
<div><img class="icon" :src="`${item.options.icon || '@/assets/images/Mars3DImg/basemaps/bingAerial.png'}`" /></div>
<div>{{ item.name }}</div>
</div>
</div>
@ -1149,7 +1149,7 @@ const addRandomGraphicByCount = (graphicLayer: any, position: any) => {
position: position,
style: {
html: ` <div class="mars3d-camera-content">
<img class="mars3d-camera-img" src="src/assets/images/icon/camera.svg" >
<img class="mars3d-camera-img" src="@/assets/images/icon/camera.svg" >
</div>
<div class="mars3d-camera-line" ></div>
<div class="mars3d-camera-point"></div>
@ -1935,7 +1935,7 @@ onUnmounted(() => {
position: absolute;
bottom: -39px;
left: -22px;
background: url("src/assets/images/icon/popupLbl.png") 0px 0px no-repeat;
background: url("@/assets/images/icon/popupLbl.png") 0px 0px no-repeat;
background-position: 0px 0px;
}

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

@ -397,7 +397,7 @@ const drawMarker = () => {
graphicLayer.startDraw({
type: "billboard",
style: {
image: "src/assets/images/Mars3DImg/marker/mark-red.png",
image: "@/assets/images/Mars3DImg/marker/mark-red.png",
horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
label: {

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

@ -180,7 +180,7 @@ function addParticleSystem(property: any) {
const particleSystem = new mars3d.graphic.ParticleSystem({
position: property,
style: {
image: "src/assets/images/Mars3DImg/particle/smoke.png",
image: "@/assets/images/Mars3DImg/particle/smoke.png",
particleSize: 12, // 粒子大小（单位：像素）
emissionRate: 20.0, // 发射速率 （单位：次/秒）
pitch: 40, // 俯仰角
@ -211,7 +211,7 @@ const highLightRoute = (row: any) => {
graphic.entityGraphic.width = 5;
graphic.entityGraphic.material = mars3d.MaterialUtil.createMaterialProperty(mars3d.MaterialType.LineFlow, {
color: Cesium.Color.CHARTREUSE,
image: "src/assets/images/Mars3DImg/textures/line-color-yellow.png",
image: "@/assets/images/Mars3DImg/textures/line-color-yellow.png",
speed: 20
});
@ -315,7 +315,7 @@ const startPicking = () => {
.startDraw({
type: "billboard",
style: {
image: "src/assets/images/Mars3DImg/marker/route-start.png",
image: "@/assets/images/Mars3DImg/marker/route-start.png",
horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
verticalOrigin: Cesium.VerticalOrigin.BOTTOM
}
@ -339,7 +339,7 @@ const endPicking = () => {
.startDraw({
type: "billboard",
style: {
image: "src/assets/images/Mars3DImg/marker/route-end.png",
image: "@/assets/images/Mars3DImg/marker/route-end.png",
horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
verticalOrigin: Cesium.VerticalOrigin.BOTTOM
}

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

@ -365,8 +365,8 @@ onMounted(() => {
// 地形开挖
terrainClip = new mars3d.thing.TerrainClip({
diffHeight: allProperty.value.diffHeight, // 井的深度
image: "src/assets/images/Mars3DImg/textures/poly-stone.jpg",
imageBottom: "src/assets/images/Mars3DImg/textures/poly-soil.jpg",
image: "@/assets/images/Mars3DImg/textures/poly-stone.jpg",
imageBottom: "@/assets/images/Mars3DImg/textures/poly-soil.jpg",
splitNum: 80, // 井边界插值数
enabled: true
});

50
src/views/goverment/largeScreen/config.json
View File

@ -75,7 +75,7 @@
"id": 2021,
"pid": 10,
"name": "谷歌影像",
"icon": "src/assets/images/Mars3DImg/basemaps/google_img.png",
"icon": "@/assets/images/Mars3DImg/basemaps/google_img.png",
"type": "google",
"layer": "img_d",
"show": true
@ -83,7 +83,7 @@
{
"pid": 10,
"name": "天地图影像",
"icon": "src/assets/images/Mars3DImg/basemaps/tdt_img.png",
"icon": "@/assets/images/Mars3DImg/basemaps/tdt_img.png",
"type": "group",
"layers": [
{ "name": "底图", "type": "tdt", "layer": "img_d" },
@ -94,7 +94,7 @@
{
"pid": 10,
"name": "天地图电子",
"icon": "src/assets/images/Mars3DImg/basemaps/tdt_vec.png",
"icon": "@/assets/images/Mars3DImg/basemaps/tdt_vec.png",
"type": "group",
"layers": [
{ "name": "底图", "type": "tdt", "layer": "vec_d" },
@ -105,7 +105,7 @@
"pid": 10,
"name": "高德影像",
"type": "group",
"icon": "src/assets/images/Mars3DImg/basemaps/gaode_img.png",
"icon": "@/assets/images/Mars3DImg/basemaps/gaode_img.png",
"layers": [
{ "name": "底图", "type": "gaode", "layer": "img_d" },
{ "name": "注记", "type": "gaode", "layer": "img_z" }
@ -115,14 +115,14 @@
"pid": 10,
"name": "高德电子",
"type": "gaode",
"icon": "src/assets/images/Mars3DImg/basemaps/gaode_vec.png",
"icon": "@/assets/images/Mars3DImg/basemaps/gaode_vec.png",
"layer": "vec"
},
{
"pid": 10,
"name": "百度影像",
"type": "group",
"icon": "src/assets/images/Mars3DImg/basemaps/bd-img.png",
"icon": "@/assets/images/Mars3DImg/basemaps/bd-img.png",
"layers": [
{ "name": "底图", "type": "baidu", "layer": "img_d" },
{ "name": "注记", "type": "baidu", "layer": "img_z" }
@ -131,14 +131,14 @@
{
"pid": 10,
"name": "百度电子",
"icon": "src/assets/images/Mars3DImg/basemaps/bd-vec.png",
"icon": "@/assets/images/Mars3DImg/basemaps/bd-vec.png",
"type": "baidu",
"layer": "vec"
},
{
"pid": 10,
"name": "腾讯影像",
"icon": "src/assets/images/Mars3DImg/basemaps/tencent_img.png",
"icon": "@/assets/images/Mars3DImg/basemaps/tencent_img.png",
"type": "group",
"layers": [
{ "name": "底图", "type": "tencent", "layer": "img_d" },
@ -148,14 +148,14 @@
{
"pid": 10,
"name": "腾讯电子",
"icon": "src/assets/images/Mars3DImg/basemaps/tencent_vec.png",
"icon": "@/assets/images/Mars3DImg/basemaps/tencent_vec.png",
"type": "tencent",
"layer": "vec"
},
{
"pid": 10,
"name": "ArcGIS影像",
"icon": "src/assets/images/Mars3DImg/basemaps/esriWorldImagery.png",
"icon": "@/assets/images/Mars3DImg/basemaps/esriWorldImagery.png",
"type": "xyz",
"url": "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
"enablePickFeatures": false
@ -163,7 +163,7 @@
{
"pid": 10,
"name": "微软影像",
"icon": "src/assets/images/Mars3DImg/basemaps/bingAerial.png",
"icon": "@/assets/images/Mars3DImg/basemaps/bingAerial.png",
"type": "bing",
"layer": "Aerial"
},
@ -172,7 +172,7 @@
"pid": 10,
"name": "暗色底图",
"type": "gaode",
"icon": "src/assets/images/Mars3DImg/basemaps/blackMarble.png",
"icon": "@/assets/images/Mars3DImg/basemaps/blackMarble.png",
"layer": "vec",
"invertColor": true,
"filterColor": "#4e70a6",
@ -185,7 +185,7 @@
{
"pid": 10,
"name": "蓝色底图",
"icon": "src/assets/images/Mars3DImg/basemaps/bd-c-midnight.png",
"icon": "@/assets/images/Mars3DImg/basemaps/bd-c-midnight.png",
"type": "xyz",
"url": "http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}",
"chinaCRS": "GCJ02",
@ -194,7 +194,7 @@
{
"pid": 10,
"name": "黑色底图",
"icon": "src/assets/images/Mars3DImg/basemaps/bd-c-dark.png",
"icon": "@/assets/images/Mars3DImg/basemaps/bd-c-dark.png",
"type": "tencent",
"layer": "custom",
"style": "4"
@ -203,7 +203,7 @@
"pid": 10,
"name": "离线地图 (供参考)",
"type": "group",
"icon": "src/assets/images/Mars3DImg/basemaps/google_img.png",
"icon": "@/assets/images/Mars3DImg/basemaps/google_img.png",
"layers": [
{
"name": "全球",
@ -235,15 +235,15 @@
{
"pid": 10,
"name": "单张图片 (本地离线)",
"icon": "src/assets/images/Mars3DImg/basemaps/offline.png",
"icon": "@/assets/images/Mars3DImg/basemaps/offline.png",
"type": "image",
"url": "//data.mars3d.cn/filesrc/assets/images/Mars3DImg/world/world.jpg"
"url": "//data.mars3d.cn/file@/assets/images/Mars3DImg/world/world.jpg"
},
{
"id": 2023,
"pid": 10,
"name": "无底图",
"icon": "src/assets/images/Mars3DImg/basemaps/null.png",
"icon": "@/assets/images/Mars3DImg/basemaps/null.png",
"type": "grid",
"color": "#ffffff",
"alpha": 0.03,
@ -577,7 +577,7 @@
"url": "{dataServer}/file/geojson/xizangyakou.json",
"symbol": {
"styleOptions": {
"image": "src/assets/images/Mars3DImg/marker/mark-red.png",
"image": "@/assets/images/Mars3DImg/marker/mark-red.png",
"scaleByDistance": true,
"scaleByDistance_far": 5000000,
"scaleByDistance_farValue": 0.5,
@ -620,7 +620,7 @@
"url": "{dataServer}/file/geojson/hfty-point.json",
"symbol": {
"styleOptions": {
"image": "src/assets/images/Mars3DImg/marker/mark-red.png",
"image": "@/assets/images/Mars3DImg/marker/mark-red.png",
"scale": 1,
"scaleByDistance": true,
"scaleByDistance_far": 20000,
@ -705,7 +705,7 @@
"symbol": {
"type": "billboardP",
"styleOptions": {
"image": "src/assets/images/Mars3DImg/marker/mark-red.png",
"image": "@/assets/images/Mars3DImg/marker/mark-red.png",
"scaleByDistance": true,
"scaleByDistance_far": 20000,
"scaleByDistance_farValue": 0.6,
@ -740,7 +740,7 @@
"symbol": {
"type": "billboardP",
"styleOptions": {
"image": "src/assets/images/Mars3DImg/marker/mark-blue.png",
"image": "@/assets/images/Mars3DImg/marker/mark-blue.png",
"scaleByDistance": true,
"scaleByDistance_far": 20000,
"scaleByDistance_farValue": 0.6,
@ -761,9 +761,9 @@
},
"styleField": "address",
"styleFieldOptions": {
"AB03": { "image": "src/assets/images/Mars3DImg/marker/mark-red.png" },
"A980": { "image": "src/assets/images/Mars3DImg/marker/mark-blue.png" },
"A900": { "image": "src/assets/images/Mars3DImg/marker/mark-green.png" }
"AB03": { "image": "@/assets/images/Mars3DImg/marker/mark-red.png" },
"A980": { "image": "@/assets/images/Mars3DImg/marker/mark-blue.png" },
"A900": { "image": "@/assets/images/Mars3DImg/marker/mark-green.png" }
}
},
"popup": "名称：{NAME}<br />地址：{address}",

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

@ -67,7 +67,7 @@
:class="{ 'active-card': active === item.id }"
@click="changeBaseMaps(item.id)"
>
<div><img class="icon" :src="`${item.options.icon || 'src/assets/images/Mars3DImg/basemaps/bingAerial.png'}`" /></div>
<div><img class="icon" :src="`${item.options.icon || '@/assets/images/Mars3DImg/basemaps/bingAerial.png'}`" /></div>
<div>{{ item.name }}</div>
</div>
</div>
@ -464,6 +464,10 @@ onMounted(async () => {
await initTree();
await getConfig();
});
// 查找图片资源
const getImageUrl = (url: string) => {
return new URL(`${url}`, import.meta.url).href;
};
// 展示保存的地图标绘配置
const showMapData = (arr: any) => {
console.log(arr);
@ -473,8 +477,8 @@ const showMapData = (arr: any) => {
// 地形开挖
const terrainClip = new mars3d.thing.TerrainClip({
diffHeight: item.attr.diffHeight, // 井的深度
image: "src/assets/images/Mars3DImg/textures/poly-stone.jpg",
imageBottom: "src/assets/images/Mars3DImg/textures/poly-soil.jpg",
image: "../../../assets/images/Mars3DImg/textures/poly-stone.jpg",
imageBottom: "../../../assets/images/Mars3DImg/textures/poly-soil.jpg",
splitNum: 80, // 井边界插值数
enabled: true
});
@ -572,6 +576,7 @@ const saveAnalysisLayer = async (subLayerData: any) => {
const geojson = subLayerData;
console.log(geojson);
let allArr = layerJsonArr.value.concat(geojson);
console.log(allArr);
let requestData: any = { configKey: "layerConfig", configValue: JSON.stringify(allArr) };
if (layerJsonArr.value.length > 0) {
requestData.configId = layerId.value;
@ -1161,7 +1166,7 @@ const addRandomGraphicByCount = (graphicLayer: any, position: any) => {
position: position,
style: {
html: ` <div class="mars3d-camera-content">
<img class="mars3d-camera-img" src="src/assets/images/icon/camera.svg" >
<img class="mars3d-camera-img" src="@/assets/images/icon/camera.svg" >
</div>
<div class="mars3d-camera-line" ></div>
<div class="mars3d-camera-point"></div>
@ -1948,7 +1953,7 @@ onUnmounted(() => {
position: absolute;
bottom: -39px;
left: -22px;
background: url("src/assets/images/icon/popupLbl.png") 0px 0px no-repeat;
background: url("@/assets/images/icon/popupLbl.png") 0px 0px no-repeat;
background-position: 0px 0px;
}

36
src/views/jxjview/configManagement/config.json
View File

@ -75,7 +75,7 @@
"id": 2021,
"pid": 10,
"name": "谷歌影像",
"icon": "src/assets/images/Mars3DImg/basemaps/google_img.png",
"icon": "@/assets/images/Mars3DImg/basemaps/google_img.png",
"type": "google",
"layer": "img_d",
"show": true
@ -83,7 +83,7 @@
{
"pid": 10,
"name": "天地图影像",
"icon": "src/assets/images/Mars3DImg/basemaps/tdt_img.png",
"icon": "@/assets/images/Mars3DImg/basemaps/tdt_img.png",
"type": "group",
"layers": [
{ "name": "底图", "type": "tdt", "layer": "img_d" },
@ -94,7 +94,7 @@
{
"pid": 10,
"name": "天地图电子",
"icon": "src/assets/images/Mars3DImg/basemaps/tdt_vec.png",
"icon": "@/assets/images/Mars3DImg/basemaps/tdt_vec.png",
"type": "group",
"layers": [
{ "name": "底图", "type": "tdt", "layer": "vec_d" },
@ -105,7 +105,7 @@
"pid": 10,
"name": "高德影像",
"type": "group",
"icon": "src/assets/images/Mars3DImg/basemaps/gaode_img.png",
"icon": "@/assets/images/Mars3DImg/basemaps/gaode_img.png",
"layers": [
{ "name": "底图", "type": "gaode", "layer": "img_d" },
{ "name": "注记", "type": "gaode", "layer": "img_z" }
@ -115,14 +115,14 @@
"pid": 10,
"name": "高德电子",
"type": "gaode",
"icon": "src/assets/images/Mars3DImg/basemaps/gaode_vec.png",
"icon": "@/assets/images/Mars3DImg/basemaps/gaode_vec.png",
"layer": "vec"
},
{
"pid": 10,
"name": "百度影像",
"type": "group",
"icon": "src/assets/images/Mars3DImg/basemaps/bd-img.png",
"icon": "@/assets/images/Mars3DImg/basemaps/bd-img.png",
"layers": [
{ "name": "底图", "type": "baidu", "layer": "img_d" },
{ "name": "注记", "type": "baidu", "layer": "img_z" }
@ -131,14 +131,14 @@
{
"pid": 10,
"name": "百度电子",
"icon": "src/assets/images/Mars3DImg/basemaps/bd-vec.png",
"icon": "@/assets/images/Mars3DImg/basemaps/bd-vec.png",
"type": "baidu",
"layer": "vec"
},
{
"pid": 10,
"name": "腾讯影像",
"icon": "src/assets/images/Mars3DImg/basemaps/tencent_img.png",
"icon": "@/assets/images/Mars3DImg/basemaps/tencent_img.png",
"type": "group",
"layers": [
{ "name": "底图", "type": "tencent", "layer": "img_d" },
@ -148,14 +148,14 @@
{
"pid": 10,
"name": "腾讯电子",
"icon": "src/assets/images/Mars3DImg/basemaps/tencent_vec.png",
"icon": "@/assets/images/Mars3DImg/basemaps/tencent_vec.png",
"type": "tencent",
"layer": "vec"
},
{
"pid": 10,
"name": "ArcGIS影像",
"icon": "src/assets/images/Mars3DImg/basemaps/esriWorldImagery.png",
"icon": "@/assets/images/Mars3DImg/basemaps/esriWorldImagery.png",
"type": "xyz",
"url": "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
"enablePickFeatures": false
@ -163,7 +163,7 @@
{
"pid": 10,
"name": "微软影像",
"icon": "src/assets/images/Mars3DImg/basemaps/bingAerial.png",
"icon": "@/assets/images/Mars3DImg/basemaps/bingAerial.png",
"type": "bing",
"layer": "Aerial"
},
@ -172,7 +172,7 @@
"pid": 10,
"name": "暗色底图",
"type": "gaode",
"icon": "src/assets/images/Mars3DImg/basemaps/blackMarble.png",
"icon": "@/assets/images/Mars3DImg/basemaps/blackMarble.png",
"layer": "vec",
"invertColor": true,
"filterColor": "#4e70a6",
@ -185,7 +185,7 @@
{
"pid": 10,
"name": "蓝色底图",
"icon": "src/assets/images/Mars3DImg/basemaps/bd-c-midnight.png",
"icon": "@/assets/images/Mars3DImg/basemaps/bd-c-midnight.png",
"type": "xyz",
"url": "http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}",
"chinaCRS": "GCJ02",
@ -194,7 +194,7 @@
{
"pid": 10,
"name": "黑色底图",
"icon": "src/assets/images/Mars3DImg/basemaps/bd-c-dark.png",
"icon": "@/assets/images/Mars3DImg/basemaps/bd-c-dark.png",
"type": "tencent",
"layer": "custom",
"style": "4"
@ -203,7 +203,7 @@
"pid": 10,
"name": "离线地图 (供参考)",
"type": "group",
"icon": "src/assets/images/Mars3DImg/basemaps/google_img.png",
"icon": "@/assets/images/Mars3DImg/basemaps/google_img.png",
"layers": [
{
"name": "全球",
@ -235,15 +235,15 @@
{
"pid": 10,
"name": "单张图片 (本地离线)",
"icon": "src/assets/images/Mars3DImg/basemaps/offline.png",
"icon": "@/assets/images/Mars3DImg/basemaps/offline.png",
"type": "image",
"url": "//data.mars3d.cn/filesrc/assets/images/Mars3DImg/world/world.jpg"
"url": "//data.mars3d.cn/file@/assets/images/Mars3DImg/world/world.jpg"
},
{
"id": 2023,
"pid": 10,
"name": "无底图",
"icon": "src/assets/images/Mars3DImg/basemaps/null.png",
"icon": "@/assets/images/Mars3DImg/basemaps/null.png",
"type": "grid",
"color": "#ffffff",
"alpha": 0.03,

72
src/views/jxjview/layerManagement/components/operateDialog.vue
View File

@ -157,10 +157,15 @@ const layerTypeList = ref([
{ label: "无底图", value: 16 }
]);
const layerTypeJson = ref([
{ name: "谷歌影像", icon: "src/assets/images/Mars3DImg/basemaps/google_img.png", type: "google", layer: "img_d" },
{
name: "谷歌影像",
icon: new URL("@/assets/images/Mars3DImg/basemaps/google_img.png", import.meta.url).href,
type: "google",
layer: "img_d"
},
{
name: "天地图影像",
icon: "src/assets/images/Mars3DImg/basemaps/tdt_img.png",
icon: new URL("@/assets/images/Mars3DImg/basemaps/tdt_img.png", import.meta.url).href,
type: "group",
layers: [
{ name: "底图", type: "tdt", layer: "img_d" },
@ -169,7 +174,7 @@ const layerTypeJson = ref([
},
{
name: "天地图电子",
icon: "src/assets/images/Mars3DImg/basemaps/tdt_vec.png",
icon: new URL("@/assets/images/Mars3DImg/basemaps/tdt_vec.png", import.meta.url).href,
type: "group",
layers: [
{ name: "底图", type: "tdt", layer: "vec_d" },
@ -179,45 +184,65 @@ const layerTypeJson = ref([
{
name: "高德影像",
type: "group",
icon: "src/assets/images/Mars3DImg/basemaps/gaode_img.png",
icon: new URL("@/assets/images/Mars3DImg/basemaps/gaode_img.png", import.meta.url).href,
layers: [
{ name: "底图", type: "gaode", layer: "img_d" },
{ name: "注记", type: "gaode", layer: "img_z" }
]
},
{ name: "高德电子", type: "gaode", icon: "src/assets/images/Mars3DImg/basemaps/gaode_vec.png", layer: "vec" },
{
name: "高德电子",
type: "gaode",
icon: new URL("@/assets/images/Mars3DImg/basemaps/gaode_vec.png", import.meta.url).href,
layer: "vec"
},
{
name: "百度影像",
type: "group",
icon: "src/assets/images/Mars3DImg/basemaps/bd-img.png",
icon: new URL("@/assets/images/Mars3DImg/basemaps/bd-img.png", import.meta.url).href,
layers: [
{ name: "底图", type: "baidu", layer: "img_d" },
{ name: "注记", type: "baidu", layer: "img_z" }
]
},
{ name: "百度电子", icon: "src/assets/images/Mars3DImg/basemaps/bd-vec.png", type: "baidu", layer: "vec" },
{
name: "百度电子",
icon: new URL("@/assets/images/Mars3DImg/basemaps/bd-vec.png", import.meta.url).href,
type: "baidu",
layer: "vec"
},
{
name: "腾讯影像",
icon: "src/assets/images/Mars3DImg/basemaps/tencent_img.png",
icon: new URL("@/assets/images/Mars3DImg/basemaps/tencent_img.png", import.meta.url).href,
type: "group",
layers: [
{ name: "底图", type: "tencent", layer: "img_d" },
{ name: "注记", type: "tencent", layer: "img_z" }
]
},
{ name: "腾讯电子", icon: "src/assets/images/Mars3DImg/basemaps/tencent_vec.png", type: "tencent", layer: "vec" },
{
name: "腾讯电子",
icon: new URL("@/assets/images/Mars3DImg/basemaps/tencent_vec.png", import.meta.url).href,
type: "tencent",
layer: "vec"
},
{
name: "ArcGIS影像",
icon: "src/assets/images/Mars3DImg/basemaps/esriWorldImagery.png",
icon: new URL("@/assets/images/Mars3DImg/basemaps/esriWorldImagery.png", import.meta.url).href,
type: "xyz",
url: "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
enablePickFeatures: false
},
{ name: "微软影像", icon: "src/assets/images/Mars3DImg/basemaps/bingAerial.png", type: "bing", layer: "Aerial" },
{
name: "微软影像",
icon: new URL("@/assets/images/Mars3DImg/basemaps/bingAerial.png", import.meta.url).href,
type: "bing",
layer: "Aerial"
},
{
name: "暗色底图",
type: "gaode",
icon: "src/assets/images/Mars3DImg/basemaps/blackMarble.png",
icon: new URL("@/assets/images/Mars3DImg/basemaps/blackMarble.png", import.meta.url).href,
layer: "vec",
invertColor: true,
filterColor: "#4e70a6",
@ -229,17 +254,23 @@ const layerTypeJson = ref([
},
{
name: "蓝色底图",
icon: "src/assets/images/Mars3DImg/basemaps/bd-c-midnight.png",
icon: new URL("@/assets/images/Mars3DImg/basemaps/bd-c-midnight.png", import.meta.url).href,
type: "xyz",
url: "http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}",
chinaCRS: "GCJ02",
enablePickFeatures: false
},
{ name: "黑色底图", icon: "src/assets/images/Mars3DImg/basemaps/bd-c-dark.png", type: "tencent", layer: "custom", style: "4" },
{
name: "黑色底图",
icon: new URL("@/assets/images/Mars3DImg/basemaps/bd-c-dark.png", import.meta.url).href,
type: "tencent",
layer: "custom",
style: "4"
},
{
name: "离线地图 (供参考)",
type: "group",
icon: "src/assets/images/Mars3DImg/basemaps/google_img.png",
icon: new URL("@/assets/images/Mars3DImg/basemaps/google_img.png", import.meta.url).href,
layers: [
{
name: "全球",
@ -270,11 +301,18 @@ const layerTypeJson = ref([
},
{
name: "单张图片 (本地离线)",
icon: "src/assets/images/Mars3DImg/basemaps/offline.png",
icon: new URL("@/assets/images/Mars3DImg/basemaps/offline.png", import.meta.url).href,
type: "image",
url: "//data.mars3d.cn/filesrc/assets/images/Mars3DImg/world/world.jpg"
},
{ name: "无底图", icon: "src/assets/images/Mars3DImg/basemaps/null.png", type: "grid", color: "#ffffff", alpha: 0.03, cells: 2 }
{
name: "无底图",
icon: new URL("@/assets/images/Mars3DImg/basemaps/null.png", import.meta.url).href,
type: "grid",
color: "#ffffff",
alpha: 0.03,
cells: 2
}
]);
const props = defineProps({
operateVisible: Boolean,