From c2a697c7399dcfb3ebae5333f05f91f488d2cb41 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期二, 21 三月 2023 09:15:00 +0800
Subject: [PATCH] 项目管理修改，底图切换修改
---
src/views/exportMap/index.vue | 16
src/views/Archive/index.vue | 7
src/views/Tools/undergroundModel.vue | 20 +
src/views/datamanage/projectManage.vue | 2
src/views/Synthesis/LeftMenu.vue | 17 +
src/components/MapView/mapMenuPop.vue | 1
src/components/mapsdk.vue | 20 +
src/components/ProjectOl.vue | 99 ++++++++-
src/views/Tools/Popup.vue | 25 +
src/components/Screen/bottom.vue | 59 ++++-
src/assets/lang/zh.js | 6
src/assets/lang/en.js | 6
src/components/MapView/mapSpacePop.vue | 136 +++++++------
src/views/Tools/AddOnlineMap.vue | 164 ++++++++-------
14 files changed, 366 insertions(+), 212 deletions(-)
diff --git a/src/assets/lang/en.js b/src/assets/lang/en.js
index 2b9f6dc..a120f96 100644
--- a/src/assets/lang/en.js
+++ b/src/assets/lang/en.js
@@ -82,7 +82,7 @@
location: 'Geographical Position',
province: 'Province',
country: 'Country',
- county: 'County',
+ county: 'City',
corpname: ' Constructing units ',
department: 'competent department',
conperiod: 'Construction period',
@@ -92,7 +92,9 @@
newProj: 'New project',
editProj: 'Edit project',
lable1: 'Add project information',
- label2: 'Modify project information'
+ label2: 'Modify project information',
+ longitude: 'longitude',
+ latitude: 'latitude'
},
dataUpObj: {
diff --git a/src/assets/lang/zh.js b/src/assets/lang/zh.js
index f35b99c..2b90dff 100644
--- a/src/assets/lang/zh.js
+++ b/src/assets/lang/zh.js
@@ -84,7 +84,7 @@
location: '鍦扮悊浣嶇疆',
province: '鎵�灞炵渷浠�',
country: '鎵�灞炲浗瀹�',
- county: '鎵�灞炲幙',
+ county: '鎵�灞炲競',
corpname: '寤鸿鍗曚綅鍚嶇О',
department: '涓荤閮ㄩ棬',
conperiod: '寤鸿宸ユ湡',
@@ -94,7 +94,9 @@
newProj: '鏂板椤圭洰',
editProj: '淇敼椤圭洰',
lable1: '娣诲姞椤圭洰淇℃伅',
- label2: '淇敼椤圭洰淇℃伅'
+ label2: '淇敼椤圭洰淇℃伅',
+ longitude: '缁忓害',
+ latitude: '绾害'
},
dataUpObj: {
catalogue: '鐩綍',
diff --git a/src/components/MapView/mapMenuPop.vue b/src/components/MapView/mapMenuPop.vue
index fc0a573..1a65fa8 100644
--- a/src/components/MapView/mapMenuPop.vue
+++ b/src/components/MapView/mapMenuPop.vue
@@ -645,6 +645,7 @@
this.$store.state.propertiesFlag = "1"
let properties = pick.id.properties
let propertyNames = pick.id.properties.propertyNames
+
let obj = {}
obj["eventid"] = properties["_eventid"]._value
//
diff --git a/src/components/MapView/mapSpacePop.vue b/src/components/MapView/mapSpacePop.vue
index adf8158..2b72194 100644
--- a/src/components/MapView/mapSpacePop.vue
+++ b/src/components/MapView/mapSpacePop.vue
@@ -490,76 +490,80 @@
message: '鏌辩姸鍥炬煡璇㈡垚鍔�',
type: 'success'
});
- }
- var val = data.result;
- val = val.filter((res) => {
+ setTimeout(() => {
+ var val = data.result;
+ val = val.filter((res) => {
- if (res.dirName) {
- res.dirid = res.dirName
- }
- if (res.depName) {
- res.depid = res.depName
- }
- if (res.verName) {
- res.verid = res.verName
- }
- if (res.updateName) {
- res.updateuser = res.updateName
- }
- if (res.createName) {
- res.createuser = res.createName
- }
-
- if (res.createtime) {
- res.createtime = this.format(res.createtime)
- }
- if (res.updatetime) {
- res.createtime = this.format(res.updatetime)
- }
- return res
- })
-
-
- this.listdata.count = data.count;
- this.tableData = val;
-
- this.showHistogramLayer(data.count)
- this.$refs.filterTable.doLayout();
- var that = this;
-
- window.histogramHandler = new Cesium.ScreenSpaceEventHandler(
- sgworld.Viewer.scene.canvas
- )
- window.histogramHandler.setInputAction((event) => {
- var pick = sgworld.Viewer.scene.pick(event.endPosition);
-
- var propertiesFlag = that.$store.state.propertiesFlag
-
- if (Cesium.defined(pick)) {
- if (pick && pick.id && pick.id.tag && pick.id.tag == "Histogram") {
- that.$store.state.propertiesInfo = {
- title: pick.id.properties._exppointid._value,
- name: pick.id.properties._geoname._value,
- type: pick.id.properties.geotype._value,
- botdepth: pick.id.properties._botdepth._value,
- describe: pick.id.properties._describe._value,
+ if (res.dirName) {
+ res.dirid = res.dirName
}
- that.$store.state.propertiesFlag = "2"
- } else {
- if (propertiesFlag == 1) {
- that.$store.state.propertiesFlag = propertiesFlag
+ if (res.depName) {
+ res.depid = res.depName
+ }
+ if (res.verName) {
+ res.verid = res.verName
+ }
+ if (res.updateName) {
+ res.updateuser = res.updateName
+ }
+ if (res.createName) {
+ res.createuser = res.createName
+ }
+
+ if (res.createtime) {
+ res.createtime = this.format(res.createtime)
+ }
+ if (res.updatetime) {
+ res.createtime = this.format(res.updatetime)
+ }
+ return res
+ })
+
+
+ this.listdata.count = data.count;
+ this.tableData = val;
+
+ this.showHistogramLayer(data.count)
+ this.$refs.filterTable.doLayout();
+ var that = this;
+
+ window.histogramHandler = new Cesium.ScreenSpaceEventHandler(
+ sgworld.Viewer.scene.canvas
+ )
+ window.histogramHandler.setInputAction((event) => {
+ var pick = sgworld.Viewer.scene.pick(event.endPosition);
+
+ var propertiesFlag = that.$store.state.propertiesFlag
+
+ if (Cesium.defined(pick)) {
+ if (pick && pick.id && pick.id.tag && pick.id.tag == "Histogram") {
+ that.$store.state.propertiesInfo = {
+ title: pick.id.properties._exppointid._value,
+ name: pick.id.properties._geoname._value,
+ type: pick.id.properties.geotype._value,
+ botdepth: pick.id.properties._botdepth._value,
+ describe: pick.id.properties._describe._value,
+ }
+ that.$store.state.propertiesFlag = "2"
+ } else {
+ if (propertiesFlag == 1) {
+ that.$store.state.propertiesFlag = propertiesFlag
+ } else {
+ that.$store.state.propertiesFlag = null
+ }
+ }
} else {
- that.$store.state.propertiesFlag = null
+ if (propertiesFlag == 1) {
+ that.$store.state.propertiesFlag = propertiesFlag
+ } else {
+ that.$store.state.propertiesFlag = null
+ }
}
- }
- } else {
- if (propertiesFlag == 1) {
- that.$store.state.propertiesFlag = propertiesFlag
- } else {
- that.$store.state.propertiesFlag = null
- }
- }
- }, Cesium.ScreenSpaceEventType.MOUSE_MOVE)
+ }, Cesium.ScreenSpaceEventType.MOUSE_MOVE)
+ }, 500);
+ }
+
+
},
async showHistogramLayer(res) {
var obj = {
diff --git a/src/components/ProjectOl.vue b/src/components/ProjectOl.vue
index fe09cc0..73a955f 100644
--- a/src/components/ProjectOl.vue
+++ b/src/components/ProjectOl.vue
@@ -1,16 +1,44 @@
<template>
- <div id="mapView" class="projectBox">
+ <div
+ id="mapView"
+ class="projectBox"
+ >
<div class="Tools box_divm">
- <el-button
- type="success"
- icon="el-icon-plus"
- @click="drowPoint"
- ></el-button>
- <el-button
- type="danger"
- icon="el-icon-delete"
- @click="clearDrawPoint"
- ></el-button>
+ <el-form
+ :inline="true"
+ :model="formInline"
+ class="demo-form-inline"
+ >
+ <el-form-item :label="$t('dataManage.projectObj.longitude')">
+ {{formInline.lon}}
+ </el-form-item>
+ <el-form-item :label="$t('dataManage.projectObj.latitude')">
+ {{formInline.lat}}
+ </el-form-item>
+ <el-form-item :label="$t('dataManage.projectObj.country')">
+ {{formInline.country}}
+ </el-form-item>
+ <el-form-item :label="$t('dataManage.projectObj.province')">
+ {{formInline.province}}
+ </el-form-item>
+ <el-form-item :label="$t('dataManage.projectObj.county')">
+ {{formInline.location}}
+ </el-form-item>
+
+ <el-form-item>
+ <el-button
+ type="success"
+ icon="el-icon-plus"
+ @click="drowPoint"
+ ></el-button>
+ <el-button
+ type="danger"
+ icon="el-icon-delete"
+ @click="clearDrawPoint"
+ ></el-button>
+ </el-form-item>
+ </el-form>
+
</div>
</div>
</template>
@@ -27,12 +55,20 @@
import Feature from 'ol/Feature';
import { Circle as CircleStyle, Style, Fill, Stroke } from 'ol/style';
import { Point } from 'ol/geom';
+import { project_selectLocation } from '../api/api.js'
export default {
data() {
return {
mapol: null,
drawLayer: null,
draw: null,
+ formInline: {
+ lon: '',
+ lat: '',
+ location: '',
+ province: '',
+ country: ''
+ }
};
},
methods: {
@@ -60,7 +96,7 @@
.replace('POINT(', '')
.replace(')', '');
var a1 = value.split(' ');
- console.log(a1);
+ this.showLoacation(a1)
var a2 = transform(
[parseFloat(a1[0]), parseFloat(a1[1])],
'EPSG:4326',
@@ -90,6 +126,13 @@
this.mapol.removeLayer(this.drawLayer);
this.drawLayer = null;
this.$store.state.projeOl = null;
+ this.formInline = {
+ lon: '',
+ lat: '',
+ location: '',
+ province: '',
+ country: ''
+ }
}
},
@@ -114,12 +157,35 @@
let geom = feature.getGeometry();
var extent = geom.flatCoordinates;
var a1 = transform([extent[0], extent[1]], 'EPSG:3857', 'EPSG:4326');
-
+ this.showLoacation(a1)
this.$store.state.projeOl =
'POINT(' + a1[0].toFixed(6) + ' ' + a1[1].toFixed(6) + ')';
this.mapol.removeInteraction(this.draw);
});
},
+ async showLoacation(res) {
+ this.formInline.lon = res[0].toFixed(6);
+ this.formInline.lat = res[1].toFixed(6);
+ const data = await project_selectLocation({
+ x: res[0],
+ y: res[1],
+ });
+ if (data.code == 200) {
+ for (var i in data.result) {
+ var key = data.result[i].key;
+ var val = data.result[i].value;
+ if (key == "鍥�") {
+ this.formInline.country = val;
+ } else if (key == "鐪�") {
+ this.formInline.province = val;
+ } else if (key == "甯�") {
+ this.formInline.location = val;
+ }
+ }
+ }
+ }
+
+
},
mounted() {
this.initOlMap();
@@ -127,17 +193,20 @@
};
</script>
-<style>
+<style lang="less" scoped>
.projectBox {
width: 100%;
height: 100%;
overflow: hidden;
margin: 0;
padding: 0;
+ /deep/.el-form-item {
+ margin-bottom: 0px;
+ }
}
.Tools {
position: absolute;
-
+
opacity: 0.9;
z-index: 40;
padding: 10px;
diff --git a/src/components/Screen/bottom.vue b/src/components/Screen/bottom.vue
index 96a8db5..ce01b0c 100644
--- a/src/components/Screen/bottom.vue
+++ b/src/components/Screen/bottom.vue
@@ -28,7 +28,10 @@
v-model="searchName"
@change="handleSearchChange(item)"
>
- <el-button slot="append" icon="el-icon-search"></el-button>
+ <el-button
+ slot="append"
+ icon="el-icon-search"
+ ></el-button>
</el-input>
</div>
<div class="popover-content__list">
@@ -56,7 +59,12 @@
</div>
</div>
<div class="bottom13">
- <div class="bottom13-wrapper" :class="isExpand ? 'expend' : 'fold'" @mouseover="handleMouseOver" @mouseout="handleMouseOut">
+ <div
+ class="bottom13-wrapper"
+ :class="isExpand ? 'expend' : 'fold'"
+ @mouseover="handleMouseOver"
+ @mouseout="handleMouseOut"
+ >
<div
v-for="item in yxList"
yxList
@@ -222,29 +230,42 @@
Viewer.imageryLayers._layers[2].show = false
Viewer.imageryLayers._layers[3].show = false
if (yunxuanLayer) {
- yunxuanLayer.item.show = false
+ Viewer.imageryLayers.remove(yunxuanLayer);
+ yunxuanLayer = null
}
switch (name) {
case "鏅曟覆鍥�":
if (yunxuanLayer == null) {
- var urls = "https://tiles3.geovisearth.com/base/v1/ter"
- // 鏄熷浘鍦扮悆鍦板舰鏅曟覆
- yunxuanLayer = sgworld.Creator.createUrlTemplateImageryProvider(
- "鏄熷浘鍦扮悆鍦板舰鏅曟覆",
- {
- url:
- urls +
- "/{z}/{x}/{y}?format=webp&token=486dac3bec56d7d7c2a581c150be2bd937462f1e8f3bc9c78b5658b396122405",
- },
- "0",
- undefined,
- true,
- ""
- )
+ // var urls = "https://tiles3.geovisearth.com/base/v1/ter"
+ // // 鏄熷浘鍦扮悆鍦板舰鏅曟覆
+ // yunxuanLayer = sgworld.Creator.createUrlTemplateImageryProvider(
+ // "鏄熷浘鍦扮悆鍦板舰鏅曟覆",
+ // {
+ // url:
+ // urls +
+ // "/{z}/{x}/{y}?format=webp&token=486dac3bec56d7d7c2a581c150be2bd937462f1e8f3bc9c78b5658b396122405",
+ // },
+ // "0",
+ // undefined,
+ // true,
+ // ""
+ // )
+ var urls = "http://t0.tianditu.com/ter_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=ter&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default&format=tiles&tk=";
+ var tokne = "94a34772eb88317fcbf8428e10448561"
+ yunxuanLayer = Viewer.imageryLayers.addImageryProvider(new Cesium.WebMapTileServiceImageryProvider({
+ url: urls + tokne,
+ layer: "tdtImgLayer",
+ style: "default",
+ format: "image/jpeg",
+ tileMatrixSetID: "GoogleMapsCompatible",
+ }))
+ Viewer.imageryLayers.lowerToBottom(yunxuanLayer);//灏嗗浘灞傜Щ鍒版渶搴曞眰
+
+ Viewer.imageryLayers.raise(yunxuanLayer);//灏嗗浘灞備笂绉讳竴灞�
}
- yunxuanLayer.item.show = true
+
break
case "褰卞儚鍥�":
@@ -350,7 +371,7 @@
return menu.children
// return menu.children.filter(item => item.name.indexOf(searchName) > -1)
},
- handleSearchChange(currMenu) {},
+ handleSearchChange(currMenu) { },
async getCountProjectDisplay() {
// const res = await countProjectLocation()
// if (res.code === 200) {
diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue
index 81e2456..2ae02a8 100644
--- a/src/components/mapsdk.vue
+++ b/src/components/mapsdk.vue
@@ -360,7 +360,7 @@
<span>灞炴�т俊鎭�</span>
<div style="float: right; cursor: pointer">
<el-link
- v-if="$store.state.propertiesName.tabDesc == '鍕樺療宸ョ偣'"
+ v-if="$store.state.propertiesName.enName == 's_surveyworksite'"
type="primary"
:underline="false"
@click="getPointInfo"
@@ -398,6 +398,7 @@
</div>
<!--鍕樺療淇℃伅寮圭獥-->
<div
+ v-drag
class="attributionPop"
v-if="showAttribute"
>
@@ -1340,6 +1341,7 @@
tabName: tabName,
};
const res = await dataLib_selectFiles(obj);
+
if (res.code != 200) {
this.$message.error('闄勪欢鏌ヨ澶辫触');
return
@@ -1414,12 +1416,13 @@
},
//鍕樺療淇℃伅琛�
getPointInfo() {
- this.showAttribute = !this.showAttribute;
+
if (this.showAttribute) {
- let attrbuteOption = workSite;
- var name = attrbuteOption[0].table.replaceAll("_", "");
- this.getAttributeDomFiled(name);
+
}
+ let attrbuteOption = workSite;
+ var name = attrbuteOption[0].table.replaceAll("_", "");
+ this.getAttributeDomFiled(name);
},
//鑾峰彇姣忎釜琛ㄥ瓧娈靛悕绉板強闃堝��
async getAttributeDomFiled(res) {
@@ -1467,11 +1470,18 @@
title: title,
filter: "workname = " + "'" + title + "'",
}
+
const data = await dataQuery_selectByPage(parmams);
if (data.code != 200) {
this.$message.error("璋冪敤鍒楄〃澶辫触,璇疯仈绯诲伐浣滀汉鍛�!");
return;
}
+
+ if (!data.result.length) {
+ this.$message.error("鏈煡璇㈠埌鍕樻帰淇℃伅鏁版嵁");
+ return
+ }
+ this.showAttribute = !this.showAttribute;
var res_val = attributeFild;
for (var i in data.result) {
let val_Data = data.result[i];
diff --git a/src/views/Archive/index.vue b/src/views/Archive/index.vue
index adadd70..0070f9d 100644
--- a/src/views/Archive/index.vue
+++ b/src/views/Archive/index.vue
@@ -243,6 +243,8 @@
<div class="cardItem"> {{$t('archiveObj.dataType')}} : {{ item.mold }} </div>
<div class="cardItem"> {{$t('dataManage.vmobj.format')}} : {{ item.type }} </div>
<div class="cardItem"> {{$t('dataManage.vmobj.size')}} : {{stateFormatSizes(item.sizes)}} </div>
+ <div class="cardItem"> {{$t('dataManage.vmobj.tab')}} : {{ item.tab }} </div>
+ <div class="cardItem"> {{$t('dataManage.vmobj.row')}} : {{ item.rows }} </div>
<div class="cardItem"> {{$t('archiveObj.downloads')}} : {{ item.downCount }} 娆� </div>
<div class="cardItem"> {{$t('dataManage.vmobj.createonuser')}} : {{item.uname}} </div>
<div class="cardItem"> {{$t('dataManage.vmobj.depName')}} : {{item.depName}} </div>
@@ -289,6 +291,10 @@
<p>{{ $t('dataManage.vmobj.format') }}锛歿{ itemdetail1.type }}</p>
<el-divider></el-divider>
<p>{{ $t('common.size') }}锛歿{ stateFormatSizes(itemdetail1.sizes) }}</p>
+ <el-divider></el-divider>
+ <p>{{ $t('dataManage.vmobj.tab') }}锛歿{ itemdetail1.tab }}</p>
+ <el-divider></el-divider>
+ <p>{{ $t('dataManage.vmobj.row') }}锛歿{itemdetail1.rows }}</p>
<el-divider></el-divider>
<p>{{ $t('archiveObj.downloads') }}锛歿{ itemdetail1.downCount }} 娆�</p>
<el-divider></el-divider>
@@ -2098,6 +2104,7 @@
if (data.code != 200) {
this.$message.error('鏂囦欢鏁版嵁鍒楄〃璋冪敤澶辫触');
}
+
var val = data.result;
if (val) {
val = val.filter((res) => {
diff --git a/src/views/Synthesis/LeftMenu.vue b/src/views/Synthesis/LeftMenu.vue
index d0e7a8c..112bd39 100644
--- a/src/views/Synthesis/LeftMenu.vue
+++ b/src/views/Synthesis/LeftMenu.vue
@@ -680,7 +680,7 @@
}
}
this.showTwoMenuFlag = res.id;
- if (val != 'h') {
+ if (val != 'h' && res.id != "b9") {
sgworld.Creator.SimpleGraphic.clear();
Viewer.entities.removeAll();
}
@@ -2166,9 +2166,16 @@
case "b9": //鍦颁笅妯″紡
// this.UndergroundMode = !this.UndergroundMode;
// window.sgworld.Analysis.UndergroundMode(this.UndergroundMode, 0.3);
- this.$refs &&
- this.$refs.undergroundModel &&
- this.$refs.undergroundModel.open("鍦颁笅妯″紡", null,);
+ if (window.UndergroundMode) {
+ this.$refs &&
+ this.$refs.undergroundModel &&
+ this.$refs.undergroundModel.close();
+ } else {
+ this.$refs &&
+ this.$refs.undergroundModel &&
+ this.$refs.undergroundModel.open("鍦颁笅妯″紡", null,);
+ }
+
break;
}
},
@@ -2336,6 +2343,7 @@
const res = await dataQuery_selectTabByEntity({
name: this.$store.state.pickoption.name
})
+
if (res.code != 200) {
return;
}
@@ -2384,6 +2392,7 @@
if (data.code != 200) {
return
}
+
var valste = data.result
diff --git a/src/views/Tools/AddOnlineMap.vue b/src/views/Tools/AddOnlineMap.vue
index 83d42a9..ee4f10e 100644
--- a/src/views/Tools/AddOnlineMap.vue
+++ b/src/views/Tools/AddOnlineMap.vue
@@ -120,79 +120,92 @@
zIndex: undefined,
},
mapCollection: undefined,
- mapList: [
- {
- name: "澶╁湴鍥�",
- sourceType: "tdmap",
- tokne: "94a34772eb88317fcbf8428e10448561",
- maximumLevel: 18,
- id: 1,
- isShow: true,
- list: [
- {
- name: "澶╁湴鍥惧湴鍥�",
- image: require("../../assets/img/imageLayer/tdmap_map.jpg"),
- urls: "http://t0.tianditu.com/vec_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=vec&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default&format=tiles&tk=",
- olUrls: 'http://t0.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk='
- },
- {
- name: "澶╁湴鍥惧奖鍍�",
- image: require("../../assets/img/imageLayer/tdmap_image.jpg"),
- urls: "http://t0.tianditu.com/img_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=img&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default&format=tiles&tk=",
- olUrls: 'http://t0.tianditu.gov.cn/DataServer?T=img_w&x={x}&y={y}&l={z}&tk='
- },
- {
- name: "澶╁湴鍥惧湴褰�",
- image: require("../../assets/img/imageLayer/tdmap_label.jpg"),
- urls: "http://t0.tianditu.com/ter_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=ter&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default&format=tiles&tk=",
- olUrls: 'http://t0.tianditu.gov.cn/DataServer?T=ter_w&x={x}&y={y}&l={z}&tk='
- },
- ],
- },
- {
- name: "楂樺痉鍦板浘",
- sourceType: "gdmap",
- maximumLevel: 18,
- id: 2,
- isShow: true,
- list: [
- {
- name: "楂樺痉鍦板浘",
- image: require("../../assets/img/imageLayer/gdmap_map.jpg"),
- urls: "https://webst02.is.autonavi.com/appmaptile?style=7&x={x}&y={y}&z={z}",
- },
- {
- name: "楂樺痉褰卞儚",
- image: require("../../assets/img/imageLayer/gdmap_image.jpg"),
- urls: "https://webst02.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}",
- },
+ mapList: [{
+ name: "Cesium",
+ sourceType: "cesium",
+ tokne: "94a34772eb88317fcbf8428e10448561",
+ maximumLevel: 18,
+ id: 1,
+ isShow: true,
+ list: [{
+ name: "Cesium褰卞儚",
+ image: require("../../assets/img/imageLayer/tdmap_image.jpg"),
- ],
- }, {
- name: '鏈湴鏈嶅姟',
- sourceType: 'localmap',
- maximumLevel: 18,
- id: 3,
- isShow: true,
- list: [
- {
- name: "鍦板浘",
- image: require("../../assets/img/imageLayer/gdmap_map.jpg"),
- urls: "http://{host}/LFData/2d/tiles/vec/{z}/{x}/{y}.png",
- },
- {
- name: "褰卞儚",
- image: require("../../assets/img/imageLayer/gdmap_image.jpg"),
- urls: "http://{host}/LFData/2d/tiles/img/{z}/{x}/{y}.png",
- },
- // {
- // name: "鍦板舰",
- // image: require("../../assets/img/imageLayer/tdmap_label.jpg"),
- // urls: "http://{host}/LFData/2d/tiles/ter/{z}/{x}/{y}.png",
- // },
+ },],
+ },
- ],
- }
+ {
+ name: "澶╁湴鍥�",
+ sourceType: "tdmap",
+ tokne: "94a34772eb88317fcbf8428e10448561",
+ maximumLevel: 18,
+ id: 1,
+ isShow: true,
+ list: [
+ {
+ name: "澶╁湴鍥惧湴鍥�",
+ image: require("../../assets/img/imageLayer/tdmap_map.jpg"),
+ urls: "http://t0.tianditu.com/vec_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=vec&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default&format=tiles&tk=",
+ olUrls: 'http://t0.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk='
+ },
+ {
+ name: "澶╁湴鍥惧奖鍍�",
+ image: require("../../assets/img/imageLayer/tdmap_image.jpg"),
+ urls: "http://t0.tianditu.com/img_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=img&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default&format=tiles&tk=",
+ olUrls: 'http://t0.tianditu.gov.cn/DataServer?T=img_w&x={x}&y={y}&l={z}&tk='
+ },
+ {
+ name: "澶╁湴鍥惧湴褰�",
+ image: require("../../assets/img/imageLayer/tdmap_label.jpg"),
+ urls: "http://t0.tianditu.com/ter_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=ter&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default&format=tiles&tk=",
+ olUrls: 'http://t0.tianditu.gov.cn/DataServer?T=ter_w&x={x}&y={y}&l={z}&tk='
+ },
+ ],
+ },
+ {
+ name: "楂樺痉鍦板浘",
+ sourceType: "gdmap",
+ maximumLevel: 18,
+ id: 2,
+ isShow: true,
+ list: [
+ {
+ name: "楂樺痉鍦板浘",
+ image: require("../../assets/img/imageLayer/gdmap_map.jpg"),
+ urls: "https://webst02.is.autonavi.com/appmaptile?style=7&x={x}&y={y}&z={z}",
+ },
+ {
+ name: "楂樺痉褰卞儚",
+ image: require("../../assets/img/imageLayer/gdmap_image.jpg"),
+ urls: "https://webst02.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}",
+ },
+
+ ],
+ }, {
+ name: '鏈湴鏈嶅姟',
+ sourceType: 'localmap',
+ maximumLevel: 18,
+ id: 3,
+ isShow: true,
+ list: [
+ {
+ name: "鍦板浘",
+ image: require("../../assets/img/imageLayer/gdmap_map.jpg"),
+ urls: "http://{host}/LFData/2d/tiles/vec/{z}/{x}/{y}.png",
+ },
+ {
+ name: "褰卞儚",
+ image: require("../../assets/img/imageLayer/gdmap_image.jpg"),
+ urls: "http://{host}/LFData/2d/tiles/img/{z}/{x}/{y}.png",
+ },
+ {
+ name: "鍦板舰",
+ image: require("../../assets/img/imageLayer/tdmap_label.jpg"),
+ urls: "http://{host}/LFData/2d/tiles/ter/{z}/{x}/{y}.png",
+ },
+
+ ],
+ }
],
};
@@ -244,8 +257,9 @@
this.removeImageLayer();
this.mapCollection = mapCollection;
-
- if (mapCollection.sourceType === "tdmap") {
+ if (mapCollection.sourceType === "cesium") {
+ return;
+ } else if (mapCollection.sourceType === "tdmap") {
var tokne = mapCollection.tokne;
//娣诲姞澶╁湴鍥惧奖鍍�
@@ -270,7 +284,7 @@
window.BaseMapLayer = Viewer.imageryLayers.addImageryProvider(
new Cesium.UrlTemplateImageryProvider({
url: map.urls,
- maximumLevel: this.data.maximumLevel,
+ maximumLevel: 18,
})
);
@@ -290,7 +304,7 @@
window.BaseMapLayer = Viewer.imageryLayers.addImageryProvider(
new Cesium.UrlTemplateImageryProvider({
url: ulr,
- maximumLevel: this.data.maximumLevel,
+ maximumLevel: 18,
})
);
diff --git a/src/views/Tools/Popup.vue b/src/views/Tools/Popup.vue
index 444f14e..81d3fb2 100644
--- a/src/views/Tools/Popup.vue
+++ b/src/views/Tools/Popup.vue
@@ -38,7 +38,10 @@
>
<slot></slot>
</div>
- <div class="popupBtn" v-if="showBtn">
+ <div
+ class="popupBtn"
+ v-if="showBtn"
+ >
<div v-if="btnArr && btnArr.length">
<el-button
v-for="item in btnArr"
@@ -46,14 +49,18 @@
size="mini"
:type="item.type"
@click="item.fun"
- >{{ item.name }}</el-button
- >
+ >{{ item.name }}</el-button>
</div>
<div v-else>
- <el-button size="mini" @click="cancel">鍙栨秷</el-button>
- <el-button type="primary" size="mini" @click="yes"
- >纭畾</el-button
- >
+ <el-button
+ size="mini"
+ @click="cancel"
+ >鍙栨秷</el-button>
+ <el-button
+ type="primary"
+ size="mini"
+ @click="yes"
+ >纭畾</el-button>
</div>
</div>
</div>
@@ -133,6 +140,10 @@
close() {
this.showBox = false;
this.$emit("close");
+ if (window.UndergroundMode) {
+ window.sgworld.Analysis.UndergroundMode(false, 0);
+ window.UndergroundMode = null;
+ }
},
yes() {
this.$emit("yes");
diff --git a/src/views/Tools/undergroundModel.vue b/src/views/Tools/undergroundModel.vue
index 1bed81e..df22445 100644
--- a/src/views/Tools/undergroundModel.vue
+++ b/src/views/Tools/undergroundModel.vue
@@ -55,7 +55,7 @@
</template>
<script>
import Popup from "./Popup.vue";
-let UndergroundMode;
+
export default {
name: "undergroundModel",
components: {
@@ -75,11 +75,15 @@
methods: {
// 鍏抽棴寮圭獥
close() {
+ this.form.open = false;
+ this.openChange()
this.$refs.pop.close();
},
// 鎵撳紑寮圭獥
open() {
this.$refs.pop.open();
+ this.form.open = true;
+ this.openChange()
},
// 寮�鍏冲紑鍏�
openChange() {
@@ -91,12 +95,12 @@
// type: "success",
// duration: "3000",
// });
- UndergroundMode = window.sgworld.Analysis.UndergroundMode(true, value);
- UndergroundMode.grid = this.form.grid;
- UndergroundMode.depth = this.form.depth;
+ window.UndergroundMode = window.sgworld.Analysis.UndergroundMode(true, value);
+ window.UndergroundMode.grid = this.form.grid;
+ window.UndergroundMode.depth = this.form.depth;
} else {
window.sgworld.Analysis.UndergroundMode(false, value);
- UndergroundMode = null;
+ window.UndergroundMode = null;
// this.$notify({
// title: "鍦颁笅妯″紡",
// message: "鍦颁笅妯″紡宸插叧闂�",
@@ -106,7 +110,7 @@
},
// 寮�鍏冲紑鍏�
gridChange() {
- UndergroundMode && (UndergroundMode.grid = this.form.grid);
+ window.UndergroundMode && (window.UndergroundMode.grid = this.form.grid);
// if (this.form.grid) {
// this.$notify({
// title: "鍦颁笅妯″紡",
@@ -125,12 +129,12 @@
// 婊戝潡鍎垮�艰皟鏁�
alphaChange() {
let value = this.form.alpha / 100;
- UndergroundMode && (UndergroundMode.alpha = value);
+ window.UndergroundMode && (window.UndergroundMode.alpha = value);
},
// 婊戝潡鍎垮�艰皟鏁�
depthChange() {
let value = this.form.depth;
- UndergroundMode && (UndergroundMode.depth = value);
+ window.UndergroundMode && (window.UndergroundMode.depth = value);
},
},
};
diff --git a/src/views/datamanage/projectManage.vue b/src/views/datamanage/projectManage.vue
index c1b28d2..b055f36 100644
--- a/src/views/datamanage/projectManage.vue
+++ b/src/views/datamanage/projectManage.vue
@@ -376,7 +376,7 @@
x: wkt.coordinates[0],
y: wkt.coordinates[1],
});
- console.log(data.result);
+
if (data.code == 200) {
for (var i in data.result) {
var key = data.result[i].key;
diff --git a/src/views/exportMap/index.vue b/src/views/exportMap/index.vue
index 1e24f73..d697bea 100644
--- a/src/views/exportMap/index.vue
+++ b/src/views/exportMap/index.vue
@@ -325,7 +325,7 @@
treeData: [],
arrList: [],
layername: [
- 1, 2, 5, 13, 15, 31
+ 1, 2, 5, 13, 15, 16, 31
],
defaultProps: {
children: "children",
@@ -583,10 +583,10 @@
val_data.push(this.tableData[i].ename)
}
if (this.isActive) {
- val_data.push("鐭㈤噺鍥�")
+ val_data.push("楂樺痉鐭㈤噺")
} else {
- val_data.push("褰卞儚娉ㄨ")
- val_data.push("褰卞儚鍥�")
+ // val_data.push("褰卞儚娉ㄨ")
+ val_data.push("楂樺痉褰卞儚")
}
this.setExportMapLayer(val_data)
this.showMapApply = false
@@ -620,10 +620,10 @@
if (str == 0 && nodes == true) {
this.showMapLayer(data)
- this.tableData.push({
- name: data.cnName,
- ename: data.enName,
- })
+ // this.tableData.push({
+ // name: data.cnName,
+ // ename: data.enName,
+ // })
}
// this.tableData = this.arrList
--
Gitblit v1.9.3