diff --git a/dist/index.html b/dist/index.html
index 814f942..b783b61 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -1,4 +1,4 @@
-
diff --git a/src/views/goverment/largeScreen/index.vue b/src/views/goverment/largeScreen/index.vue
index 75ffcb7..335b8e9 100644
--- a/src/views/goverment/largeScreen/index.vue
+++ b/src/views/goverment/largeScreen/index.vue
@@ -74,7 +74,7 @@
:class="{ 'active-card': active === item.id }"
@click="changeBaseMaps(item.id)"
>
-
+
{{ item.name }}
@@ -847,11 +847,14 @@ const screenComparison = () => {
};
// 修改卷帘右侧图层
const changeRight = (e: any) => {
- mapSplit.rightLayer = [layersObj[e]];
+ // mapSplit.rightLayer = [layersObj[e]];
+ mapSplit.setOptions({
+ rightLayer: [layersObj[rollerVal.value.rightRollerVal]],
+ leftLayer: [layersObj[rollerVal.value.leftRollerVal]]
+ });
leftRollerList.value = baseMaps.value.filter((item: any) => {
return item.id != rollerVal.value.rightRollerVal;
});
- console.log(mapSplit.rightLayer);
console.log(layersObj);
console.log(e);
// mapSplit.setOptions({
@@ -861,7 +864,11 @@ const changeRight = (e: any) => {
};
// 修改卷帘左侧图层
const changeLeft = (e: any) => {
- mapSplit.leftLayer = [layersObj[e]];
+ // mapSplit.leftLayer = [layersObj[e]];
+ mapSplit.setOptions({
+ rightLayer: [layersObj[rollerVal.value.rightRollerVal]],
+ leftLayer: [layersObj[rollerVal.value.leftRollerVal]]
+ });
rightRollerList.value = baseMaps.value.filter((item: any) => {
return item.id != rollerVal.value.leftRollerVal;
});
@@ -1391,8 +1398,6 @@ const getBasicMaps = async () => {
if (m.isAdded && m.show) {
active.value = m.id;
}
- m.options.icon = new URL(m.options.icon, import.meta.url).href;
- console.log(m, "-------icon");
return {
name: m.name,
id: m.id,
diff --git a/src/views/jxjview/layerManagement/components/operateDialog.vue b/src/views/jxjview/layerManagement/components/operateDialog.vue
index 8d4e812..de29c7d 100644
--- a/src/views/jxjview/layerManagement/components/operateDialog.vue
+++ b/src/views/jxjview/layerManagement/components/operateDialog.vue
@@ -157,18 +157,18 @@ const layerTypeList = ref([
{ label: "无底图", value: 16 }
]);
function getImageUrl(name: string) {
- return new URL(`../../../../assets/images/Mars3DImg/${name}` + ".png", import.meta.url).href;
+ return new URL(`../../../../assets/images/Mars3DImg/${name}`, import.meta.url).href;
}
const layerTypeJson = ref([
{
name: "谷歌影像",
- icon: "@/assets/images/Mars3DImg/basemaps/tdt_img.png",
+ icon: getImageUrl("basemaps/google_img.png"),
type: "google",
layer: "img_d"
},
{
name: "天地图影像",
- icon: "@/assets/images/Mars3DImg/basemaps/tdt_img.png",
+ icon: getImageUrl("basemaps/tdt_img.png"),
type: "group",
layers: [
{ name: "底图", type: "tdt", layer: "img_d" },
@@ -177,7 +177,7 @@ const layerTypeJson = ref([
},
{
name: "天地图电子",
- icon: "@/assets/images/Mars3DImg/basemaps/tdt_vec.png",
+ icon: getImageUrl("basemaps/tdt_vec.png"),
type: "group",
layers: [
{ name: "底图", type: "tdt", layer: "vec_d" },
@@ -187,7 +187,7 @@ const layerTypeJson = ref([
{
name: "高德影像",
type: "group",
- icon: "@/assets/images/Mars3DImg/basemaps/gaode_img.png",
+ icon: getImageUrl("basemaps/gaode_img.png"),
layers: [
{ name: "底图", type: "gaode", layer: "img_d" },
{ name: "注记", type: "gaode", layer: "img_z" }
@@ -196,13 +196,13 @@ const layerTypeJson = ref([
{
name: "高德电子",
type: "gaode",
- icon: "@/assets/images/Mars3DImg/basemaps/gaode_vec.png",
+ icon: getImageUrl("basemaps/gaode_vec.png"),
layer: "vec"
},
{
name: "百度影像",
type: "group",
- icon: "@/assets/images/Mars3DImg/basemaps/bd-img.png",
+ icon: getImageUrl("basemaps/bd-img.png"),
layers: [
{ name: "底图", type: "baidu", layer: "img_d" },
{ name: "注记", type: "baidu", layer: "img_z" }
@@ -210,13 +210,13 @@ const layerTypeJson = ref([
},
{
name: "百度电子",
- icon: "@/assets/images/Mars3DImg/basemaps/bd-vec.png",
+ icon: getImageUrl("basemaps/bd-vec.png"),
type: "baidu",
layer: "vec"
},
{
name: "腾讯影像",
- icon: "@/assets/images/Mars3DImg/basemaps/tencent_img.png",
+ icon: getImageUrl("basemaps/tencent_img.png"),
type: "group",
layers: [
{ name: "底图", type: "tencent", layer: "img_d" },
@@ -225,27 +225,27 @@ const layerTypeJson = ref([
},
{
name: "腾讯电子",
- icon: "@/assets/images/Mars3DImg/basemaps/tencent_vec.png",
+ icon: getImageUrl("basemaps/tencent_vec.png"),
type: "tencent",
layer: "vec"
},
{
name: "ArcGIS影像",
- icon: "@/assets/images/Mars3DImg/basemaps/esriWorldImagery.png",
+ icon: getImageUrl("basemaps/esriWorldImagery.png"),
type: "xyz",
url: "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}",
enablePickFeatures: false
},
{
name: "微软影像",
- icon: "@/assets/images/Mars3DImg/basemaps/bingAerial.png",
+ icon: getImageUrl("basemaps/bingAerial.png"),
type: "bing",
layer: "Aerial"
},
{
name: "暗色底图",
type: "gaode",
- icon: "@/assets/images/Mars3DImg/basemaps/blackMarble.png",
+ icon: getImageUrl("basemaps/blackMarble.png"),
layer: "vec",
invertColor: true,
filterColor: "#4e70a6",
@@ -257,7 +257,7 @@ const layerTypeJson = ref([
},
{
name: "蓝色底图",
- icon: "@/assets/images/Mars3DImg/basemaps/bd-c-midnight.png",
+ icon: getImageUrl("basemaps/bd-c-midnight.png"),
type: "xyz",
url: "http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}",
chinaCRS: "GCJ02",
@@ -265,7 +265,7 @@ const layerTypeJson = ref([
},
{
name: "黑色底图",
- icon: "@/assets/images/Mars3DImg/basemaps/bd-c-dark.png",
+ icon: getImageUrl("basemaps/bd-c-dark.png"),
type: "tencent",
layer: "custom",
style: "4"
@@ -273,7 +273,7 @@ const layerTypeJson = ref([
{
name: "离线地图 (供参考)",
type: "group",
- icon: "@/assets/images/Mars3DImg/basemaps/google_img.png",
+ icon: getImageUrl("google_img.png"),
layers: [
{
name: "全球",
@@ -304,13 +304,13 @@ const layerTypeJson = ref([
},
{
name: "单张图片 (本地离线)",
- icon: "@/assets/images/Mars3DImg/basemaps/offline.png",
+ icon: getImageUrl("basemaps/offline.png"),
type: "image",
- url: "@/assets/images/Mars3DImg/basemaps/offline.png"
+ url: getImageUrl("basemaps/offline.png")
},
{
name: "无底图",
- icon: "@/assets/images/Mars3DImg/basemaps/null.png",
+ icon: getImageUrl("basemaps/null.png"),
type: "grid",
color: "#ffffff",
alpha: 0.03,