From b04816ec6bffbdc84dfe44aff256ec38f49e4dcf Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期一, 20 二月 2023 14:45:53 +0800
Subject: [PATCH] 数据申请界面修改
---
src/components/MapView/mapSpaceTop.vue | 28 ++--
src/assets/lang/zh.js | 17 +-
src/views/Archive/index.vue | 11 +
src/views/Tools/LayerTree.vue | 35 ++++++
public/index.html | 168 ++++++++++++++++++---------------
src/components/MapView/mapMenuTop.vue | 18 ++-
src/views/Synthesis/LeftMenu.vue | 3
src/assets/lang/en.js | 5
src/components/MapView/mapMenuPop.vue | 2
src/views/Archive/dataApplication.vue | 2
10 files changed, 177 insertions(+), 112 deletions(-)
diff --git a/public/index.html b/public/index.html
index 107f6f9..7a800e2 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,83 +1,99 @@
<!DOCTYPE html>
<html lang="">
- <head>
- <meta charset="utf-8" />
- <meta http-equiv="X-UA-Compatible" content="IE=edge" />
- <meta name="viewport" content="width=device-width,initial-scale=1.0" />
- <title> </title>
- <link rel="stylesheet" href="./SmartEarthSDK/Workers/css/smartearth.css" />
- <link rel="stylesheet" href="./SmartEarthSDK/Workers/layui/css/layui.css" />
+<head>
+ <meta charset="utf-8" />
- <script src="./SmartEarthSDK/Workers/polyfill.min.js"></script>
- <script src="./SmartEarthSDK/Cesium/Cesium.js"></script>
- <script src="./SmartEarthSDK/SmartEarth.min.js"></script>
- <script src="./SmartEarthSDK/Workers/TreeTool.js"></script>
- <script src="./config/config.js"></script>
- <script src="./config/rsa.min.js"></script>
- <script src="./config/rollups.js"></script>
+ <meta name="viewport" content="width=device-width,initial-scale=1.0" />
- <style>
- .esriControlsBR {
- display: none;
- }
- .ol-overlaycontainer-stopevent {
- /* display: none; */
- }
- .ol-control button {
- display: block;
- margin: 1px;
- padding: 0;
- color: rgb(102, 102, 102);
- font-weight: bold;
- text-decoration: none;
- font-size: inherit;
- text-align: center;
- height: 1.375em;
- width: 1.375em;
- line-height: 0.4em;
- background-color: #fff;
- border: none;
- border-radius: 2px;
- }
- .ol-full-screen {
- display: none;
- position: absolute;
- right: 0.5em;
- top: 0.5em;
- }
- .ol-rotate {
- display: none;
- position: absolute;
- top: 3em;
- right: 0.5em;
- transition: opacity 0.25s linear, visibility 0s linear;
- }
- .ol-scale-line {
- display: none;
- right: 0.3em;
- bottom: 0.5em;
- position: absolute;
- }
- .ol-scale-line-inner {
- /* padding: 5px 10px; */
- color: rgb(102, 102, 102);
- font-weight: bold;
- background-color: #fff;
- text-align: center;
- border-radius: 5px;
- }
- .ol-zoom {
- display: none;
- right: 0.3em;
- bottom: 3em;
- position: absolute;
- }
- </style>
- </head>
+ <meta http-equiv="Expires" content="0" />
+ <meta http-equiv="Cache" content="no-cache" />
+ <meta http-equiv="Pragma" content="no-cache" />
+ <meta http-equiv="Cache-control" content="no-cache" />
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+ <title> </title>
- <body>
- <div id="app"></div>
- </body>
-</html>
+ <link rel="stylesheet" href="./SmartEarthSDK/Workers/css/smartearth.css" />
+ <link rel="stylesheet" href="./SmartEarthSDK/Workers/layui/css/layui.css" />
+
+ <script src="./SmartEarthSDK/Workers/polyfill.min.js"></script>
+ <script src="./SmartEarthSDK/Cesium/Cesium.js"></script>
+ <script src="./SmartEarthSDK/SmartEarth.min.js"></script>
+ <script src="./SmartEarthSDK/Workers/TreeTool.js"></script>
+ <script src="./config/config.js"></script>
+ <script src="./config/rsa.min.js"></script>
+ <script src="./config/rollups.js"></script>
+
+ <style>
+ .esriControlsBR {
+ display: none;
+ }
+
+ .ol-overlaycontainer-stopevent {
+ /* display: none; */
+ }
+
+ .ol-control button {
+ display: block;
+ margin: 1px;
+ padding: 0;
+ color: rgb(102, 102, 102);
+ font-weight: bold;
+ text-decoration: none;
+ font-size: inherit;
+ text-align: center;
+ height: 1.375em;
+ width: 1.375em;
+ line-height: 0.4em;
+ background-color: #fff;
+ border: none;
+ border-radius: 2px;
+ }
+
+ .ol-full-screen {
+ display: none;
+ position: absolute;
+ right: 0.5em;
+ top: 0.5em;
+ }
+
+ .ol-rotate {
+ display: none;
+ position: absolute;
+ top: 3em;
+ right: 0.5em;
+ transition: opacity 0.25s linear, visibility 0s linear;
+ }
+
+ .ol-scale-line {
+ display: none;
+ right: 0.3em;
+ bottom: 0.5em;
+ position: absolute;
+ }
+
+ .ol-scale-line-inner {
+ /* padding: 5px 10px; */
+ color: rgb(102, 102, 102);
+ font-weight: bold;
+ background-color: #fff;
+ text-align: center;
+ border-radius: 5px;
+ }
+
+ .ol-zoom {
+ display: none;
+ right: 0.3em;
+ bottom: 3em;
+ position: absolute;
+ }
+ </style>
+</head>
+
+<body>
+ <div id="app"></div>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/src/assets/lang/en.js b/src/assets/lang/en.js
index e1013ec..228e3d1 100644
--- a/src/assets/lang/en.js
+++ b/src/assets/lang/en.js
@@ -103,7 +103,7 @@
code:'Code'
},
- metadataManage: 'metadataManage',
+ metadataManage: 'Source Data Management',
dataLoading: 'dataLoading',
SpatialData: 'SpatialData',
versionManage: 'versionManage',
@@ -524,7 +524,8 @@
status: 'status',
careatetime: 'Date of application',
ReApply: 'Re apply',
- details: 'details'
+ details: 'details',
+ ApplicationCancel: "Application Cancel",
},
loglog: {
serialnumber: 'Serial Number',
diff --git a/src/assets/lang/zh.js b/src/assets/lang/zh.js
index ba832c9..44bc28f 100644
--- a/src/assets/lang/zh.js
+++ b/src/assets/lang/zh.js
@@ -1,6 +1,6 @@
const zh = {
common: {
- bak:'澶囨敞',
+ bak: '澶囨敞',
domCode: '缂栫爜',
confirm: '纭',
choose: '璇烽�夋嫨',
@@ -41,7 +41,7 @@
size: '澶у皬',
versionName: '鐗堟湰鍚嶇О',
type: '绫诲瀷',
- fileType:'鏂囦欢绫诲瀷',
+ fileType: '鏂囦欢绫诲瀷',
quayTest: '璐ㄦ',
md5: 'MD5鐮�',
lineNuber: '琛屾暟',
@@ -96,11 +96,11 @@
entryName: '椤圭洰鍚嶇О',
selectWBSData: '閫夋嫨WBS鏁版嵁',
coordinateSystem: '鍧愭爣绯�',
- fileExtension:"鏂囦欢鎵╁睍鍚�",
- inspectionItems:"妫�鏌ラ」",
- code:'缂栫爜'
+ fileExtension: "鏂囦欢鎵╁睍鍚�",
+ inspectionItems: "妫�鏌ラ」",
+ code: '缂栫爜'
},
- metadataManage: '鍏冩暟鎹鐞�',
+ metadataManage: '婧愭暟鎹鐞�',
dataLoading: '鏁版嵁鍏ュ簱',
SpatialData: '绌洪棿鏁版嵁绠＄悊',
versionManage: '鐗堟湰绠＄悊',
@@ -424,7 +424,7 @@
synthesis: {
import: '瀵煎叆KML',
export: '瀵煎嚭KML',
- import1:'瀵煎叆SHP',
+ import1: '瀵煎叆SHP',
export1: '瀵煎嚭SHP',
pipelineAnalysis: '绠￠亾鍒嗘瀽',
synthesis: '缁煎悎灞曠ず',
@@ -518,7 +518,8 @@
status: '鐘舵��',
careatetime: '鐢宠鏃ユ湡',
ReApply: '閲嶆柊鐢宠',
- details: '璇︽儏'
+ details: '璇︽儏',
+ ApplicationCancel: "鐢宠鍙栨秷",
},
downlog: {
type1: 'Shp鏂囦欢',
diff --git a/src/components/MapView/mapMenuPop.vue b/src/components/MapView/mapMenuPop.vue
index 2c91665..a862f2a 100644
--- a/src/components/MapView/mapMenuPop.vue
+++ b/src/components/MapView/mapMenuPop.vue
@@ -405,7 +405,7 @@
std1.push(this.option[i].entity)
}
var obj = {
- depcodes: this.insertOption.ids,
+ ids: this.insertOption.ids,
pwd: encr(this.codeForm.password),
tabs: std,
entities: std1,
diff --git a/src/components/MapView/mapMenuTop.vue b/src/components/MapView/mapMenuTop.vue
index 3ad1f8f..25f6627 100644
--- a/src/components/MapView/mapMenuTop.vue
+++ b/src/components/MapView/mapMenuTop.vue
@@ -108,7 +108,7 @@
<script>
import queryinfo from "../../views/Tools/queryinfo.vue"
import $ from 'jquery';
-import { inquiry_SelectTabs, inquiry_uploadShp, encr } from '../../api/api.js';
+import { inquiry_SelectTabs, inquiry_uploadShp, encr, dataLib_selectTabs } from '../../api/api.js';
import { getToken } from '@/utils/auth';
import * as turf from '@turf/turf';
export default {
@@ -187,12 +187,18 @@
}
},
async getAllTable() {
- const data = await inquiry_SelectTabs();
+ const data = await dataLib_selectTabs({
+ pageIndex: 1,
+ pageSize: 500
+ });
if (data.code != 200) {
this.$message.error('鍒楄〃璋冪敤澶辫触');
}
- var option = data.result;
-
+ var option = data.result.filter((res) => {
+ if (res.rows != 0) {
+ return res;
+ }
+ })
for (var i in option) {
var val_Data = option[i];
val_Data.id = '1' + i;
@@ -236,6 +242,7 @@
formData.append(val[i].name, val[i]); // fs.files[i].name,file
}
}
+
if (count != 4) {
this.$message({
@@ -255,7 +262,8 @@
if (rs.code !== 200) {
return this.$message.error('鐢ㄦ埛瑙掕壊璇锋眰閿欒');
}
- this.$store.state.mapMenuShpFile = rs.result;
+
+ this.$store.state.mapMenuShpFile = rs.result.wkt;
this.showMapMenuPop();
},
error: (e) => {
diff --git a/src/components/MapView/mapSpaceTop.vue b/src/components/MapView/mapSpaceTop.vue
index e539eae..562c9a2 100644
--- a/src/components/MapView/mapSpaceTop.vue
+++ b/src/components/MapView/mapSpaceTop.vue
@@ -67,20 +67,20 @@
queryLayer: '',
},
layerData: [
- {
- id: 1,
- label: '鍩虹鏁版嵁',
- tabDesc: '鍩虹鏁版嵁',
- value: 'BD',
- children: [],
- },
- {
- id: 2,
- label: '涓氬姟鏁版嵁',
- tabDesc: '涓氬姟鏁版嵁',
- value: 'BS',
- children: [],
- },
+ // {
+ // id: 1,
+ // label: '鍩虹鏁版嵁',
+ // tabDesc: '鍩虹鏁版嵁',
+ // value: 'BD',
+ // children: [],
+ // },
+ // {
+ // id: 2,
+ // label: '涓氬姟鏁版嵁',
+ // tabDesc: '涓氬姟鏁版嵁',
+ // value: 'BS',
+ // children: [],
+ // },
],
defaultProps: {
children: 'children',
diff --git a/src/views/Archive/dataApplication.vue b/src/views/Archive/dataApplication.vue
index 57bb3db..0174136 100644
--- a/src/views/Archive/dataApplication.vue
+++ b/src/views/Archive/dataApplication.vue
@@ -136,7 +136,7 @@
@click="handleApplyCancel(scope.$index, scope.row)"
v-if="matchState(scope,/[]/)"
plain
- >{{$t('dataApply.type1')}}</el-button>
+ >{{$t('dataApply.ApplicationCancel')}}</el-button>
<el-button
type="warning"
size="mini"
diff --git a/src/views/Archive/index.vue b/src/views/Archive/index.vue
index 6927a0c..dccea42 100644
--- a/src/views/Archive/index.vue
+++ b/src/views/Archive/index.vue
@@ -1113,10 +1113,14 @@
return;
}
this.downloadLogVisible = false;
+
var obj = {
entities: [this.listTypeData.name], // bpachydrogeology,bhydrogeologyattach
filter: this.listTypeData.filter,
- pwd: encrypt.encrypt(this.codeForm.password)
+ pwd: encrypt.encrypt(this.codeForm.password),
+ depcodes: [this.listData.depcode],
+ dirs: this.listData.dirs
+
};
this.loading = true;
var that = this;
@@ -1872,6 +1876,7 @@
var data2 = domains.result;
this.formInline.fileName = ""
var std = [];
+ this.filedsOption=[];
for (var i in data1) {
if (data1[i].type != 'geomtry' && data1[i].type != 'null') {
@@ -2276,8 +2281,8 @@
/deeep/.el-form-item {
margin-bottom: 0px;
}
- /deeep/ .el-dialog__wrapper{
- z-index: 999;
+ .el-dialog__wrapper {
+ z-index: 9999;
}
}
</style>
diff --git a/src/views/Synthesis/LeftMenu.vue b/src/views/Synthesis/LeftMenu.vue
index 12e20e2..eb6449d 100644
--- a/src/views/Synthesis/LeftMenu.vue
+++ b/src/views/Synthesis/LeftMenu.vue
@@ -420,10 +420,11 @@
window.model.deleteObject();
window.model = null;
}
+ sgworld.Analysis.clearCurtainContrast();
if (this.isMenuFlag == "d") {
this.clearAllAnalsy();
}
- if (this.isMenuFlag != res.id) {
+ if (this.isMenuFlag !=val) {
sgworld.Creator.SimpleGraphic.clear();
this.isMenuFlag = val;
if (this.entityaLayers.length != 0) {
diff --git a/src/views/Tools/LayerTree.vue b/src/views/Tools/LayerTree.vue
index 0c41e2e..c924ce0 100644
--- a/src/views/Tools/LayerTree.vue
+++ b/src/views/Tools/LayerTree.vue
@@ -70,6 +70,12 @@
>
<i class="el-icon-edit"></i> 淇敼鑺傜偣
</div>
+ <div
+ class="edit"
+ @click="showLayerAttribute()"
+ >
+ <i class="el-icon-edit"></i> 灞炴��
+ </div>
<!-- <div
class="edit"
@click="menuMoveF( 'up')"
@@ -137,6 +143,7 @@
>纭� 瀹�</el-button>
</span>
</el-dialog>
+ <queryinfo ref="queryinfo" />
</div>
</template>
@@ -146,7 +153,7 @@
import Image from 'ol/layer/Image';
import GeoJSON from 'ol/format/GeoJSON.js';
import Map from 'ol/Map.js';
-
+import queryinfo from './queryinfo.vue';
import { Vector as VectorSource } from "ol/source";
import { Vector as VectorLayer, } from "ol/layer";
@@ -155,6 +162,7 @@
import { perms_selectLayers } from '../../api/api.js'
export default {
name: 'tree',
+ components: { queryinfo },
data() {
return {
eleId: '',
@@ -332,7 +340,29 @@
this.$refs.tree.remove(this.currentNode);
},
+ //灞炴�ф樉绀�
+ showLayerAttribute(data) {
+ this.foo();
+ this.currentData = data ? data : this.currentData;
+ var layer = this.currentData.layer.replaceAll('_', "");
+ this.$store.state.mapSpaceQueryLayer = layer;
+ // this.$store.state.mapPopBoolean = true;
+ this.$store.state.mapPopBoxFlag = '2';
+ this.$refs && this.$refs.queryinfo && this.$refs.queryinfo.close();
+ this.$refs && this.$refs.queryinfo && this.$refs.queryinfo.open("灞炴��", null, {
+ close: () => {
+ if (this.$store.state.primitLayer != null) {
+ sgworld.Creator.DeleteObject(this.$store.state.primitLayer);
+ this.$store.state.primitLayer = null;
+ }
+
+ if (window.Viewer.scene.primitives.length != 0) {
+ window.Viewer.scene.primitives.removeAll()
+ }
+ }
+ });
+ },
// 缂栬緫鑺傜偣
editNode(data) {
@@ -536,6 +566,7 @@
return this.$message.error("鍥惧眰鍒楄〃鏌ヨ澶辫触");
}
+
this.newData = data.result;
this.oriData = data.result;
var std = [];
@@ -553,6 +584,7 @@
} else if (data.result[i].type == 2) {
if (data.result[i].url != null) {
+
var layer_entity = {
id: data.result[i].id,
pid: data.result[i].pid,
@@ -560,6 +592,7 @@
resource: data.result[i].url,
type: data.result[i].type,
isEdit: false,
+ layer: data.result[i].enName,
layerType: data.result[i].serveType
}
layer_list.push(layer_entity)
--
Gitblit v1.9.3