From 78345e3940e5252c63e2e52b57a1fd18af982a2b Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期五, 08 九月 2023 16:59:43 +0800
Subject: [PATCH] 发布管理改，资源查询界面修改
---
src/views/datamanage/uploadmanage.vue | 8 +++++++-
src/components/js/server.js | 18 ++++++++++++++++++
src/views/resourceQuery/resourceQuery.vue | 24 +++++++++++++++---------
3 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/src/components/js/server.js b/src/components/js/server.js
index acd0807..9aa9e3c 100644
--- a/src/components/js/server.js
+++ b/src/components/js/server.js
@@ -168,7 +168,17 @@
}
},
+ setAddReleaseLayer(res) {
+ switch (res.type) {
+ case "DOM"://URL
+ this.setAddWmtsLayer(res)
+ break;
+ case 'DEM'://Tileset
+ this.setAddTearrinLayer(res)
+ break;
+ }
+ },
@@ -240,6 +250,7 @@
//娣诲姞WMTS鏈嶅姟
setAddWmtsLayer(res) {
var url = this.getLayerUrl(res)
+
var urlTemplateImageryProvider = earthCtrl.factory.createImageryLayer({
sourceType: "wmts",
url: url,
@@ -316,6 +327,13 @@
return BASE_URL + val
}
break;
+ case 3:
+ var token = getToken();
+ if (res.proxy && res.proxy.indexOf('{token}') > -1) {
+ var val = res.proxy.replaceAll('{token}', token)
+ return BASE_URL + val
+ }
+ break;
}
},
};
diff --git a/src/views/datamanage/uploadmanage.vue b/src/views/datamanage/uploadmanage.vue
index 61d14b4..5419a3f 100644
--- a/src/views/datamanage/uploadmanage.vue
+++ b/src/views/datamanage/uploadmanage.vue
@@ -671,7 +671,7 @@
} from '../../api/api.js'
import { conditions } from '../Archive/Archive';
import { method_option, nodata_Option, server_option, system_Option, type_option } from './js/layerManage';
-
+import server from '../../components/js/server.js'
export default {
components: {
MyBread, mapview,
@@ -999,8 +999,14 @@
//棰勮寮圭獥鎵撳紑
setPreviewLayer(res) {
this.$store.state.previewLayer = res;
+
this.dialogVisible = true;
this.showMapView = true;
+
+
+ setTimeout(() => {
+ server.setAddReleaseLayer(res)
+ }, 500);
},
//鏄惁涓哄叏灞忓嚱鏁�
onFullscreen(fullscreen) {
diff --git a/src/views/resourceQuery/resourceQuery.vue b/src/views/resourceQuery/resourceQuery.vue
index 7f05ef8..2681ed6 100644
--- a/src/views/resourceQuery/resourceQuery.vue
+++ b/src/views/resourceQuery/resourceQuery.vue
@@ -179,7 +179,7 @@
</div>
<div class="attribute">
<span class="attribute_title">瀛樺偍浣嶇疆锛�</span>
- <span class="attribute_content">{{ e.path }}</span>
+ <span class="attribute_content">{{ e.dirName }}</span>
</div>
<div class="attribute">
<span class="attribute_title">鐢熶骇鏃堕棿锛�</span>
@@ -425,23 +425,29 @@
Viewer.entities.removeAll()
},
async setQueryRetrieval() {
+ var obj = JSON.parse(JSON.stringify(this.form))
if (this.geoWkt) {
- this.form.wkt = encr(this.geoWkt)
+ obj.wkt = encr(this.geoWkt)
} else {
- this.form.wkt = null;
+ obj.wkt = null;
}
if (this.acqTime) {
- this.form.endDate = this.setFromDate(this.acqTime[0])
- this.form.startDate = this.setFromDate(this.acqTime[1])
+ obj.endDate = this.setFromDate(this.acqTime[0])
+ obj.startDate = this.setFromDate(this.acqTime[1])
} else {
- this.form.endDate = null
- this.form.startDate = null
+ obj.endDate = null
+ obj.startDate = null
}
- const data = await select_meta_ByPageAndCount(this.form);
+ if (obj.sensorType == 0) {
+ obj.sensorType = ''
+ }
+ if (obj.mataType == 0) {
+ obj.mataType = ''
+ }
+ const data = await select_meta_ByPageAndCount(obj);
if (data.code != 200) return
this.form.count = data.count;
var result = data.result;
-
for (var i in result) {
if (result[i].createTime) {
result[i].createTime = this.setFromDate(result[i].createTime)
--
Gitblit v1.9.3