diff --git a/SuperMap iEarth/public/locale/en.js b/SuperMap iEarth/public/locale/en.js index 5c6e96d8..3ba0e517 100644 --- a/SuperMap iEarth/public/locale/en.js +++ b/SuperMap iEarth/public/locale/en.js @@ -675,7 +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', - education: "SuperMap Education" + education: "SuperMap Education", + urlChecedFail:"Url verification failed, please enter the correct address", + appointSceneName:'Specify scene name', } window.local_en = local_en; \ No newline at end of file diff --git a/SuperMap iEarth/public/locale/ja.js b/SuperMap iEarth/public/locale/ja.js index eca4755d..570a608e 100644 --- a/SuperMap iEarth/public/locale/ja.js +++ b/SuperMap iEarth/public/locale/ja.js @@ -675,7 +675,9 @@ const local_ja = { qxLayerDataUrl: 'このレイヤーのデータ サービス URL を入力してください', qxLayerDataSource: 'このレイヤーに対応するデータ ソースを入力してください', qxLayerDataset: 'このレイヤーに対応するデータセットを入力してください', - education: "教育版" + education: "教育版", + urlChecedFail:"Urlチェックに失敗しました。正しいアドレスを入力してください", + appointSceneName:'シーン名の指定', } window.local_ja = local_ja; \ No newline at end of file diff --git a/SuperMap iEarth/public/locale/ru.js b/SuperMap iEarth/public/locale/ru.js index db3f74a3..a50d99e0 100644 --- a/SuperMap iEarth/public/locale/ru.js +++ b/SuperMap iEarth/public/locale/ru.js @@ -675,7 +675,9 @@ const local_ru = { qxLayerDataUrl: 'Введите URL-адрес службы данных для этого слоя.', qxLayerDataSource: 'Пожалуйста, введите источник данных, соответствующий этому слою', qxLayerDataset: 'Пожалуйста, введите набор данных, соответствующий этому слою', - education: "обучать" + education: "обучать", + urlChecedFail:"Ошибка проверки Url, введите правильный адрес", + appointSceneName:'Укажите имя сцены', } window.local_ru = local_ru; \ No newline at end of file diff --git a/SuperMap iEarth/public/locale/zh.js b/SuperMap iEarth/public/locale/zh.js index a83b3121..5cc8484b 100644 --- a/SuperMap iEarth/public/locale/zh.js +++ b/SuperMap iEarth/public/locale/zh.js @@ -675,7 +675,9 @@ const local_zh = { qxLayerDataUrl: '请输入该图层的数据服务URL', qxLayerDataSource: '请输入该图层对应的数据源', qxLayerDataset: '请输入该图层对应的数据集', - education: "教育版" + education: "教育版", + urlChecedFail:"Url校验失败,请输入正确地址", + appointSceneName:'指定场景名称', } window.local_zh = local_zh; \ No newline at end of file diff --git a/SuperMap iEarth/src/package/addData/layer-custom/components/scene.vue b/SuperMap iEarth/src/package/addData/layer-custom/components/scene.vue index 9c7f3fb6..8bed5d9e 100644 --- a/SuperMap iEarth/src/package/addData/layer-custom/components/scene.vue +++ b/SuperMap iEarth/src/package/addData/layer-custom/components/scene.vue @@ -3,106 +3,92 @@ {{ $t("address") }} - {{ urlTip }} + {{ state.urlTip }}
- {{ $t("addToken") }} - + {{ $t("appointSceneName") }} +
+ +
+ {{ $t("name") }} + +
+ +
+ {{ $t("addToken") }} +
- {{ $t("sure") }} - {{ $t("clear") }} + {{ + $t("sure") }} + {{ $t("clear") }}
+ diff --git a/SuperMap iEarth/src/package/addData/layer-mine/layerMine.vue b/SuperMap iEarth/src/package/addData/layer-mine/layerMine.vue index 68343964..d0dfdc73 100644 --- a/SuperMap iEarth/src/package/addData/layer-mine/layerMine.vue +++ b/SuperMap iEarth/src/package/addData/layer-mine/layerMine.vue @@ -12,6 +12,15 @@ /> +
+ {{ $t("appointSceneName") }} +
+ +
+ {{ $t("name") }} + +
+
({ @@ -98,6 +109,8 @@ let state = reactive({ ], tableData: [], checkedRowKeys: ["1"], + useSenceName:false, + sceneName: '', }); // 初始化并获取数据 @@ -176,7 +189,9 @@ function addService() { let promiseArray: any = []; setTrustedServers(url); - let promise = viewer.scene.open(url); + // let promise = viewer.scene.open(url); + let sceneName = state.sceneName == '' ? undefined : state.sceneName; + const promise = viewer.scene.open(url, sceneName, { autoSetView: true }); promiseArray.push(promise); promiseWhen(promiseArray, true); }); @@ -375,4 +390,17 @@ function dateDiff(timestamp) { margin-top: 0.1rem; margin-left: 56%; } + +.row-item-mine{ + + span { + font-size: 0.14rem; + } + + display: flex; + justify-content: space-between; + width: 3.4rem; + margin-top: 0.1rem; + margin-right: 0.1rem; +}