From dae8fb08b9ff7327da86ed249c9c97a87c90e6f2 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期二, 16 五月 2023 18:05:34 +0800
Subject: [PATCH] 发布管理，图层管理修改
---
src/components/preview_map.vue | 63 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/src/components/preview_map.vue b/src/components/preview_map.vue
index d1fe011..637c3c9 100644
--- a/src/components/preview_map.vue
+++ b/src/components/preview_map.vue
@@ -1,4 +1,3 @@
-
<template>
<div
id="mapdiv"
@@ -66,11 +65,12 @@
閲嶈浇
</el-button>
<el-button
- v-if="modelForm.modelid == null"
+ v-if="modelForm.modelid == null && $store.state.previewLayer.type != '3dml'"
size="small"
@click="getModeKeyId"
>妯″瀷涓婚敭</el-button>
<el-button
+ v-if="$store.state.previewLayer.type != '3dml'"
size="small"
@click="resave"
>淇濆瓨</el-button>
@@ -402,7 +402,7 @@
<undergroundModel ref="undergroundModel" />
</div>
</template>
-
+
<script>
import {
perms_selectLayers,
@@ -733,26 +733,31 @@
async setShowModelInfo(result) {
var modelKey = 'id';
- if (result.tileset.pubid > 0) {
- const data = await comprehensive_selectPubById({ id: result.tileset.pubid })
- if (data.code != 200) {
- return
- } else {
-
- modelKey = JSON.parse(data.result.json).modelid
+ if (result.tileset) {
+ if (result.tileSet.pubid > 0) {
+ const data = await comprehensive_selectPubById({ id: result.tileset.pubid })
+ if (data.code != 200) {
+ return
+ } else {
+ modelKey = JSON.parse(data.result.json).modelid
+ }
+ if (!modelKey) {
+ return this.$message('娌℃湁妯″瀷涓婚敭ID,鏃犳硶鏌ヨ鏁版嵁');
+ }
+ this.formInline.Id = result.getProperty(modelKey);
+ this.layerID = result.getProperty(modelKey);
}
- if (!modelKey) {
- return this.$message('娌℃湁妯″瀷涓婚敭ID,鏃犳硶鏌ヨ鏁版嵁');
- }
+ } else {
+ var id = '3dml' + result.primitive.id;
+ this.formInline.Id = id;
+ this.layerID = id;
}
-
-
- // this.formInline.title = result.getProperty("name")
- this.formInline.Id = result.getProperty(modelKey);
- this.layerID = result.getProperty(modelKey);
this.formInline.layerId = result.primitive.layerId;
this.formInline.layerName = result.primitive.id;
+
+ // this.formInline.title = result.getProperty("name")
+
this.startModelData();
this.dialogVisible = true;
@@ -766,16 +771,13 @@
if (data.code != 200) {
return;
}
-
if (data.result == null) {
this.isShowModel = true;
this.formInline.name = this.formInline.title;
} else {
this.isShowModel = false;
this.formInline = data.result;
-
this.formInline.title = this.formInline.name;
-
}
},
setChangeTileset(result) {
@@ -798,7 +800,7 @@
}
},
setAddLayers(res) {
- if (res.serveType == "Tileset") {
+ if (res.serveType == "Tileset" || res.serveType == "3DML") {
var url;
if (res.url.indexOf("{host}") != -1) {
url = res.url.replace("{host}", iisHost);
@@ -821,7 +823,7 @@
tileset.id = res.cnName;
tileset.layerId = res.id;
tileset.pubid = res.pubid;
- if (res.bak != '3dml') {
+ if (res.serveType != '3DML') {
that.getArgsTileset(tileset, res);
}
@@ -838,8 +840,12 @@
} else {
+ if (res.serveType != '3DML') {
+ this.tileSet(tileset, parseFloat(res.elev))
+ } else {
+ this.reloadTile(tileset, data.result.json)
+ }
- this.tileSet(tileset, parseFloat(res.elev))
}
} else {
@@ -1114,7 +1120,7 @@
setTilesetArgs(f) {
if (!this.app.tileset || this.app.isBusy) return;
- debugger
+
var pos = Cesium.Cartesian3.fromDegrees(parseFloat(f.lon), parseFloat(f.lat), parseFloat(f.height));
var converter = Cesium.Transforms.eastNorthUpToFixedFrame;
@@ -1259,6 +1265,9 @@
if (str.url != null && str.type == 2 && str.serveType == 'Tileset') {
val.push(str);
}
+ if (str.url != null && str.type == 2 && str.serveType == '3DML') {
+ val.push(str);
+ }
});
var res = this.setTreeData(val);
@@ -1320,7 +1329,7 @@
}
</script>
-
+
<style lang="less" scoped>
.previewBox {
width: 100%;
@@ -1355,4 +1364,4 @@
visibility: hidden;
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3