From 368b6c77a9516bfe76faf845dd77d92bb45c95d8 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期五, 22 九月 2023 14:12:07 +0800
Subject: [PATCH] 空间查询，地名定位修改
---
src/components/mapsdk.vue | 729 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 637 insertions(+), 92 deletions(-)
diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue
index 6e6ad87..d0cdd48 100644
--- a/src/components/mapsdk.vue
+++ b/src/components/mapsdk.vue
@@ -75,16 +75,25 @@
<el-form
ref="form"
:model="coordFrom"
- label-width="50px"
+ label-width="70px"
>
<el-form-item label="缁忓害:">
- <el-input v-model="coordFrom.lon"></el-input>
+ <el-input
+ v-model="coordFrom.lon"
+ placeholder="璇疯緭鍏ョ粡搴�"
+ ></el-input>
</el-form-item>
<el-form-item label="绾害:">
- <el-input v-model="coordFrom.lat"></el-input>
+ <el-input
+ v-model="coordFrom.lat"
+ placeholder="璇疯緭鍏ョ淮搴�"
+ ></el-input>
</el-form-item>
<el-form-item label="楂樺害:">
- <el-input v-model="coordFrom.height"></el-input>
+ <el-input
+ v-model="coordFrom.height"
+ placeholder="璇疯緭鍏ラ珮搴�"
+ ></el-input>
</el-form-item>
<el-form-item>
<el-button
@@ -159,14 +168,17 @@
>
<el-form-item label="鍦板悕:">
<el-input
+ size="small"
style="width: 160px"
v-model="comprehensive.name"
+ placeholder="璇疯緭鍏ュ湴鍚�...."
></el-input>
</el-form-item>
<el-form-item>
<el-button
@click="setQueryTable"
type="info"
+ size="small"
>鏌ヨ</el-button>
</el-form-item>
</el-form>
@@ -180,6 +192,7 @@
align="center"
type="index"
label="搴忓彿"
+ width="70"
/>
<el-table-column
prop="name"
@@ -301,6 +314,17 @@
<div
class="changeTerrain"
@click="changeTerrainLayer"
+ style=" position: absolute;
+ bottom: 84px;
+ right: 46px;
+ height: 30px;
+ width: 30px;
+ z-index: 101;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ cursor: pointer;
+ border: 1px solid rgba(255, 255, 255, 0.5);"
>
<div
title="鍦板舰鍒囨崲"
@@ -312,6 +336,17 @@
<div
@click="changeMenulayer"
class="changeLayer"
+ style=" position: absolute;
+ bottom: 116px;
+ right: 46px;
+ height: 30px;
+ width: 30px;
+ z-index: 101;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ cursor: pointer;
+ border: 1px solid rgba(255, 255, 255, 0.5);"
>
<div
title="搴曞浘鍒囨崲"
@@ -323,6 +358,17 @@
<div
@click="changeMapType"
class="changeMapType"
+ style=" position: absolute;
+ bottom: 52px;
+ right: 46px;
+ height: 30px;
+ width: 30px;
+ z-index: 101;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ cursor: pointer;
+ border: 1px solid rgba(255, 255, 255, 0.5);"
>
<div
title="2/3缁村垏鎹�"
@@ -337,14 +383,7 @@
v-show="showLengendDialog"
>
<el-card class="box-card">
- <!-- <div
- class="lengend_color"
- style="height:205px"
- >
-
- </div> -->
<div class="lengendBox">
-
<div>
<img
class="lengendImg"
@@ -358,8 +397,79 @@
<div>52.5掳</div>
<div>70掳</div>
</div>
-
</div>
+ </el-card>
+ </div>
+ <div
+ class="HistLeng"
+ v-show="$store.state.histLenged"
+ >
+ <el-card class="box-card">
+ <table>
+ <tr>
+ <td>绮夎川榛忓湡</td>
+ <td>
+ <div style="width:100px;height:20px;background:rgba(139,106,77,1)">
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td>娣ゆ偿璐ㄧ矇鍦�</td>
+ <td>
+ <div style="width:100px;height:20px;background:rgba(141,85,69,1)">
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td>鍦嗙牼</td>
+ <td>
+ <div style="width:100px;height:20px;background:rgba(102,166,184,1)">
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td>鍗电煶</td>
+ <td>
+ <div style="width:100px;height:20px;background:rgba(54,83,173,1)">
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td>娉ュ博</td>
+ <td>
+ <div style="width:100px;height:20px;background:rgba(47,30,13,1)">
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td>缁嗙爞</td>
+ <td>
+ <div style="width:100px;height:20px;background:rgba(93,88,15,1)">
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td>涓爞</td>
+ <td>
+ <div style="width:100px;height:20px;background:rgba(164,140,21,1)">
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td>娣ゆ偿璐ㄥ湡</td>
+ <td>
+ <div style="width:100px;height:20px;background:rgba(75,74,78,1)">
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td>鍏朵粬</td>
+ <td>
+ <div style="width:100px;height:20px;background:rgba(225,225,225,1)">
+ </div>
+ </td>
+ </tr>
+ </table>
</el-card>
</div>
<!--灞炴�т俊鎭脊绐�-->
@@ -372,6 +482,13 @@
<div slot="header">
<span>灞炴�т俊鎭�</span>
<div style="float: right; cursor: pointer">
+ <el-link
+ v-if="$store.state.surfaceDeForm.flag && this.$store.state.surfaceDeForm.gid"
+ type="primary"
+ :underline="false"
+ @click="setSurfaceDeForm"
+ style="margin-right: 10px"
+ >鍦拌〃褰㈠彉鏃跺簭鍥�</el-link>
<el-link
v-if="$store.state.propertiesName.enName == 's_surveyworksite'"
type="primary"
@@ -443,6 +560,7 @@
<div
class="propertiesPop"
+ style="right:22%"
v-if="$store.state.propertiesFlag == '2'"
>
<el-card class="box-card">
@@ -475,7 +593,7 @@
v-model="valueX"
></el-slider>
<span>宸﹀彸鎴潰</span>
- </div>
+ </div>SpatialQuery
<div class="slide-bg">
<el-slider
class="slide"
@@ -497,7 +615,33 @@
<span>涓婁笅鎴潰</span>
</div>
</div>
+ <!-- 鍦拌〃褰㈠彉鏃跺簭鍥� -->
+ <div
+ class="surfaceDeFormPop"
+ style=" width: 800px;
+ height: 800px;"
+ v-show="surfaceDeFormFlag"
+ v-drag
+ >
+ <el-card class="box-card">
+ <div slot="header">
+ <span>鍦拌〃褰㈠彉鏃跺簭鍥�</span>
+ <div style="float: right; cursor: pointer">
+ <i
+ class="el-icon-close"
+ @click="closeBufferBox(7)"
+ ></i>
+ </div>
+ </div>
+ <div
+ id="surfaceDeFormEchart"
+ class="pointInfoBoxContext"
+ style="height:500px;width:750px;"
+ >
+ </div>
+ </el-card>
+ </div>
<!--闄勪欢鍒楄〃寮圭獥-->
<el-dialog
title="闄勪欢鍒楄〃"
@@ -581,19 +725,80 @@
</div>
</el-dialog>
- <!-- <div-->
- <!-- @click="changeMenulayer"-->
- <!-- class="center CenDiv"-->
- <!-- :class="{ center1: centerFlag }"-->
- <!-- >-->
- <!-- <div-->
- <!-- id="cenBg"-->
- <!-- v-bind:class="{ active: isActive, menuLayer: isMenuLayer }"-->
- <!-- ></div>-->
- <!-- </div>-->
+ <el-dialog
+ title="鐡︾墖涓嬭浇"
+ :append-to-body="false"
+ :visible.sync="downTitleFlag"
+ :close-on-click-modal="false"
+ :show-close="false"
+ width="30%"
+ >
+ <el-form
+ :model="ruleForm"
+ status-icon
+ :rules="rules"
+ ref="ruleForm"
+ label-width="100px"
+ class="demo-ruleForm"
+ >
+ <el-form-item
+ label="鍚嶇О"
+ prop="title"
+ >
+ <el-input
+ v-model="ruleForm.title"
+ size="small"
+ placeholder="璇疯緭鍏ユ暟鎹悕绉�..."
+ ></el-input>
+ </el-form-item>
+ <el-form-item
+ label="瀵嗙爜"
+ prop="pass"
+ >
+ <el-input
+ show-password
+ type="password"
+ v-model="ruleForm.pass"
+ autocomplete="off"
+ size="small"
+ placeholder="璇疯緭鍏ュ瘑鐮�..."
+ ></el-input>
+ </el-form-item>
+ <el-form-item
+ label="纭瀵嗙爜"
+ prop="checkPass"
+ >
+ <el-input
+ show-password
+ type="password"
+ v-model="ruleForm.checkPass"
+ autocomplete="off"
+ size="small"
+ placeholder="纭瀵嗙爜..."
+ ></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button
+ type="primary"
+ size="small"
+ @click='submitTitleDown("ruleForm")'
+ >鎻愪氦</el-button>
+ <el-button
+ size="small"
+ @click='cannelTitleDown("ruleForm")'
+ >鍙栨秷</el-button>
+ </el-form-item>
+ </el-form>
+ </el-dialog>
</div>
- <model-property ref='modelProperty'></model-property>
+
+ <surface-chart ref="surfaceChart" />
+ <iframe
+ id="downFrame"
+ src=""
+ style="display: none; border: 0; padding: 0; height: 0; width: 0"
+ ></iframe>
</div>
</template>
@@ -601,21 +806,26 @@
import $ from "jquery";
import mapMenuTop from "./MapView/mapMenuTop.vue";
import mapSpaceTop from "./MapView/mapSpaceTop.vue";
-import ModelProperty from '../views/Tools/ModelProperty.vue'
+import ModelProperty from '../views/Tools/ModelProperty.vue';
+
import {
select_Comprehensive_ByPageAndCount,
select_Comprehensive_SelectWktById,
comprehensive_selectRoute,
- dataLib_selectFiles, dataQuery_selectFields, dataQuery_selectDomains, dataQuery_selectByPage
+ dataLib_selectFiles, dataQuery_selectFields, dataQuery_selectDomains,
+ dataQuery_selectByPage, sign_getPublicKey, inquiry_downloadTiles,
+ comprehensive_selectPubById, comprehensive_selectModelByGuid, dataQuery_selectByGid,
+ dataLib_selectByPage
} from '../api/api'
import { getToken } from '@/utils/auth'
-
+import * as echarts from "echarts"
export default {
name: "",
components: {
mapMenuTop,
mapSpaceTop,
- ModelProperty
+ ModelProperty,
+
},
data() {
@@ -671,9 +881,9 @@
val: 50,
},
coordFrom: {
- lon: 116.3911,
- lat: 39.9115,
- height: 100000,
+ lon: "",
+ lat: "",
+ height: "",
},
listData: {
name: null,
@@ -719,6 +929,17 @@
valueX: 0,
valueY: 0,
terrainflag: false,
+ downTitleFlag: false,
+ downTitleData: null,
+ ruleForm: {
+ pass: '',
+ checkPass: '',
+ title: ''
+ },
+ loadingText: '',
+ loading: false,
+ surfaceDeFormFlag: false,
+ option: null
};
},
mounted() {
@@ -744,40 +965,312 @@
}
});
//妯″瀷鎹曟崏
- this.catchmodel()
-
+ this.catchmodel();
+ this.$bus.$on("titleDown", res => {
+ this.setDownLoadTitle(res);
+ });
+ this.$bus.$on('annexDownload', res => {
+ this.setAnnexDownload(res);
+ })
window.localStorage.setItem('slider_x', this.valueX);
window.localStorage.setItem('slider_y', this.valueY);
window.localStorage.setItem('slider_z', this.valueZ);
},
methods: {
+ async setSurfaceDeForm() {
+ var gid = this.$store.state.surfaceDeForm.gid;
+ const data = await dataQuery_selectByGid({ gid: gid, name: 'msurfacedeformationdata' });
+ if (data.code != 200) {
+ return this.$message.error("鏍规嵁GID鏌ヨ鏁版嵁澶辫触");
+ }
+
+ this.getSurfaceDeFormData(data.result)
+
+ },
+ async getSurfaceDeFormData(result) {
+ var data = await dataLib_selectByPage({
+ filter: "defpointno = '" + result.defpointno + "'",
+ name: 'msurfacedeformationdata',
+ pageIndex: 1,
+ pageSize: 100000,
+ });
+
+ const data1 = await dataLib_selectByPage({
+ filter: "defpointno = '" + result.defpointno + "'",
+ name: 'msurfacedeformationdatadate',
+ pageIndex: 1,
+ pageSize: 100000,
+ });
+
+ if (data1.code != 200 || data.code != 200) {
+ return this.$message.error("鍦拌〃褰㈠彉鏁版嵁鏌ヨ澶辫触");
+ }
+
+ this.surfaceDeFormFlag = true;
+ var average = data.result;
+ var val = data1.result
+ var xtitle = [];
+ var val1 = [];
+ var val2 = [];
+ for (var i in val) {
+ val1.push(average[0].seqvar);
+ xtitle.push(this.formDate(val[i].defdate))
+ val2.push(val[i].seqvar)
+ }
+ this.showSurfaceDeFormEchart(xtitle, val1, val2);
+
+ },
+ formDate(res) {
+ var time = new Date(res);
+ var y = time.getFullYear();
+ var m = time.getMonth() + 1;
+ var d = time.getDate();
+
+ return (
+ y +
+ '-' +
+ this.add0(m) +
+ '-' +
+ this.add0(d)
+
+ );
+ },
+ //鏍煎紡鍖栨椂闂�
+ add0(m) {
+ return m < 10 ? '0' + m : m;
+ },
+ showSurfaceDeFormEchart(res, res1, res2) {
+
+
+ var dom = document.getElementById('surfaceDeFormEchart');
+ // var myChart = echarts.init(chartDom);
+ if (this.option != null) {
+ dom.removeAttribute("_echarts_instance_"); // 绉婚櫎瀹瑰櫒涓婄殑 _echarts_instance
+ }
+
+ var myChart = echarts.init(dom, null, {
+ renderer: "canvas",
+ useDirtyRect: false,
+ });
+
+
+ this.option = {
+
+ tooltip: {
+ trigger: 'axis',
+ formatter: function (params) {
+ return params[0].axisValue +
+ '<br/>鏃跺簭褰㈠彉閲忥細' + params[1].data + ' mm' +
+ '<br/>骞村舰鍙橀�熺巼锛�' + params[0].data + ' m/a'
+ },
+ },
+ dataZoom: [{
+ type: 'inside', //1骞崇Щ 缂╂斁
+
+ }],
+ grid: {
+ left: '1%',
+ right: '1%',
+ bottom: '1%',
+ containLabel: true
+ },
+ toolbox: {
+ feature: {
+ saveAsImage: {}
+ },
+
+ },
+
+ xAxis: {
+ type: 'category',
+ boundaryGap: false,
+ data: res.reverse()
+ },
+ yAxis: {
+ type: 'value',
+ name: "mm",
+ },
+ series: [
+ {
+ name: '骞村舰鍙橀�熺巼',
+ type: 'line',
+ stack: 'Total',
+ data: res1
+ },
+ {
+ name: '鏃跺簭鍙樺舰閲�',
+ type: 'line',
+ stack: 'Total',
+ data: res2.reverse()
+ }
+ ]
+ };
+
+ this.option && myChart.setOption(this.option);
+ window.addEventListener("resize", myChart.resize);
+ },
+ async setAnnexDownload(rs) {
+
+ var type, eventid;
+ if (rs.serveType == 'TMS') {
+ type = 'DOM';
+ eventid = 'dom_' + rs.id;
+ } else if (rs.serveType == 'DEM') {
+ type = 'DEM';
+ eventid = 'dem_' + rs.id
+ }
+
+ var obj = {
+ eventid: eventid,
+ tabName: type,
+ };
+ const res = await dataLib_selectFiles(obj);
+
+ if (res.code != 200) {
+ this.$message.error('闄勪欢鏌ヨ澶辫触');
+ return
+ }
+ if (res.result.length <= 0) {
+ this.$message('鏆傛棤闄勪欢');
+ return
+ }
+
+ this.attachList = res.result;
+ this.showAttach = true;
+ },
+ setDownLoadTitle(res) {
+ this.signGetPublicKey()
+ this.downTitleFlag = true;
+ this.downTitleData = res;
+ },
+ async signGetPublicKey() {
+ const res = await sign_getPublicKey()
+ if (res && res.code == 200) {
+ window.encrypt = new JSEncrypt();
+ encrypt.setPublicKey(res.result);
+ }
+ },
+ submitTitleDown(formName) {
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ this.downTitleData.title = this.ruleForm.title
+ // this.downTitleData.pwd = encr(this.ruleForm.pass)
+ this.downTitleData.pwd = encrypt.encrypt(this.ruleForm.pass)
+ this.getDownLoadTile(this.downTitleData);
+ this.cannelTitleDown();
+ } else {
+ console.log('error submit!!');
+ return false;
+ }
+ });
+ },
+ async getDownLoadTile(res) {
+ this.loading = true;
+ this.loadingText = "鏁版嵁涓嬭浇涓�,璇风◢绛�..."
+ $.ajax({
+ url: BASE_URL + "/inquiry/downloadTiles?token=" + getToken(),
+ type: "POST",
+ data: JSON.stringify(res),
+ dataType: 'json', // html銆乯son銆乯sonp銆乻cript銆乼ext
+ contentType: "application/json", // "application/x-www-form-urlencoded"
+ success: (data) => {
+ var token = getToken()
+ var url = BASE_URL + "/dataLib/downloadFile?token=" + token + "&guid=" + data.result + "&pwd=" + res.pwd;
+ $("#downFrame").attr("src", url).click();
+ this.loading = false;
+ this.loadingText = ""
+ },
+ error: function (e) {
+ }
+ });
+ },
+ cannelTitleDown(formName) {
+ this.downTitleFlag = false;
+ // this.$refs[formName].resetFields();
+ this.ruleForm = {
+ pass: '',
+ checkPass: '',
+ title: ''
+ }
+ },
catchmodel() {
var that = this;
window.pickedFeature;
window.pickedColor;
window.modeCatchHandler = new Cesium.ScreenSpaceEventHandler(Viewer.scene.canvas);
window.modeCatchHandler.setInputAction((event) => {
- window.pickedFeature && (window.pickedFeature.color = window.pickedColor);
+ if (window.pickedColor) { window.pickedFeature && (window.pickedFeature.color = window.pickedColor); }
+ // window.pickedFeature && (window.pickedFeature.color = window.pickedColor);
window.pickedFeature = sgworld.Viewer.scene.pick(event.position);
if (Cesium.defined(window.pickedFeature)) {
if (window.pickedFeature.primitive instanceof Cesium.Cesium3DTileset) {
- if (window.pickedFeature && window.pickedFeature.getProperty) {
+ if (window.pickedFeature) {
window.pickedColor = window.pickedFeature.color
window.pickedFeature.color = Cesium.Color.RED.withAlpha(0.3);
// this.$store.state.catModel = true;
- that.$store.state.catModelInfo = {
- id: pickedFeature.getProperty("id"),
- name: pickedFeature.getProperty("name"),
- layerId: pickedFeature.primitive.layerId,
- layerName: pickedFeature.primitive.id
- };
- that.$refs && that.$refs.modelProperty && that.$refs.modelProperty.open();
+
+ that.setModelInfoData(window.pickedFeature);
}
}
}
}, Cesium.ScreenSpaceEventType.LEFT_CLICK)
+ },
+ async setModelInfoData(result) {
+ var modelKey = 'id';
+ var modelid;
+ if (result.tileset) {
+ if (result.tileset.pubid && parseInt(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,鏃犳硶鏌ヨ鏁版嵁');
+ }
+ modelid = pickedFeature.getProperty(modelKey);
+
+ }
+ } else {
+ modelid = '3dml' + result.primitive.id;
+ }
+ var that = this
+ if (!modelid) {
+ modelid = "noAuto_" + pickedFeature.primitive.layerId;
+ }
+ var obj = {
+ layerid: pickedFeature.primitive.layerId,
+ modelid: modelid
+ }
+
+ const data1 = await comprehensive_selectModelByGuid(obj);
+
+ if (data1.code != 200) {
+ return;
+ }
+ var name = null;
+ var bak = null;
+ var type = null;
+ if (data1.result) {
+ name = data1.result.name;
+ bak = data1.result.bak;
+ type = data1.result.type;
+ }
+
+ that.$store.state.catModelInfo = {
+ id: modelid,
+ name: name,
+ type: type,
+ bak: bak,
+ layerId: pickedFeature.primitive.layerId,
+ layerName: pickedFeature.primitive.id
+ };
+ that.$refs && that.$refs.modelProperty && that.$refs.modelProperty.open();
},
drawTerrainLevel() {
this.clearTerrainLevel()
@@ -809,7 +1302,20 @@
licenseServer: window.sceneConfig.licenseServer,
});
window.Viewer = window.sgworld._Viewer;
+ if (is_production) {
+ Viewer.imageryLayers.removeAll();
+ var base_ulr = window.sceneConfig.baseUrl;
+ if (base_ulr.indexOf('{host}') > -1) {
+ base_ulr = base_ulr.replace("{host}", iisHost)
+ }
+ Viewer.imageryLayers.addImageryProvider(
+ new Cesium.UrlTemplateImageryProvider({
+ url: base_ulr,
+ maximumLevel: 5
+ })
+ );
+ }
//瀹氫綅
// sgworld.Navigate.jumpTo({
// //璺宠浆瑙嗚
@@ -833,12 +1339,30 @@
//鏄剧ずfps
Viewer.scene.debugShowFramesPerSecond = false;
//瀵艰埅鎺т欢
- window.sgworld.navControl("nav", false);
+ // window.sgworld.navControl("nav", false);
//姣斾緥灏�
- window.sgworld.navControl("scale", false);
+ // window.sgworld.navControl("scale", false);
//寮�鍚繁搴︽娴�
// sgworld.Analysis.depthTestAgainstTerrain(true)
Viewer.scene.globe.depthTestAgainstTerrain = true;
+ if (is_production) {
+
+ var base_ulr = window.sceneConfig.baseUrl;
+ if (base_ulr.indexOf('{host}') > -1) {
+ base_ulr = base_ulr.replace("{host}", iisHost)
+ }
+ window.TileMapLayer = Viewer.imageryLayers.addImageryProvider(
+ new Cesium.UrlTemplateImageryProvider({
+ url: base_ulr,
+ maximumLevel: 9
+ })
+ );
+ window.BaseMapLayer = Viewer.imageryLayers.addImageryProvider(
+ new Cesium.UrlTemplateImageryProvider({
+ url: base_ulr,
+ })
+ );
+ }
var option = {
url: window.sceneConfig.SGUrl,
@@ -846,11 +1370,9 @@
requestVertexNormals: true,
};
window.terrainLayer = sgworld.Creator.sfsterrainprovider("", option, "", true, "");
-
+ window.terrainFlag = 'MPT'
window.elevationTool = new SmartEarth.ElevationTool(window.sgworld);
elevationTool.setContourColor("#F1D487");
-
-
},
//dem鍒囨崲
changeTerrainLayer() {
@@ -871,7 +1393,8 @@
window.terrainLayer = null;
window.terrainLayer = new Cesium.CesiumTerrainProvider({
- url: LFData + '/3d/terrain/dem20230321'
+ // url: LFData + '/3d/terrain/dem20230321'
+ url: demLayer
});
Viewer.terrainProvider = window.terrainLayer
Viewer.camera.flyTo({
@@ -882,7 +1405,6 @@
roll: 0.0
}
});
-
}
this.terrainflag = !this.terrainflag
},
@@ -1047,17 +1569,27 @@
this.$store.state.propertiesFlag = null;
this.showAttribute = false;
break;
+ case 7:
+ this.surfaceDeFormFlag = false;
+ break;
}
},
//瀹氫綅
setCoordLocal() {
- var lon = parseFloat(this.coordFrom.lon);
- var lat = parseFloat(this.coordFrom.lat);
- var height = parseFloat(this.coordFrom.height);
+ if (!this.coordFrom.lon) {
+ return this.$message('璇疯緭鍏ョ粡搴�');
+ }
+ if (!this.coordFrom.lat) {
+ return this.$message('璇疯緭鍏ョ含搴�');
+ }
+ var lon = parseFloat(this.coordFrom.lon)
+ var lat = parseFloat(this.coordFrom.lat)
+ var height = parseFloat(this.coordFrom.height) == NaN ? parseFloat(this.coordFrom.height) : 100;
+
var position = {
X: lon,
Y: lat,
- Altitude: 2000,
+ Altitude: height,
};
if (this.imagePoint != null) {
sgworld.Creator.DeleteObject(this.imagePoint);
@@ -1399,7 +1931,7 @@
return
}
if (res.result.length <= 0) {
- this.$message.error('鏆傛棤闄勪欢');
+ this.$message('鏆傛棤闄勪欢');
return
}
@@ -1409,7 +1941,21 @@
//鏄惁鏄剧ず鏌ョ湅鎸夐挳
showAttachDetailBtn(row) {
var name = row.name;
- if (name.indexOf('.pdf') != -1 || name.indexOf('.jpg') != -1 || name.indexOf('.gif') != -1 || name.indexOf('.png') != -1 || name.indexOf('.jpeg') != -1) {
+
+ if (
+ name.indexOf('.pdf') != -1
+ || name.indexOf('.jpg') != -1
+ || name.indexOf('.gif') != -1
+ || name.indexOf('.png') != -1
+ || name.indexOf('.jpeg') != -1
+ || name.indexOf('.PDF') != -1
+ || name.indexOf('.JPG') != -1
+ || name.indexOf('.GIF') != -1
+ || name.indexOf('.PNG') != -1
+ || name.indexOf('.JPEG') != -1
+ || name.indexOf('.BMP') != -1
+ || name.indexOf('.bmp') != -1
+ ) {
return true;
}
return false;
@@ -1425,13 +1971,24 @@
showAttachDetail(row) {
this.refreshAttatchDetail();
var name = row.name;
- if (name.indexOf('.pdf') != -1) {
+ if (name.indexOf('.pdf') != -1 || name.indexOf('.PDF') != -1) {
this.dialog.dialogVisible = true;
this.dialog.isPdf = true;
var url = BASE_URL + "/comprehensive/downloadForView?guid=" + row.guid + "&token=" + getToken();
this.dialog.src = url
}
- else if (name.indexOf('.jpg') != -1 || name.indexOf('.gif') != -1 || name.indexOf('.png') != -1 || name.indexOf('.jpeg') != -1) {
+ else if (
+ name.indexOf('.jpg') != -1
+ || name.indexOf('.gif') != -1
+ || name.indexOf('.png') != -1
+ || name.indexOf('.jpeg') != -1
+ || name.indexOf('.JPG') != -1
+ || name.indexOf('.GIF') != -1
+ || name.indexOf('.PNG') != -1
+ || name.indexOf('.JPEG') != -1
+ || name.indexOf('.BMP') != -1
+ || name.indexOf('.bmp') != -1
+ ) {
this.dialog.dialogVisible = true;
this.dialog.isJpg = true;
var url = BASE_URL + "/comprehensive/downloadForView?guid=" + row.guid + "&token=" + getToken();
@@ -1530,7 +2087,7 @@
}
if (!data.result.length) {
- this.$message.error("鏈煡璇㈠埌鍕樻帰淇℃伅鏁版嵁");
+ this.$message("鏈煡璇㈠埌鍕樻帰淇℃伅鏁版嵁");
return
}
this.showAttribute = !this.showAttribute;
@@ -1602,10 +2159,25 @@
position: absolute;
right: 8%;
bottom: 1%;
+ span {
+ width: 100px;
+ }
}
.propertiesPop {
width: 350px;
height: 370px;
+ z-index: 40;
+ position: absolute;
+ right: 8%;
+ bottom: 1%;
+ /deep/ .el-card__header {
+ padding: 10px 20px;
+ }
+ /deep/ .el-card__body {
+ padding: 10px 20px;
+ }
+ }
+ .surfaceDeFormPop {
z-index: 40;
position: absolute;
right: 8%;
@@ -1691,7 +2263,12 @@
position: absolute;
z-index: 40;
}
-
+ .HistLeng {
+ z-index: 40;
+ position: absolute;
+ right: 115px;
+ bottom: 10px;
+ }
.lengend {
width: 300px;
z-index: 40;
@@ -1824,6 +2401,7 @@
background-repeat: no-repeat;
background-size: contain;
}
+
//.changeMapType {
// position: absolute;
// bottom: 1%;
@@ -1841,43 +2419,10 @@
// cursor: pointer;
//}
.changeTerrain {
- position: absolute;
- bottom: 84px;
- right: 46px;
- height: 30px;
- width: 30px;
- z-index: 101;
- display: flex;
- justify-content: center;
- align-items: center;
- cursor: pointer;
- border: 1px solid rgba(255, 255, 255, 0.5);
}
.changeLayer {
- position: absolute;
- bottom: 116px;
- right: 46px;
- height: 30px;
- width: 30px;
- z-index: 101;
- display: flex;
- justify-content: center;
- align-items: center;
- cursor: pointer;
- border: 1px solid rgba(255, 255, 255, 0.5);
}
.changeMapType {
- position: absolute;
- bottom: 52px;
- right: 46px;
- height: 30px;
- width: 30px;
- z-index: 101;
- display: flex;
- justify-content: center;
- align-items: center;
- cursor: pointer;
- border: 1px solid rgba(255, 255, 255, 0.5);
}
//.changeTerrain {
// position: absolute;
--
Gitblit v1.9.3