From 04dae190af26730e8e0dcfb7cb4ec066400422f3 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期一, 14 八月 2023 16:43:25 +0800
Subject: [PATCH] 生产环境加载高德地图显示空白修改
---
src/components/preview_map.vue | 467 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 336 insertions(+), 131 deletions(-)
diff --git a/src/components/preview_map.vue b/src/components/preview_map.vue
index eec2e45..2060f0b 100644
--- a/src/components/preview_map.vue
+++ b/src/components/preview_map.vue
@@ -26,6 +26,7 @@
:props="defaultProps"
@node-click="handleNodeClick"
@check="handleCheckChange"
+ @node-contextmenu="rightClick"
>
</el-tree>
</div>
@@ -42,41 +43,51 @@
<el-form-item>
<el-button
size="small"
+ v-if="$store.state.previewLayer.type == 'mpt'"
+ @click="setcropping"
+ >瑁佸壀</el-button>
+ <el-button
+ size="small"
+ v-if="$store.state.previewLayer.type != 'mpt'"
@click="locateTo"
>瀹氫綅</el-button>
<el-button
size="small"
+ v-if="$store.state.previewLayer.type != 'mpt'"
@click="showTileset"
>鏄鹃殣</el-button>
<el-button
size="small"
- @click="underground"
+ v-if="$store.state.previewLayer.type != 'mpt'"
+ @click="setUndergroundMode"
>鍦颁笅</el-button>
<el-button
- v-if="$store.state.previewLayer.type != '3dml' &&
- $store.state.previewLayer.type !='cpt'"
- size="
- small"
+ v-if="$store.state.previewLayer.type != '3dml' &&
+ $store.state.previewLayer.type != 'cpt' &&
+ $store.state.previewLayer.type != 'mpt'"
+ size="small"
@click="pickupCoords"
>鎷惧彇</el-button>
<el-button
- v-if="$store.state.previewLayer.type != '3dml' &&
- $store.state.previewLayer.type !='cpt'"
- size="
- small"
+ v-if="$store.state.previewLayer.type != '3dml' &&
+ $store.state.previewLayer.type != 'cpt' &&
+ $store.state.previewLayer.type != 'mpt'"
+ size="small"
@click="reload"
>
閲嶈浇
</el-button>
<el-button
- v-if="modelForm.modelid == null && $store.state.previewLayer.type != '3dml'&&
- $store.state.previewLayer.type !='cpt'"
+ v-if="modelForm.modelid == null && $store.state.previewLayer.type != '3dml' &&
+ $store.state.previewLayer.type != 'cpt' &&
+ $store.state.previewLayer.type != 'mpt'"
size="small"
@click="getModeKeyId"
>妯″瀷涓婚敭</el-button>
<el-button
- v-if="$store.state.previewLayer.type != '3dml'&&
- $store.state.previewLayer.type !='cpt'"
+ v-if="$store.state.previewLayer.type != '3dml' &&
+ $store.state.previewLayer.type != 'cpt'
+ "
size="small"
@click="resave"
>淇濆瓨</el-button>
@@ -84,90 +95,69 @@
</el-form-item>
<el-form-item
label="缁忓害:"
- v-if="$store.state.previewLayer.type != '3dml'&&
- $store.state.previewLayer.type !='cpt'"
+ v-if="$store.state.previewLayer.type != '3dml' &&
+ $store.state.previewLayer.type != 'cpt' &&
+ $store.state.previewLayer.type != 'mpt'"
>
<el-input
size="small"
v-model="modelForm.lon"
- @input="update"
></el-input>
- <el-slider
- v-model="modelForm.lon"
- @input="update"
- :min="73"
- :step="0.001"
- :max="135"
- ></el-slider>
+
</el-form-item>
<el-form-item
label="绾害:"
- v-if="$store.state.previewLayer.type != '3dml'&&
- $store.state.previewLayer.type !='cpt'"
+ v-if="$store.state.previewLayer.type != '3dml' &&
+ $store.state.previewLayer.type != 'cpt' &&
+ $store.state.previewLayer.type != 'mpt'"
>
<el-input
size="small"
v-model="modelForm.lat"
- @input="update"
></el-input>
- <el-slider
- v-model="modelForm.lat"
- @input="update"
- :min="3"
- :step="0.001"
- :max="54"
- ></el-slider>
+
</el-form-item>
<el-form-item
label="楂樺害:"
- v-if="$store.state.previewLayer.type != '3dml'&&
- $store.state.previewLayer.type !='cpt'"
+ v-if="$store.state.previewLayer.type != '3dml' &&
+ $store.state.previewLayer.type != 'cpt' &&
+ $store.state.previewLayer.type != 'mpt'"
>
<el-input
size="small"
v-model="modelForm.height"
- @input="update"
></el-input>
- <el-slider
- v-model="modelForm.height"
- :min="-800"
- :step="1"
- @input="update"
- :max="8800"
- ></el-slider>
+
</el-form-item>
<el-form-item
label="瑙掑害:"
- v-if="$store.state.previewLayer.type != '3dml'&&
- $store.state.previewLayer.type !='cpt'"
+ v-if="$store.state.previewLayer.type != '3dml' &&
+ $store.state.previewLayer.type != 'cpt' &&
+ $store.state.previewLayer.type != 'mpt'"
>
<el-input
size="small"
v-model="modelForm.yaw"
- @input="update"
></el-input>
- <el-slider
- v-model="modelForm.yaw"
- :min="0"
- @input="update"
- :step="0.1"
- :max="360"
- ></el-slider>
+
</el-form-item>
- <el-form-item label="閫忔槑搴�:">
+ <el-form-item
+ label="姣斾緥:"
+ v-if="$store.state.previewLayer.type == 'las'"
+ >
+ <el-input
+ size="small"
+ v-model="modelForm.scale"
+ ></el-input>
+
+ </el-form-item>
+ <!-- <el-form-item label="閫忔槑搴�:">
<el-input
size="small"
v-model="modelForm.alpha"
- @input="update"
></el-input>
- <el-slider
- v-model="modelForm.alpha"
- @input="update"
- :min="0"
- :step="0.01"
- :max="1"
- ></el-slider>
- </el-form-item>
+
+ </el-form-item> -->
</el-form>
</div>
@@ -188,6 +178,7 @@
<el-tab-pane
label="灞炴��"
name="first"
+ v-if="serveType"
>
<el-form
ref="form"
@@ -226,14 +217,16 @@
plain
size="small"
@click="InsertData"
- >{{$t('common.increase')}}</el-button>
+ >{{
+ $t('common.increase') }}</el-button>
<el-button
v-show="!isShowModel"
type="info"
plain
size="small"
@click="EditData"
- >{{$t('common.update')}}</el-button>
+ >{{ $t('common.update')
+ }}</el-button>
</el-form-item>
</el-form>
@@ -259,10 +252,10 @@
id="insertFile"
multiple="multiple"
style="display: none"
- @change="insertFile( )"
+ @change="insertFile()"
/>
<el-link
- @click="getInsertFile( )"
+ @click="getInsertFile()"
:underline="false"
><i class="el-icon-folder-opened"></i></el-link>
</el-form-item>
@@ -273,14 +266,15 @@
class="elLink"
:underline="false"
@click="setAttachInsert"
- >{{$t('common.append')}}</el-link>
+ >{{ $t('common.append')
+ }}</el-link>
</el-col>
<el-col :span="3">
<el-link
class="elLink"
:underline="false"
@click="setAttachDel"
- >{{$t('common.delete')}}</el-link>
+ >{{ $t('common.delete') }}</el-link>
</el-col>
</el-row>
@@ -405,11 +399,24 @@
type="primary"
size="small"
@click="setSureKeyModelKey"
- >{{$t('common.confirm')}}</el-button>
+ >{{ $t('common.confirm') }}</el-button>
</el-form-item>
</el-form>
</div>
<undergroundModel ref="undergroundModel" />
+ <el-card
+ class="box-card"
+ ref="card"
+ :style="{ ...rightClickMenuStyle }"
+ v-show="menuVisible"
+ >
+ <div
+ class="edit"
+ @click="setShowFile"
+ >
+ <i class="el-icon-tickets"></i> 闄勪欢
+ </div>
+ </el-card>
</div>
</template>
@@ -422,7 +429,8 @@
comprehensive_selectFiles,
dataQuery_deletes,
publish_update,
- comprehensive_selectPubById
+ comprehensive_selectPubById,
+ resSelectCountForRole
} from '../api/api.js';
import { getToken } from '@/utils/auth';
import undergroundModel from '../views/Tools/undergroundModel.vue'
@@ -456,7 +464,8 @@
info: '',
icon: '',
bak: '',
- Id: ''
+ Id: '',
+
},
options: [
{
@@ -489,7 +498,7 @@
isJpg: false,
src: ''
},
- modelType: ['ifc', 'fbx', 'rvt', '3dml', 'cpt'],
+ modelType: ['ifc', 'fbx', 'rvt', '3dml', 'cpt', 'osgb', 'las', 'laz'],
editModelFlag: false,
modelForm: {
lon: 119,
@@ -498,6 +507,11 @@
yaw: 0,
alpha: 1,
modelid: null,
+ west: null,
+ south: null,
+ east: null,
+ north: null,
+ scale: 1
},
app: {
tileset: null,
@@ -508,12 +522,68 @@
modelLayerId: null,
optionKey: [],
modelKeyFlag: false,
+ menuVisible: false,
+ rightClickMenuStyle: {}, // 鍙抽敭鑿滃崟鏍峰紡
+ serveType: true,
+ layerData: "lf.sys_style"
}
},
mounted() {
this.init3DMap();
},
methods: {
+ // 榧犳爣鍙冲嚮浜嬩欢
+ rightClick(event, object, node, element) {
+ if (object.type == 1 || node.data.children != null) return;
+ if (object.serveType != "TMS" && object.serveType != "DEM") return
+
+ this.menuVisible = true
+ var type;
+ if (object.serveType == "TMS") {
+ type = 'dom_'
+ this.layerData = "DOM"
+ } else if (object.serveType == "DEM") {
+ type = 'dem_'
+ this.layerData = "DEM"
+ }
+ this.serveType = false
+ this.activeName = 'second'
+ this.formInline.Id = type + object.id;
+ this.layerID = type + object.id;
+ this.$refs.card.$el.style.left = event.pageX + 20 + "px";
+ this.$refs.card.$el.style.top = event.pageY + "px";
+
+ },
+ setShowFile() {
+
+ this.dialogVisible = true;
+ this.getAttacthFlieList();
+ this.menuVisible = false
+ },
+ //瑁佸壀
+ setcropping() {
+ var that = this;
+ sgworld.Creator.SimpleGraphic.clear()
+ sgworld.Creator.SimpleGraphic.edit(false, { editProp: false });
+ sgworld.Creator.createSimpleGraphic(
+ "rectangle", {},
+ function (entity) {
+ that.modelForm.east = Cesium.Math.toDegrees(
+ entity.rectangle.coordinates.getValue().east
+ );
+ that.modelForm.north = Cesium.Math.toDegrees(
+ entity.rectangle.coordinates.getValue().north
+ );
+ that.modelForm.west = Cesium.Math.toDegrees(
+ entity.rectangle.coordinates.getValue().west
+ );
+ that.modelForm.south = Cesium.Math.toDegrees(
+ entity.rectangle.coordinates.getValue().south
+ );
+
+ }
+ );
+ },
setUndergroundMode() {
if (window.UndergroundMode) {
this.$refs &&
@@ -585,7 +655,7 @@
}
- $.ajax(BASE_URL + "/comprehensive/uploadFiles?token=" + token + "&tabName=lf.sys_style&eventid=" + this.layerID,
+ $.ajax(BASE_URL + "/comprehensive/uploadFiles?token=" + token + "&tabName=" + this.layerData + "&eventid=" + this.layerID,
{
type: "post",
data: formData,
@@ -662,7 +732,7 @@
async getAttacthFlieList() {
var obj = {
eventid: this.layerID,
- tabName: "lf.sys_style"
+ tabName: this.layerData
};
const res = await comprehensive_selectFiles(obj);
if (res.code != 200) {
@@ -726,6 +796,8 @@
},
handleClose() {
+ this.layerData = "lf.sys_style"
+ this.serveType = true;
this.dialogVisible = false;
this.formInline = {
title: '',
@@ -798,7 +870,18 @@
this.formInline.title = this.formInline.name;
}
},
- setChangeTileset(result) {
+ setChangeTileset(result, check) {
+
+ var nodes = this.$refs.tree.getCheckedNodes();
+ var str = [];
+ for (var i = 0; i < nodes.length; i++) {
+ var node = this.$refs.tree.getNode(nodes[i]).data.serveType;
+ if (node != 'DEM') {
+ str.push(nodes[i])
+ }
+ }
+ str.push(result[0].id)
+ this.$refs.tree.setCheckedKeys(str)
var value = this.$refs.tree.getCheckedNodes();
var std = [];
for (var i in value) {
@@ -809,9 +892,33 @@
if (std.indexOf(tile.id) != -1) {
this.setAddLayers(tile)
} else {
- for (var j in Viewer.scene.primitives._primitives) {
- if (Viewer.scene.primitives._primitives[j].id == tile.cnName) {
- Viewer.scene.primitives.remove(Viewer.scene.primitives._primitives[j])
+ if (tile.serveType == 'DEM') {
+
+ if (window.terrainFlag == '2') {
+ window.terrainLayer.deleteObject();
+ } else if (window.terrainFlag == '1') {
+ Viewer.terrainProvider = new Cesium.EllipsoidTerrainProvider();
+ }
+
+ //
+ var option = {
+ url: window.sceneConfig.SGUrl,
+ layerName: window.sceneConfig.mptName,
+ requestVertexNormals: true,
+ };
+ window.terrainLayer = sgworld.Creator.sfsterrainprovider("", option, "", true, "");
+ } else if (tile.serveType == 'TMS') {
+ for (let i = 0; i < window.Viewer.imageryLayers._layers.length; i++) {
+ if (window.Viewer.imageryLayers._layers[i].name == result.cnName) {
+ window.Viewer.imageryLayers.remove(window.Viewer.imageryLayers._layers[i]);
+ break;
+ }
+ }
+ } else {
+ for (var j in Viewer.scene.primitives._primitives) {
+ if (Viewer.scene.primitives._primitives[j].id == tile.cnName) {
+ Viewer.scene.primitives.remove(Viewer.scene.primitives._primitives[j])
+ }
}
}
}
@@ -831,7 +938,7 @@
new Cesium.Cesium3DTileset({
name: rs.cnName,
url: url, //192.168.20.106,to4
- maximumScreenSpaceError: 64, // 鏈�澶у睆骞曠┖闂撮敊璇細16
+ maximumScreenSpaceError: url.indexOf("/pnts/") > -1 ? 16 : 64, // 鏈�澶у睆骞曠┖闂撮敊璇細16
maximumMemoryUsage: 768, // 鏈�澶у唴瀛橈細512
dynamicScreenSpaceError: true, // 鍑忓皯绂荤浉鏈鸿緝杩滅殑灞忓箷绌洪棿閿欒锛歠alse
skipLevelOfDetail: true, // 鍦ㄩ亶鍘嗘椂鍊欒烦杩囪鎯咃細false
@@ -847,6 +954,37 @@
}
});
+ } else if (rs.serveType == "DEM") {
+
+ if (window.terrainFlag == '2') {
+ window.terrainLayer.deleteObject();
+ } else if (window.terrainFlag == '1') {
+ Viewer.terrainProvider = new Cesium.EllipsoidTerrainProvider();
+
+ }
+ var url = rs.url;
+ if (rs.url.indexOf("{host}") != -1) {
+ url = rs.url.replace("{host}", iisHost);
+ }
+ window.terrainLayer = null;
+ window.terrainFlag = '1'
+
+ window.terrainLayer = new Cesium.CesiumTerrainProvider({
+ url: url
+ });
+ Viewer.terrainProvider = window.terrainLayer
+ } else if (rs.serveType == "TMS") {
+ var url = rs.url;
+ if (rs.url.indexOf("{host}") != -1) {
+ url = rs.url.replace("{host}", iisHost);
+ }
+ var layer = Viewer.imageryLayers.addImageryProvider(
+ new Cesium.UrlTemplateImageryProvider({
+ url: url,
+ maximumLevel: 18,
+ })
+ );
+ layer.name = rs.cnName;
}
},
@@ -908,13 +1046,31 @@
}
},
handleNodeClick(data) {
+ this.menuVisible = false
if (data.type == 2) {
this.currentData = data;
- for (var j in Viewer.scene.primitives._primitives) {
- if (Viewer.scene.primitives._primitives[j].id == data.cnName) {
- Viewer.flyTo(Viewer.scene.primitives._primitives[j]);
+
+ if (data.serveType == 'DEM' || data.serveType == 'TMS') {
+ if (!data.pubid) return
+
+ this.setQueryPubid(data)
+ } else {
+ for (var j in Viewer.scene.primitives._primitives) {
+ if (Viewer.scene.primitives._primitives[j].id == data.cnName) {
+ Viewer.flyTo(Viewer.scene.primitives._primitives[j]);
+ }
}
}
+ }
+ },
+ async setQueryPubid(res) {
+ const data = await comprehensive_selectPubById({ id: res.pubid })
+ if (data.code != 200) return;
+ if (data.result.geom) {
+ var wkt = this.$wkt.parse(data.result.geom);
+ Viewer.camera.flyTo({
+ destination: Cesium.Cartesian3.fromDegrees(wkt.coordinates[1], wkt.coordinates[0], 2000),
+ });
}
},
getchilds(source) {
@@ -959,6 +1115,13 @@
base_ulr = base_ulr.replace("{host}", iisHost)
}
+ Viewer.imageryLayers.addImageryProvider(
+ new Cesium.UrlTemplateImageryProvider({
+ url: base_ulr,
+ maximumLevel: 5
+ })
+ );
+
window.BaseMapLayer = Viewer.imageryLayers.addImageryProvider(
new Cesium.UrlTemplateImageryProvider({
url: base_ulr,
@@ -981,6 +1144,7 @@
requestVertexNormals: true,
};
window.terrainLayer = sgworld.Creator.sfsterrainprovider("", option, "", true, "");
+ window.terrainFlag = '2'
// window.terrainLayer = new Cesium.CesiumTerrainProvider({
// url: demLayer
// });
@@ -995,7 +1159,7 @@
window.terrainLayer.deleteObject();
// Viewer.terrainProvider = new Cesium.EllipsoidTerrainProvider();
// window.terrainLayer = null;
-
+ window.terrainLayer = null;
window.terrainLayer = new Cesium.CesiumTerrainProvider({
url: res.url
});
@@ -1008,6 +1172,7 @@
roll: 0.0
}
});*/
+
var wkt = this.$wkt.parse(res.geom);
var height = this.getHeight(wkt.coordinates[2]);
Viewer.camera.flyTo({
@@ -1025,12 +1190,13 @@
Viewer.camera.flyTo({
destination: Cesium.Cartesian3.fromDegrees(wkt.coordinates[1], wkt.coordinates[0], height),
});
- } else if (type == '3dml' || type == 'fbx' || type == 'ifc' || type == 'rvt' || type == 'cpt') {
+ } else if (type == '3dml' || type == 'fbx' || type == 'ifc' || type == 'rvt'
+ || type == 'cpt' || type == 'osgb' || type == 'las' || type == 'laz') {
if (this.app.tileset) viewer.scene.primitives.remove(this.app.tileset);
this.app.tileset = this.createTileset(res);
var that = this;
-
+ this.editModelFlag = true;
Viewer.scene.primitives.add(this.app.tileset).readyPromise.then(function (ts) {
that.setModleLocatin()
@@ -1038,12 +1204,30 @@
});
} else if (res.url.indexOf('.mpt') != -1) {
- Viewer.imageryLayers.removeAll();
- var url = res.url.split(';')
- sgworld.Creator.createImageryProvider('mpt褰卞儚', "wms", {
+ this.editModelFlag = true;
+ //Viewer.imageryLayers.removeAll();
+
+ var url = res.url.split(';');
+ var ops = {
url: url[0],
layers: url[1]
- }, "0", undefined, true, "");
+ };
+ if (res && res.json) {
+ var rs = JSON.parse(res.json);
+ ops.rectangle = Cesium.Rectangle.fromDegrees(rs.west, rs.south, rs.east, rs.north);
+ }
+
+ sgworld.Creator.createImageryProvider(res.cnName, "wms", ops, "0", undefined, true, "");
+
+ if (res && res.json) {
+ var rs = JSON.parse(res.json);
+ Viewer.camera.flyTo({
+ destination: Cesium.Rectangle.fromDegrees(rs.west, rs.south, rs.east, rs.north)
+ })
+ }
+
+
+
} else if (res.url.indexOf('menuLayer') != -1) {
this.setShowModelLayer();
}
@@ -1069,9 +1253,15 @@
},
async resave() {
- if (!this.modelForm.modelid) {
- return this.$message('鏈�夋嫨妯″瀷涓婚敭ID');
+
+ if (this.$store.state.previewLayer.type != "mpt") {
+ if (!this.modelForm.modelid) {
+ return this.$message('鏈�夋嫨妯″瀷涓婚敭ID');
+ }
+ } else {
+ sgworld.Creator.SimpleGraphic.clear()
}
+
this.$store.state.previewLayer.json = JSON.stringify(this.modelForm);
if (this.$store.state.previewLayer.url) {
@@ -1090,7 +1280,10 @@
this.reload();
},
reload() {
+ debugger
+ sgworld.Analysis.UndergroundMode(this.app.under, this.modelForm.alpha)
var json = JSON.stringify(this.modelForm);
+ var modelScale = this.modelForm.scale
var url = this.$store.state.previewLayer.url.replace("{host}", iisHost);
if (!url) return;
if (this.app.tileset) Viewer.scene.primitives.remove(this.app.tileset);
@@ -1100,13 +1293,14 @@
var that = this;
Viewer.scene.primitives.add(this.app.tileset).readyPromise.then(function (ts) {
that.modelForm = JSON.parse(json);
-
var pos = Cesium.Cartesian3.fromDegrees(parseFloat(that.modelForm.lon), parseFloat(that.modelForm.lat), parseFloat(that.modelForm.height));
-
-
var converter = Cesium.Transforms.eastNorthUpToFixedFrame;
var hpr = new Cesium.HeadingPitchRoll(Cesium.Math.toRadians(parseFloat(that.modelForm.yaw)), 0, 0);
var matrix = Cesium.Transforms.headingPitchRollToFixedFrame(pos, hpr, Cesium.Ellipsoid.WGS84, converter);
+ if (modelScale) {
+ var scale = Cesium.Matrix4.fromUniformScale(modelScale);
+ Cesium.Matrix4.multiply(matrix, scale, matrix);
+ }
that.app.tileset._root.transform = matrix;
Viewer.flyTo(ts);
@@ -1136,6 +1330,8 @@
that.modelForm.lat = y;
that.modelForm.height = z;
that.pickupCoords();
+ that.reload();
+
}, Cesium.ScreenSpaceEventType.LEFT_CLICK);
},
// 淇濈暀灏忔暟浣�
@@ -1145,36 +1341,26 @@
return Math.round(d * p) / p;
},
update() {
- if (!this.modelForm.lon || isNaN(this.modelForm.lon)) {
- var args = this.getEditTilesetArgs();
- this.modelForm.lon = args.lon == null ? 0 : args.height;
- return
- }
- if (!this.modelForm.lat || isNaN(this.modelForm.lat)) {
- var args = this.getEditTilesetArgs();
- this.modelForm.lat = args.lat == null ? 0 : args.height;
- return
- }
- if (!this.modelForm.height || isNaN(this.modelForm.height)) {
- var args = this.getEditTilesetArgs();
- this.modelForm.height = args.height == null ? 0 : args.height;
- return
- }
- if (!this.modelForm.yaw || isNaN(this.modelForm.yaw)) {
- this.modelForm.yaw = 0;
- return
- }
- // if (!this.modelForm.alpha || isNaN(this.modelForm.alpha)) {
-
- // if (this.app.under) {
- //
- // this.modelForm.alpha = sgworld._Analysis._UndergroundMode._alpha;
- // } else {
- // this.modelForm.alpha = 1
- // }
+ // if (!this.modelForm.lon || isNaN(this.modelForm.lon)) {
+ // var args = this.getEditTilesetArgs();
+ // this.modelForm.lon = args.lon == null ? 0 : args.height;
// return
-
// }
+ // if (!this.modelForm.lat || isNaN(this.modelForm.lat)) {
+ // var args = this.getEditTilesetArgs();
+ // this.modelForm.lat = args.lat == null ? 0 : args.height;
+ // return
+ // }
+ // if (!this.modelForm.height || isNaN(this.modelForm.height)) {
+ // var args = this.getEditTilesetArgs();
+ // this.modelForm.height = args.height == null ? 0 : args.height;
+ // return
+ // }
+ // if (!this.modelForm.yaw || isNaN(this.modelForm.yaw)) {
+ // this.modelForm.yaw = 0;
+ // return
+ // }
+
this.setTilesetArgs(this.modelForm);
sgworld.Analysis.UndergroundMode(this.app.under, this.modelForm.alpha)
},
@@ -1187,6 +1373,8 @@
var converter = Cesium.Transforms.eastNorthUpToFixedFrame;
var hpr = new Cesium.HeadingPitchRoll(Cesium.Math.toRadians(parseFloat(f.yaw)), 0, 0);
var matrix = Cesium.Transforms.headingPitchRollToFixedFrame(pos, hpr, Cesium.Ellipsoid.WGS84, converter);
+ var scale = Cesium.Matrix4.fromUniformScale(f.scale);
+ Cesium.Matrix4.multiply(matrix, scale, matrix);
var model = this.app.tileset
model._root.transform = matrix;
},
@@ -1197,6 +1385,7 @@
},
//鏄鹃殣
showTileset() {
+
if (!this.app.tileset) return;
this.app.tileset.show = !this.app.tileset.show;
},
@@ -1212,7 +1401,7 @@
name: 'tsTest',
skipLevelOfDetail: true, // 鍦ㄩ亶鍘嗘椂鍊欒烦杩囪鎯咃細false
baseScreenSpaceError: 1024,
- maximumScreenSpaceError: 64, // 鏈�澶у睆骞曠┖闂撮敊璇細16锛屾暟鍊煎姞澶ц兘璁╂渶缁堟垚鍍忓彉妯＄硦
+ maximumScreenSpaceError: res.url.indexOf("/pnts/") > -1 ? 16 : 64, // 鏈�澶у睆骞曠┖闂撮敊璇細16锛屾暟鍊煎姞澶ц兘璁╂渶缁堟垚鍍忓彉妯＄硦
skipScreenSpaceErrorFactor: 16,
skipLevels: 1,
immediatelyLoadDesiredLevelOfDetail: false,
@@ -1230,8 +1419,9 @@
});
},
setEditModelLayer(res) {
- this.editModelFlag = true;
+
if (res.json) {
+
var json = JSON.parse(res.json)
this.modelForm = json;
this.reload();
@@ -1242,7 +1432,6 @@
setModleLocatin() {
var res = this.$store.state.previewLayer;
var type = res.type;
-
if (this.modelType.indexOf(type) != -1) {
if (type != '3dml') {
this.setEditModelLayer(res)
@@ -1325,12 +1514,15 @@
if (str.type == 1) {
val.push(str);
}
- if (str.url != null && str.type == 2 && str.serveType == 'Tileset') {
- val.push(str);
+ if (str.url != null && str.type == 2) {
+
+ if (str.serveType == 'Tileset' || str.serveType == '3DML' || str.serveType == 'TMS' || str.serveType == 'DEM') {
+ val.push(str);
+ }
}
- if (str.url != null && str.type == 2 && str.serveType == '3DML') {
- val.push(str);
- }
+ // if (str.url != null && str.type == 2 && str.serveType == '3DML') {
+ //
+ // }
});
var res = this.setTreeData(val);
@@ -1397,6 +1589,7 @@
.previewBox {
width: 100%;
height: 100%;
+
.modelLayer {
position: absolute;
z-index: 40;
@@ -1406,16 +1599,19 @@
margin: 10px;
max-height: 600px;
overflow: auto;
+
.modelBox {
width: 100%;
min-height: 24px;
}
}
+
.pdfClass {
height: 70vh;
width: 100%;
position: relative;
}
+
.el-icon-sunrise {
background: url("../assets/img/synthesis/images/3鐧藉簳_157.png") center
center no-repeat;
@@ -1426,5 +1622,14 @@
content: "11";
visibility: hidden;
}
+ .box-card {
+ position: fixed;
+ display: block;
+ z-index: 10000;
+ padding: 0px 0px;
+ border: 1px solid #ebeef5;
+ border-radius: 4px;
+ box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+ }
}
</style>
--
Gitblit v1.9.3