From fb98e10c76d7e6c2d01f3a9f8c1b727f905cbdca Mon Sep 17 00:00:00 2001
From: surprise <15810472099@163.com>
Date: 星期一, 05 二月 2024 15:30:50 +0800
Subject: [PATCH] 代码更新
---
src/api/api.js | 4
src/components/chart/DataStorageType.vue | 32 ----
src/views/Archive/index.vue | 26 ++-
src/views/Tools/LayerTree.vue | 138 +++++--------------
public/config/config.js | 4
src/views/Synthesis/LeftMenu.vue | 7
src/components/js/index.js | 35 +++++
src/components/mapsdk.vue | 66 ++++-----
src/components/chart/DataStorage.vue | 32 ----
src/components/Screen/mapsdk.vue | 42 +++--
10 files changed, 160 insertions(+), 226 deletions(-)
diff --git a/public/config/config.js b/public/config/config.js
index f3b8015..3a4fc01 100644
--- a/public/config/config.js
+++ b/public/config/config.js
@@ -2,8 +2,8 @@
var isWeb = false;
var is_production = false;//鍒ゆ柇鏄惁涓虹敓浜х幆澧� //192.168.21.194
-var webHost = isWeb ? "103.85.165.99" + ":8052" : '192.168.20.205' + ":8088";
-// var webHost = isWeb ? "103.85.165.99" + ":8052" : '192.168.21.194' + ":12316";
+// var webHost = isWeb ? "103.85.165.99" + ":8052" : '192.168.20.205' + ":8088";
+var webHost = isWeb ? "103.85.165.99" + ":8052" : '192.168.20.106' + ":12316";
var fmeHost = isWeb ? "103.85.165.99" + ":8051" : '192.168.20.205' + ":88";
diff --git a/src/api/api.js b/src/api/api.js
index 2c88876..7fe1146 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -1220,3 +1220,7 @@
+export function getArcGis(params){
+ return service.get('https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/?callback=loadJsonp940826&f=json', { params: params });
+}
+
diff --git a/src/components/Screen/mapsdk.vue b/src/components/Screen/mapsdk.vue
index e30b5a9..841daa8 100644
--- a/src/components/Screen/mapsdk.vue
+++ b/src/components/Screen/mapsdk.vue
@@ -6,6 +6,7 @@
<script>
let yunxuanLayer = null
+import mapMenu from '../js/index.js'
export default {
name: "",
components: {},
@@ -39,25 +40,9 @@
// })
},
methods: {
- init3DMap() {
- //鍦板浘鍒濆鍖�
- // window.sgworld = new SmartEarth.SGWorld("Centermapdiv", {
- // licenseServer: window.sceneConfig.licenseServer,
- // })
- // window.sgworld = new SmartEarth.SGWorld(
- // "Centermapdiv",
- // function () { }
- // )
- window.sgworld = new SmartEarth.SGWorld("Centermapdiv", {
-
- licenseServer: window.sceneConfig.licenseServer,
- });
- window.viewer = window.Viewer = window.sgworld._Viewer;
+ initData() {
if (is_production) {
Viewer.imageryLayers.removeAll();
-
-
-
}
// Viewer.imageryLayers._layers[0].show = false
sgworld.Navigate.jumpTo({ //璺宠浆瑙嗚
@@ -148,6 +133,28 @@
//鑳屾櫙閫忔槑
Viewer.scene.backgroundColor = new Cesium.Color(0.0, 0.0, 0.0, 0.0)
},
+ init3DMap() {
+ //鍦板浘鍒濆鍖�
+ // window.sgworld = new SmartEarth.SGWorld("Centermapdiv", {
+ // licenseServer: window.sceneConfig.licenseServer,
+ // })
+ // window.sgworld = new SmartEarth.SGWorld(
+ // "Centermapdiv",
+ // function () { }
+ // )
+ window.sgworld = new SmartEarth.SGWorld("Centermapdiv", {
+
+ licenseServer: window.sceneConfig.licenseServer,
+ });
+ window.viewer = window.Viewer = window.sgworld._Viewer;
+ var data = mapMenu.init();
+ data.then((res) => {
+ if (!res) {
+ mapMenu.addGaoDeMap();
+ }
+ this.initData();
+ })
+ },
},
}
</script>
@@ -158,6 +165,7 @@
height: 100%;
width: 100%;
}
+
#Centermapdiv {
height: 100%;
width: 100%;
diff --git a/src/components/chart/DataStorage.vue b/src/components/chart/DataStorage.vue
index f42e913..d4e25a8 100644
--- a/src/components/chart/DataStorage.vue
+++ b/src/components/chart/DataStorage.vue
@@ -90,40 +90,12 @@
data() {
return {
tableData: [
- {
- date: "2016-05-02",
- name: "鐜嬪皬铏�",
- address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 鍙�",
- },
- {
- date: "2016-05-04",
- name: "鐜嬪皬铏�",
- address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1517 寮�",
- },
- {
- date: "2016-05-01",
- name: "鐜嬪皬铏�",
- address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�",
- },
- {
- date: "2016-05-03",
- name: "鐜嬪皬铏�",
- address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�",
- },
+
],
config: {
header: ["缂栧彿", "鍚嶇О", "鏂囦欢鏁�"],
data: [
- ["琛�1鍒�1", "琛�1鍒�2", "琛�1鍒�3"],
- ["琛�2鍒�1", "琛�2鍒�2", "琛�2鍒�3"],
- ["琛�3鍒�1", "琛�3鍒�2", "琛�3鍒�3"],
- ["琛�4鍒�1", "琛�4鍒�2", "琛�4鍒�3"],
- ["琛�5鍒�1", "琛�5鍒�2", "琛�5鍒�3"],
- ["琛�6鍒�1", "琛�6鍒�2", "琛�6鍒�3"],
- ["琛�7鍒�1", "琛�7鍒�2", "琛�7鍒�3"],
- ["琛�8鍒�1", "琛�8鍒�2", "琛�8鍒�3"],
- ["琛�9鍒�1", "琛�9鍒�2", "琛�9鍒�3"],
- ["琛�10鍒�1", "琛�10鍒�2", "琛�10鍒�3"],
+
],
columnWidth: [40, 300, 50],
align: ["center"],
diff --git a/src/components/chart/DataStorageType.vue b/src/components/chart/DataStorageType.vue
index cc02e60..ffcf431 100644
--- a/src/components/chart/DataStorageType.vue
+++ b/src/components/chart/DataStorageType.vue
@@ -102,40 +102,12 @@
data() {
return {
tableData: [
- {
- date: "2016-05-02",
- name: "鐜嬪皬铏�",
- address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 鍙�",
- },
- {
- date: "2016-05-04",
- name: "鐜嬪皬铏�",
- address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1517 寮�",
- },
- {
- date: "2016-05-01",
- name: "鐜嬪皬铏�",
- address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�",
- },
- {
- date: "2016-05-03",
- name: "鐜嬪皬铏�",
- address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�",
- },
+
],
config: {
header: ["缂栧彿", "鍚嶇О", "鏂囦欢鏁�"],
data: [
- ["琛�1鍒�1", "琛�1鍒�2", "琛�1鍒�3"],
- ["琛�2鍒�1", "琛�2鍒�2", "琛�2鍒�3"],
- ["琛�3鍒�1", "琛�3鍒�2", "琛�3鍒�3"],
- ["琛�4鍒�1", "琛�4鍒�2", "琛�4鍒�3"],
- ["琛�5鍒�1", "琛�5鍒�2", "琛�5鍒�3"],
- ["琛�6鍒�1", "琛�6鍒�2", "琛�6鍒�3"],
- ["琛�7鍒�1", "琛�7鍒�2", "琛�7鍒�3"],
- ["琛�8鍒�1", "琛�8鍒�2", "琛�8鍒�3"],
- ["琛�9鍒�1", "琛�9鍒�2", "琛�9鍒�3"],
- ["琛�10鍒�1", "琛�10鍒�2", "琛�10鍒�3"],
+
],
columnWidth: [40, 300, 50],
align: ["center"],
diff --git a/src/components/js/index.js b/src/components/js/index.js
new file mode 100644
index 0000000..96a6637
--- /dev/null
+++ b/src/components/js/index.js
@@ -0,0 +1,35 @@
+
+const mapMenu = {
+ async init() {
+ var url = "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/?f=json"; // callback=loadJsonp
+ var flag;
+ $.ajax({
+ type: "GET",
+ url: url,
+ data: null,
+ async: false, // 璁〢jax鍚屾
+ timeout: 1500,
+ success: function (data) {
+ flag = true;
+ },
+ error: function (e) {
+ flag = false;
+ }
+ });
+ return flag;
+ },
+ addGaoDeMap() {
+ 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
+ })
+ );
+ },
+}
+export default mapMenu;
\ No newline at end of file
diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue
index 3414c6a..6e8d491 100644
--- a/src/components/mapsdk.vue
+++ b/src/components/mapsdk.vue
@@ -463,6 +463,7 @@
} from '../api/api'
import { getToken } from '@/utils/auth'
import * as echarts from "echarts"
+import mapMenu from "./js/index";
import axios from 'axios';
export default {
name: "",
@@ -942,46 +943,10 @@
window.TerrainFlattening && window.TerrainFlattening.remove();
}
},
- addGaoDeMap() {
- 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
- })
- );
+ initData() {
- },
- init3DMap() {
- var webKey = "94a34772eb88317fcbf8428e10448561";
- //鍦板浘鍒濆鍖�
- window.sgworld = new SmartEarth.SGWorld("mapdiv", {
-
- licenseServer: window.sceneConfig.licenseServer,
- });
- var url = "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/?callback=loadJsonp940826&f=json"
- $.ajax({
- url: url,
- timeout: 1500, // 璇锋眰瓒呮椂鏃堕棿
- async: true,
- type: "GET",
- success: (res) => {
- console.log("鍦ㄧ嚎鍦板潃鑾峰彇鎴愬姛")
- },
- error: (res) => {
- console.log("鍦ㄧ嚎鍦板潃鑾疯幏鍙栧け璐�")
- this.addGaoDeMap();
- }
- })
-
-
- window.Viewer = window.sgworld._Viewer;
if (is_production) {
- this.addGaoDeMap();
+ mapMenu.addGaoDeMap();
}
//瀹氫綅
// sgworld.Navigate.jumpTo({
@@ -1046,6 +1011,31 @@
window.terrainFlag = 'MPT'
window.elevationTool = new SmartEarth.ElevationTool(window.sgworld);
elevationTool.setContourColor("#F1D487");
+
+ this.$bus.$emit('addImageLayer', true);
+ },
+ init3DMap() {
+ var webKey = "94a34772eb88317fcbf8428e10448561";
+ //鍦板浘鍒濆鍖�
+ window.sgworld = new SmartEarth.SGWorld("mapdiv", {
+
+ licenseServer: window.sceneConfig.licenseServer,
+ });
+ window.Viewer = window.sgworld._Viewer;
+ if (is_production) {
+ this.initData();
+ } else {
+ var data = mapMenu.init();
+ data.then((res) => {
+ if (!res) {
+ mapMenu.addGaoDeMap();
+ }
+ this.initData();
+ })
+
+ }
+
+
},
//dem鍒囨崲
changeTerrainLayer() {
diff --git a/src/views/Archive/index.vue b/src/views/Archive/index.vue
index ba3fc61..66fcff7 100644
--- a/src/views/Archive/index.vue
+++ b/src/views/Archive/index.vue
@@ -2568,7 +2568,7 @@
this.listData.dirs = "";
this.listData.types = ""
if (this.formInline.category.length != 0) {
- this.listData.dirs += this.formInline.category.toString();
+ // this.listData.dirs += this.formInline.category.toString();
}
var val_data = this.formInline.category;
@@ -2618,7 +2618,9 @@
this.listData.dirs = "";
if (this.formInline.category.length != 0) {
- this.listData.dirs += this.formInline.category.toString();
+ this.listData.types = this.formInline.category.toString();
+ }else{
+ this.listData.types=null;
}
if (this.formInline.item.length != 0) {
if (this.listData.dirs.length != 0) {
@@ -2677,12 +2679,22 @@
},
//鑾峰彇璧勬枡绫诲埆鏁版嵁
async getCategorySelectData() {
- const data = await dataLib_selectDirTypes();
- if (data.code != 200) {
- this.$message.error('璧勬枡绫诲埆鍒楄〃璋冪敤澶辫触');
- }
+ // const data = await dataLib_selectDirTypes();
+ // if (data.code != 200) {
+ // this.$message.error('璧勬枡绫诲埆鍒楄〃璋冪敤澶辫触');
+ // }
- this.categoryOptions = data.result;
+ this.categoryOptions = [
+ {key:'鍩虹娴嬬粯',value:'鍩虹娴嬬粯'},
+ {key:'鍩虹鍦扮伨',value:'鍩虹鍦扮伨'},
+ {key:'鍩虹鍕樺療',value:'鍩虹鍕樺療'},
+ {key:'鍚堣鏁版嵁',value:'鍚堣鏁版嵁'},
+ {key:'绠＄悊鏁版嵁',value:'绠＄悊鏁版嵁'},
+ {key:'娴嬬粯锛圗SV锛�',value:'娴嬬粯锛圗SV锛�'},
+ {key:'鍕樺療锛圗GE锛�',value:'鍕樺療锛圗GE锛�'},
+ {key:'鍦扮伨锛圗GD锛�',value:'鍦扮伨锛圗GD锛�'},
+ {key:'娲炲簱锛圗GD锛�',value:'娲炲簱锛圗GD锛�'},
+ ];
},
//鍏抽敭瀛楁煡璇�
setSearchKeyWords() {
diff --git a/src/views/Synthesis/LeftMenu.vue b/src/views/Synthesis/LeftMenu.vue
index a391138..a19ffd7 100644
--- a/src/views/Synthesis/LeftMenu.vue
+++ b/src/views/Synthesis/LeftMenu.vue
@@ -3194,8 +3194,13 @@
this.$store.state.treeData = null;
this.$store.state.checkedKeys = [];
// this.setCoverage("a1");
- this.layersStart();
+ // this.layersStart();
+ this.$bus.$on('addImageLayer', (res)=>{
+ if(res){
+ this.layersStart();
+ }
+ });
this.$bus.$on("setDialogInsertVisible", (res) => {
if (res == true) {
diff --git a/src/views/Tools/LayerTree.vue b/src/views/Tools/LayerTree.vue
index 3a2e50f..572e389 100644
--- a/src/views/Tools/LayerTree.vue
+++ b/src/views/Tools/LayerTree.vue
@@ -2,113 +2,49 @@
<div class="lalala tree-container">
<el-form ref="form">
<el-form-item>
- <el-select
- v-model="$store.state.pigCode"
- clearable
- filterable
- style="width :100%"
- @change="prjChanged"
- placeholder="璇烽�夋嫨椤圭洰"
- >
- <el-option
- v-for="item in menus"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- >
+ <el-select v-model="$store.state.pigCode" clearable filterable style="width :100%" @change="prjChanged"
+ placeholder="璇烽�夋嫨椤圭洰">
+ <el-option v-for="item in menus" :key="item.code" :label="item.name" :value="item.code">
</el-option>
</el-select>
</el-form-item>
<el-form-item>
- <el-input
- placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
- v-model="filterText"
- class="search"
- >
+ <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText" class="search">
</el-input>
</el-form-item>
</el-form>
- <el-tree
- ref="tree"
- :data="treeData"
- node-key="id"
- show-checkbox
- :props="defaultProps"
- @node-click="handleLeftclick"
- @node-contextmenu="rightClick"
- @check="handleCheckChange"
- :default-checked-keys="handleTreeCheck"
- :expand-on-click-node="false"
- :filter-node-method="filterNode"
- >
- <span
- class="slot-t-node"
- slot-scope="{ node, data }"
- >
+ <el-tree ref="tree" :data="treeData" node-key="id" show-checkbox :props="defaultProps" @node-click="handleLeftclick"
+ @node-contextmenu="rightClick" @check="handleCheckChange" :default-checked-keys="handleTreeCheck"
+ :expand-on-click-node="false" :filter-node-method="filterNode">
+ <span class="slot-t-node" slot-scope="{ node, data }">
<span v-show="!data.isEdit">
<span :class="[data.id >= 99 ? 'slot-t-node--label' : '']">{{
- node.label
- }}</span>
+ node.label
+ }}</span>
</span>
<span v-show="data.isEdit">
- <el-input
- class="slot-t-input"
- size="mini"
- autofocus
- v-model="data.label"
- :ref="'slotTreeInput' + data.id"
- @blur.stop="nodeBlur(node, data)"
- @keydown.native.enter="nodeBlur(node, data)"
- ></el-input>
+ <el-input class="slot-t-input" size="mini" autofocus v-model="data.label" :ref="'slotTreeInput' + data.id"
+ @blur.stop="nodeBlur(node, data)" @keydown.native.enter="nodeBlur(node, data)"></el-input>
</span>
</span>
</el-tree>
- <el-card
- class="box-card"
- ref="card"
- :style="{ ...rightClickMenuStyle }"
- v-show="menuVisible"
- >
- <div
- class="edit"
- @click="showLayerAttribute()"
- v-if="showProp && !shwoHistogram"
- >
+ <el-card class="box-card" ref="card" :style="{ ...rightClickMenuStyle }" v-show="menuVisible">
+ <div class="edit" @click="showLayerAttribute()" v-if="showProp && !shwoHistogram">
<i class="el-icon-tickets"></i> 灞炴��
</div>
- <div
- class="edit"
- @click="positioning()"
- v-if="showLocal"
- >
+ <div class="edit" @click="positioning()" v-if="showLocal">
<i class="el-icon-tickets"></i> 瀹氫綅
</div>
- <div
- class="edit"
- @click="pellucidity()"
- v-if="showOpacity"
- >
+ <div class="edit" @click="pellucidity()" v-if="showOpacity">
<i class="el-icon-tickets"></i> 閫忔槑搴�
</div>
- <div
- class="edit"
- @click="histogram()"
- v-show="shwoHistogram"
- >
+ <div class="edit" @click="histogram()" v-show="shwoHistogram">
<i class="el-icon-tickets"></i> 閽诲瓟鏌辩姸鍥�
</div>
- <div
- class="edit"
- v-show="shwoTileDown"
- @click="tileDownload()"
- >
+ <div class="edit" v-show="shwoTileDown" @click="tileDownload()">
<i class="el-icon-download"></i> 鐡︾墖涓嬭浇
</div>
- <div
- class="edit"
- v-show="shwoAnnex"
- @click="annexDownload()"
- >
+ <div class="edit" v-show="shwoAnnex" @click="annexDownload()">
<i class="el-icon-tickets"></i> 闄勪欢
</div>
</el-card>
@@ -287,7 +223,15 @@
this.shwoTileDown = ["TMS", "DOM"].indexOf(object.serveType) > -1 && object.pubid; // 鐡︾墖涓嬭浇
this.menuVisible = this.showProp || this.shwoHistogram || this.showLocal || this.showOpacity || this.shwoTileDown; // 鑿滃崟
this.shwoAnnex = ['DEM', 'TMS'].indexOf(object.serveType) > -1;//闄勪欢
- this.$refs.card.$el.style.left = event.pageX + 20 + "px";
+
+
+ var left = window.innerWidth - 140;
+ var pageLeft = event.pageX + 20
+ if(pageLeft>left){
+ pageLeft = left - 25
+ }
+
+ this.$refs.card.$el.style.left =pageLeft+ "px";
this.$refs.card.$el.style.top = event.pageY + "px";
},
// 灞炴�ф樉绀�
@@ -917,7 +861,7 @@
</script>
<style scoped lang="less">
/* 鐐瑰嚮鑺傜偣鏃剁殑閫変腑棰滆壊 */
-.tree-container /deep/.el-tree-node.is-current > .el-tree-node__content {
+.tree-container /deep/.el-tree-node.is-current>.el-tree-node__content {
color: #409eff !important;
}
@@ -949,19 +893,19 @@
padding-left: 16px;
}
-.tree-container /deep/ .el-tree > .el-tree-node:before {
+.tree-container /deep/ .el-tree>.el-tree-node:before {
border-left: none;
}
-.tree-container /deep/ .el-tree > .el-tree-node:after {
+.tree-container /deep/ .el-tree>.el-tree-node:after {
border-top: none;
}
-.tree-container /deep/ .el-tree > .el-tree-node:before {
+.tree-container /deep/ .el-tree>.el-tree-node:before {
border-left: none;
}
-.tree-container /deep/ .el-tree > .el-tree-node:after {
+.tree-container /deep/ .el-tree>.el-tree-node:after {
border-top: none;
}
@@ -1024,11 +968,7 @@
z-index: 8;
}
-.tree-container
- /deep/
- .el-tree-node
- .el-tree-node__children
- .el-tree-node__content::before {
+.tree-container /deep/ .el-tree-node .el-tree-node__children .el-tree-node__content::before {
border-left: 0px dashed #ccc;
height: 100%;
top: 0;
@@ -1048,7 +988,7 @@
}
.tree-container /deep/ .el-tree-node {
- .is-leaf + .el-checkbox .el-checkbox__inner {
+ .is-leaf+.el-checkbox .el-checkbox__inner {
display: inline-block;
}
@@ -1057,11 +997,7 @@
}
}
-.tree-container
- /deep/
- .el-tree-node
- .el-tree-node__children
- .el-tree-node__content::after {
+.tree-container /deep/ .el-tree-node .el-tree-node__children .el-tree-node__content::after {
border-top: 0px dashed #ccc;
}
@@ -1079,7 +1015,7 @@
/deep/.el-card__body {
padding: 10px !important;
- > div {
+ >div {
padding-bottom: 10px;
border-bottom: 1px solid #ccc;
--
Gitblit v1.9.3