diff --git a/SuperMap iEarth/public/locale/en.js b/SuperMap iEarth/public/locale/en.js index 3ba0e517..1fb6469d 100644 --- a/SuperMap iEarth/public/locale/en.js +++ b/SuperMap iEarth/public/locale/en.js @@ -675,6 +675,9 @@ const local_en = { qxLayerDataUrl: 'Please enter the data service URL for this layer', qxLayerDataSource: 'Please enter the data source corresponding to this layer', qxLayerDataset: 'Please enter the data set corresponding to this layer', + qxCover: 'map overlay tilt', + selectQxLayer: 'Select the tilt layer', + cover: 'Overlay', education: "SuperMap Education", urlChecedFail:"Url verification failed, please enter the correct address", appointSceneName:'Specify scene name', diff --git a/SuperMap iEarth/public/locale/ja.js b/SuperMap iEarth/public/locale/ja.js index 570a608e..d6cd7e9b 100644 --- a/SuperMap iEarth/public/locale/ja.js +++ b/SuperMap iEarth/public/locale/ja.js @@ -675,6 +675,9 @@ const local_ja = { qxLayerDataUrl: 'このレイヤーのデータ サービス URL を入力してください', qxLayerDataSource: 'このレイヤーに対応するデータ ソースを入力してください', qxLayerDataset: 'このレイヤーに対応するデータセットを入力してください', + qxCover: '地図オーバーレイの傾き', + selectQxLayer: '傾斜レイヤーを選択します', + cover: 'かぶせる', education: "教育版", urlChecedFail:"Urlチェックに失敗しました。正しいアドレスを入力してください", appointSceneName:'シーン名の指定', diff --git a/SuperMap iEarth/public/locale/ru.js b/SuperMap iEarth/public/locale/ru.js index a50d99e0..92eeffad 100644 --- a/SuperMap iEarth/public/locale/ru.js +++ b/SuperMap iEarth/public/locale/ru.js @@ -675,6 +675,9 @@ const local_ru = { qxLayerDataUrl: 'Введите URL-адрес службы данных для этого слоя.', qxLayerDataSource: 'Пожалуйста, введите источник данных, соответствующий этому слою', qxLayerDataset: 'Пожалуйста, введите набор данных, соответствующий этому слою', + qxCover: 'наклон наложения карты', + selectQxLayer: 'Выберите слой наклона', + cover: 'Наложение', education: "обучать", urlChecedFail:"Ошибка проверки Url, введите правильный адрес", appointSceneName:'Укажите имя сцены', diff --git a/SuperMap iEarth/public/locale/zh.js b/SuperMap iEarth/public/locale/zh.js index 5cc8484b..fcb17c60 100644 --- a/SuperMap iEarth/public/locale/zh.js +++ b/SuperMap iEarth/public/locale/zh.js @@ -675,6 +675,9 @@ const local_zh = { qxLayerDataUrl: '请输入该图层的数据服务URL', qxLayerDataSource: '请输入该图层对应的数据源', qxLayerDataset: '请输入该图层对应的数据集', + qxCover: '地图叠加倾斜', + selectQxLayer: '选择倾斜图层', + cover: '叠加', education: "教育版", urlChecedFail:"Url校验失败,请输入正确地址", appointSceneName:'指定场景名称', diff --git a/SuperMap iEarth/src/assets/icons/demo_index.html b/SuperMap iEarth/src/assets/icons/demo_index.html index 57932adb..ca75716b 100644 --- a/SuperMap iEarth/src/assets/icons/demo_index.html +++ b/SuperMap iEarth/src/assets/icons/demo_index.html @@ -54,6 +54,90 @@
@font-face@font-face {
font-family: 'iconfont';
- src: url('iconfont.woff2?t=1710320050582') format('woff2'),
- url('iconfont.woff?t=1710320050582') format('woff'),
- url('iconfont.ttf?t=1710320050582') format('truetype');
+ src: url('iconfont.woff2?t=1713757391644') format('woff2'),
+ url('iconfont.woff?t=1713757391644') format('woff'),
+ url('iconfont.ttf?t=1713757391644') format('truetype');
}
第二步:定义使用 iconfont 的样式
@@ -1204,6 +1264,132 @@ 第三步:挑选相应图标并获取字体编码,应用于页面
+ -
+
+
+ 地图叠加倾斜
+
+ .iconditudiejiaqingxie
+
+
+
+ -
+
+
+ 填挖方分析
+
+ .icontianwafangfenxi
+
+
+
+ -
+
+
+ 日照分析
+
+ .iconrizhaofenxi
+
+
+
+ -
+
+
+ 模型库
+
+ .iconmoxingku1
+
+
+
+ -
+
+
+ 素材库
+
+ .iconsucaiku
+
+
+
+ -
+
+
+ 打开
+
+ .icondakai
+
+
+
+ -
+
+
+ 文件列表
+
+ .iconwenjianliebiao
+
+
+
+ -
+
+
+ 面
+
+ .iconmian
+
+
+
+ -
+
+
+ 点
+
+ .icondian
+
+
+
+ -
+
+
+ 线
+
+ .iconxian
+
+
+
+ -
+
+
+ 点选
+
+ .icondianxuan
+
+
+
+ -
+
+
+ 用户
+
+ .iconyonghu
+
+
+
+ -
+
+
+ 新建数据
+
+ .iconxinjianshuju
+
+
+
+ -
+
+
+ 新建方案
+
+ .iconxinjianfangan
+
+
+
-
@@ -1717,15 +1903,6 @@
第三步:挑选相应图标并获取字体编码,应用于页面
- -
-
-
- 模型库
-
- .iconmoxingku
-
-
-
-
@@ -1843,15 +2020,6 @@
第三步:挑选相应图标并获取字体编码,应用于页面
- -
-
-
- 视图切换
-
- .iconshituqiehuan
-
-
-
-
@@ -1870,15 +2038,6 @@
第三步:挑选相应图标并获取字体编码,应用于页面
- -
-
-
- 点选
-
- .icondianxuan
-
-
-
-
@@ -2185,15 +2344,6 @@
第三步:挑选相应图标并获取字体编码,应用于页面
- -
-
-
- user
-
- .iconuser
-
-
-
-
@@ -2591,11 +2741,11 @@
第三步:挑选相应图标并获取字体编码,应用于页面
-
-
+
- 新建方案
+ 添加方案
- .iconxinjianfangan
+ .icontianjiafangan
@@ -2887,6 +3037,118 @@
第二步:挑选相应图标并获取类名,应用于页面:
+ -
+
+ 地图叠加倾斜
+ #iconditudiejiaqingxie
+
+
+ -
+
+ 填挖方分析
+ #icontianwafangfenxi
+
+
+ -
+
+ 日照分析
+ #iconrizhaofenxi
+
+
+ -
+
+ 模型库
+ #iconmoxingku1
+
+
+ -
+
+ 素材库
+ #iconsucaiku
+
+
+ -
+
+ 打开
+ #icondakai
+
+
+ -
+
+ 文件列表
+ #iconwenjianliebiao
+
+
+ -
+
+ 面
+ #iconmian
+
+
+ -
+
+ 点
+ #icondian
+
+
+ -
+
+ 线
+ #iconxian
+
+
+ -
+
+ 点选
+ #icondianxuan
+
+
+ -
+
+ 用户
+ #iconyonghu
+
+
+ -
+
+ 新建数据
+ #iconxinjianshuju
+
+
+ -
+
+ 新建方案
+ #iconxinjianfangan
+
+
-
- -
-
- 模型库
- #iconmoxingku
-
-
-
- -
-
- 视图切换
- #iconshituqiehuan
-
-
-
-
-
-
- 点选
- #icondianxuan
-
-
-
- -
-
- user
- #iconuser
-
-
-
-
diff --git a/SuperMap iEarth/src/assets/icons/iconfont.css b/SuperMap iEarth/src/assets/icons/iconfont.css
index 6ea6db92..7e5c52cd 100644
--- a/SuperMap iEarth/src/assets/icons/iconfont.css
+++ b/SuperMap iEarth/src/assets/icons/iconfont.css
@@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 2397568 */
- src: url('iconfont.woff2?t=1710320050582') format('woff2'),
- url('iconfont.woff?t=1710320050582') format('woff'),
- url('iconfont.ttf?t=1710320050582') format('truetype');
+ src: url('iconfont.woff2?t=1713757391644') format('woff2'),
+ url('iconfont.woff?t=1713757391644') format('woff'),
+ url('iconfont.ttf?t=1713757391644') format('truetype');
}
.iconfont {
@@ -13,6 +13,62 @@
-moz-osx-font-smoothing: grayscale;
}
+.iconditudiejiaqingxie:before {
+ content: "\e8a4";
+}
+
+.icontianwafangfenxi:before {
+ content: "\e8e4";
+}
+
+.iconrizhaofenxi:before {
+ content: "\e8e3";
+}
+
+.iconmoxingku1:before {
+ content: "\e8e2";
+}
+
+.iconsucaiku:before {
+ content: "\e8e1";
+}
+
+.icondakai:before {
+ content: "\e8e0";
+}
+
+.iconwenjianliebiao:before {
+ content: "\e8df";
+}
+
+.iconmian:before {
+ content: "\e8dc";
+}
+
+.icondian:before {
+ content: "\e8dd";
+}
+
+.iconxian:before {
+ content: "\e8de";
+}
+
+.icondianxuan:before {
+ content: "\e891";
+}
+
+.iconyonghu:before {
+ content: "\e8db";
+}
+
+.iconxinjianshuju:before {
+ content: "\e899";
+}
+
+.iconxinjianfangan:before {
+ content: "\e8da";
+}
+
.icontianjiameitiziduan:before {
content: "\e8d8";
}
@@ -241,10 +297,6 @@
content: "\e8a3";
}
-.iconmoxingku:before {
- content: "\e8a4";
-}
-
.iconshuding:before {
content: "\e89e";
}
@@ -297,10 +349,6 @@
content: "\e898";
}
-.iconshituqiehuan:before {
- content: "\e899";
-}
-
.icontoushitu:before {
content: "\e89a";
}
@@ -309,10 +357,6 @@
content: "\e89b";
}
-.icondianxuan:before {
- content: "\e891";
-}
-
.icondituchaxun:before {
content: "\e88f";
}
@@ -449,10 +493,6 @@
content: "\e86e";
}
-.iconuser:before {
- content: "\e86f";
-}
-
.iconcegao:before {
content: "\e836";
}
@@ -629,7 +669,7 @@
content: "\e84c";
}
-.iconxinjianfangan:before {
+.icontianjiafangan:before {
content: "\e84d";
}
diff --git a/SuperMap iEarth/src/assets/icons/iconfont.js b/SuperMap iEarth/src/assets/icons/iconfont.js
index 5289e80b..b25472b4 100644
--- a/SuperMap iEarth/src/assets/icons/iconfont.js
+++ b/SuperMap iEarth/src/assets/icons/iconfont.js
@@ -1 +1 @@
-window._iconfont_svg_string_2397568='
',function(h){var a=(a=document.getElementsByTagName("script"))[a.length-1],l=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var i,o,t,z,v,m=function(a,l){l.parentNode.insertBefore(a,l)};if(l&&!h.__iconfont__svg__cssinject__){h.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}i=function(){var a,l=document.createElement("div");l.innerHTML=h._iconfont_svg_string_2397568,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?m(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(i,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),i()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(t=i,z=h.document,v=!1,d(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,p())})}function p(){v||(v=!0,t())}function d(){try{z.documentElement.doScroll("left")}catch(a){return void setTimeout(d,50)}p()}}(window);
\ No newline at end of file
+window._iconfont_svg_string_2397568=' ',function(h){var a=(a=document.getElementsByTagName("script"))[a.length-1],l=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var i,o,t,z,v,m=function(a,l){l.parentNode.insertBefore(a,l)};if(l&&!h.__iconfont__svg__cssinject__){h.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}i=function(){var a,l=document.createElement("div");l.innerHTML=h._iconfont_svg_string_2397568,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?m(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(i,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),i()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(t=i,z=h.document,v=!1,d(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,p())})}function p(){v||(v=!0,t())}function d(){try{z.documentElement.doScroll("left")}catch(a){return void setTimeout(d,50)}p()}}(window);
\ No newline at end of file
diff --git a/SuperMap iEarth/src/assets/icons/iconfont.json b/SuperMap iEarth/src/assets/icons/iconfont.json
index e986a8d7..935255f6 100644
--- a/SuperMap iEarth/src/assets/icons/iconfont.json
+++ b/SuperMap iEarth/src/assets/icons/iconfont.json
@@ -5,6 +5,104 @@
"css_prefix_text": "icon",
"description": "",
"glyphs": [
+ {
+ "icon_id": "40001124",
+ "name": "地图叠加倾斜",
+ "font_class": "ditudiejiaqingxie",
+ "unicode": "e8a4",
+ "unicode_decimal": 59556
+ },
+ {
+ "icon_id": "39965842",
+ "name": "填挖方分析",
+ "font_class": "tianwafangfenxi",
+ "unicode": "e8e4",
+ "unicode_decimal": 59620
+ },
+ {
+ "icon_id": "39965809",
+ "name": "日照分析",
+ "font_class": "rizhaofenxi",
+ "unicode": "e8e3",
+ "unicode_decimal": 59619
+ },
+ {
+ "icon_id": "39944241",
+ "name": "模型库",
+ "font_class": "moxingku1",
+ "unicode": "e8e2",
+ "unicode_decimal": 59618
+ },
+ {
+ "icon_id": "39944279",
+ "name": "素材库",
+ "font_class": "sucaiku",
+ "unicode": "e8e1",
+ "unicode_decimal": 59617
+ },
+ {
+ "icon_id": "39867196",
+ "name": "打开",
+ "font_class": "dakai",
+ "unicode": "e8e0",
+ "unicode_decimal": 59616
+ },
+ {
+ "icon_id": "39865762",
+ "name": "文件列表",
+ "font_class": "wenjianliebiao",
+ "unicode": "e8df",
+ "unicode_decimal": 59615
+ },
+ {
+ "icon_id": "39642570",
+ "name": "面",
+ "font_class": "mian",
+ "unicode": "e8dc",
+ "unicode_decimal": 59612
+ },
+ {
+ "icon_id": "39642568",
+ "name": "点",
+ "font_class": "dian",
+ "unicode": "e8dd",
+ "unicode_decimal": 59613
+ },
+ {
+ "icon_id": "39642569",
+ "name": "线",
+ "font_class": "xian",
+ "unicode": "e8de",
+ "unicode_decimal": 59614
+ },
+ {
+ "icon_id": "39635383",
+ "name": "点选",
+ "font_class": "dianxuan",
+ "unicode": "e891",
+ "unicode_decimal": 59537
+ },
+ {
+ "icon_id": "39635191",
+ "name": "用户",
+ "font_class": "yonghu",
+ "unicode": "e8db",
+ "unicode_decimal": 59611
+ },
+ {
+ "icon_id": "39632360",
+ "name": "新建数据",
+ "font_class": "xinjianshuju",
+ "unicode": "e899",
+ "unicode_decimal": 59545
+ },
+ {
+ "icon_id": "39632359",
+ "name": "新建方案",
+ "font_class": "xinjianfangan",
+ "unicode": "e8da",
+ "unicode_decimal": 59610
+ },
{
"icon_id": "39537874",
"name": "添加媒体字段",
@@ -404,13 +502,6 @@
"unicode": "e8a3",
"unicode_decimal": 59555
},
- {
- "icon_id": "38501417",
- "name": "模型库",
- "font_class": "moxingku",
- "unicode": "e8a4",
- "unicode_decimal": 59556
- },
{
"icon_id": "38465488",
"name": "书钉",
@@ -502,13 +593,6 @@
"unicode": "e898",
"unicode_decimal": 59544
},
- {
- "icon_id": "38262924",
- "name": "视图切换",
- "font_class": "shituqiehuan",
- "unicode": "e899",
- "unicode_decimal": 59545
- },
{
"icon_id": "38262925",
"name": "透视图",
@@ -523,13 +607,6 @@
"unicode": "e89b",
"unicode_decimal": 59547
},
- {
- "icon_id": "37097694",
- "name": "点选",
- "font_class": "dianxuan",
- "unicode": "e891",
- "unicode_decimal": 59537
- },
{
"icon_id": "37088950",
"name": "地图查询",
@@ -768,13 +845,6 @@
"unicode": "e86e",
"unicode_decimal": 59502
},
- {
- "icon_id": "36023517",
- "name": "user",
- "font_class": "user",
- "unicode": "e86f",
- "unicode_decimal": 59503
- },
{
"icon_id": "35253719",
"name": "测高",
@@ -1085,8 +1155,8 @@
},
{
"icon_id": "35253505",
- "name": "新建方案",
- "font_class": "xinjianfangan",
+ "name": "添加方案",
+ "font_class": "tianjiafangan",
"unicode": "e84d",
"unicode_decimal": 59469
},
diff --git a/SuperMap iEarth/src/assets/icons/iconfont.ttf b/SuperMap iEarth/src/assets/icons/iconfont.ttf
index 4ec69257..59f71679 100644
Binary files a/SuperMap iEarth/src/assets/icons/iconfont.ttf and b/SuperMap iEarth/src/assets/icons/iconfont.ttf differ
diff --git a/SuperMap iEarth/src/assets/icons/iconfont.woff b/SuperMap iEarth/src/assets/icons/iconfont.woff
index 9cd41501..1cda0b64 100644
Binary files a/SuperMap iEarth/src/assets/icons/iconfont.woff and b/SuperMap iEarth/src/assets/icons/iconfont.woff differ
diff --git a/SuperMap iEarth/src/assets/icons/iconfont.woff2 b/SuperMap iEarth/src/assets/icons/iconfont.woff2
index be8c5a11..b483ec16 100644
Binary files a/SuperMap iEarth/src/assets/icons/iconfont.woff2 and b/SuperMap iEarth/src/assets/icons/iconfont.woff2 differ
diff --git a/SuperMap iEarth/src/package/layerSeries/qx-cover/index.ts b/SuperMap iEarth/src/package/layerSeries/qx-cover/index.ts
new file mode 100644
index 00000000..4889811d
--- /dev/null
+++ b/SuperMap iEarth/src/package/layerSeries/qx-cover/index.ts
@@ -0,0 +1,3 @@
+import qxCover from './qxCover.vue';
+
+export default qxCover;
diff --git a/SuperMap iEarth/src/package/layerSeries/qx-cover/qxCover.vue b/SuperMap iEarth/src/package/layerSeries/qx-cover/qxCover.vue
new file mode 100644
index 00000000..c0942b89
--- /dev/null
+++ b/SuperMap iEarth/src/package/layerSeries/qx-cover/qxCover.vue
@@ -0,0 +1,134 @@
+
+
+
+ {{ $t("selectQxLayer") }}
+
+
+
+
+ {{ $t("transparency") }}
+
+
+
+
+ {{ $t("cover") }}
+ {{ $t("clear") }}
+
+
+
+
+
diff --git a/SuperMap iEarth/src/package/layerTree/layerTree.vue b/SuperMap iEarth/src/package/layerTree/layerTree.vue
index 53e532d4..f3946eb4 100644
--- a/SuperMap iEarth/src/package/layerTree/layerTree.vue
+++ b/SuperMap iEarth/src/package/layerTree/layerTree.vue
@@ -166,6 +166,11 @@ function setOptionsByType(type: string) {
key: 11,
icon: () => h("i", { class: "iconfont icondituchaxun" }, ""),
},
+ {
+ label: $t("qxCover"),
+ key: 72,
+ icon: () => h("i", { class: "iconfont iconditudiejiaqingxie" }, ""),
+ },
{
label: $t("rename"),
key: 0,
@@ -264,7 +269,8 @@ function setLayerShow(option: any) {
// 下拉列表操作
function setDropdownAction(option: any, key: number) {
// key为1:定位,key为2:删除图层
- layerStore.s3mLayerSelectIndex = option.key.split("-")[1];
+ layerStore.s3mLayerSelectIndex = option.key.split("-")[1]; // 获取当前所选s3m图层索引
+ layerStore.imgLayerSelectIndex = option.key.split("-")[1]; // 获取当前所选影像图层索引
if (key === 0) {
option.isedit = true;
nextTick(() => {
@@ -377,6 +383,8 @@ function setDropdownAction(option: any, key: number) {
panelStore.setRightToolBarList({ id: 11 });
} else if (key === 12) {
panelStore.setRightToolBarList({ id: 12 });
+ }else if (key === 72) {
+ panelStore.setRightToolBarList({ id: 13 });
}
}
diff --git a/SuperMap iEarth/src/store/layerStore/layer.ts b/SuperMap iEarth/src/store/layerStore/layer.ts
index 7fb88db8..9633a96c 100644
--- a/SuperMap iEarth/src/store/layerStore/layer.ts
+++ b/SuperMap iEarth/src/store/layerStore/layer.ts
@@ -47,6 +47,7 @@ export const useLayerStore = defineStore({
skyBoxShow: false, // 是否显示天空盒
layerChangeCount: 0, // 图层一旦改变,改值++,通常用于监听图层变化
s3mLayerSelectIndex: 0, // 当前选择的s3m图层索引
+ imgLayerSelectIndex: 0, // 当前选择的影像图层索引
layerQueryOptions: [], // s3m图层属性查询
mapQueryOptions: [], // 地图查询保存
mediaFeildOptions: { // 地图查询-媒体字段保存
diff --git a/SuperMap iEarth/src/store/panelStore/index.ts b/SuperMap iEarth/src/store/panelStore/index.ts
index 93eb5745..58cc8af4 100644
--- a/SuperMap iEarth/src/store/panelStore/index.ts
+++ b/SuperMap iEarth/src/store/panelStore/index.ts
@@ -93,6 +93,13 @@ export const usePanelStore = defineStore({
isSelected: false,
panelName: "qxSingle"
},
+ {
+ id: 13,
+ iconName: "iconhuizhi",
+ title: "qxCover",
+ isSelected: false,
+ panelName: "qxCover"
+ },
]
},
rightTooPanel: false,
diff --git a/SuperMap iEarth/src/views/panel/index.vue b/SuperMap iEarth/src/views/panel/index.vue
index 198d0acb..2cb3d8e4 100644
--- a/SuperMap iEarth/src/views/panel/index.vue
+++ b/SuperMap iEarth/src/views/panel/index.vue
@@ -94,6 +94,11 @@
v-if="panelStore.panelList.rightToolBarList[9].isSelected"
>{{ $t("qxSingle") }}
+ {{ $t("qxCover") }}
@@ -134,6 +139,9 @@
+
@@ -163,6 +171,7 @@ import LayerStyle from "@/package/layerSeries/layer-style/index";
import LayerQuery from "@/package/layerSeries/layer-query/index";
import MapQuery from "@/package/layerSeries/map-query/index";
import QxSingle from "@/package/layerSeries/qx-single/index";
+import QxCover from "@/package/layerSeries/qx-cover/index";
import { usePanelStore } from "@/store/index";