From efb28eeff9cd7c081343bc69b425f8987287a807 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期二, 11 七月 2023 16:00:03 +0800
Subject: [PATCH] 1
---
src/views/exportMap/index.vue | 2
src/components/preview_map.vue | 2
src/views/datamanage/catalogueManage.vue | 131 +++++++++++++++++++++++++++++---
src/components/mapsdk.vue | 4
src/views/datamanage/dataStatistics.vue | 2
src/views/datamanage/dataUpdata.vue | 54 +++++++++++++
6 files changed, 174 insertions(+), 21 deletions(-)
diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue
index a9e4d09..fd75f70 100644
--- a/src/components/mapsdk.vue
+++ b/src/components/mapsdk.vue
@@ -1080,7 +1080,7 @@
xAxis: {
type: 'category',
boundaryGap: false,
- data: res
+ data: res.reverse()
},
yAxis: {
type: 'value',
@@ -1097,7 +1097,7 @@
name: '鏃跺簭鍙樺舰閲�',
type: 'line',
stack: 'Total',
- data: res2
+ data: res2.reverse()
}
]
};
diff --git a/src/components/preview_map.vue b/src/components/preview_map.vue
index fe756a7..c0a45e4 100644
--- a/src/components/preview_map.vue
+++ b/src/components/preview_map.vue
@@ -972,7 +972,7 @@
roll: 0.0
}
});*/
- debugger
+
var wkt = this.$wkt.parse(res.geom);
var height = this.getHeight(wkt.coordinates[2]);
Viewer.camera.flyTo({
diff --git a/src/views/datamanage/catalogueManage.vue b/src/views/datamanage/catalogueManage.vue
index 77f16aa..19efd9e 100644
--- a/src/views/datamanage/catalogueManage.vue
+++ b/src/views/datamanage/catalogueManage.vue
@@ -21,8 +21,19 @@
:expand-on-click-node="false"
:default-expanded-keys="expandData"
@node-click="handleNodeClick"
+ @node-contextmenu="openTreeMenu"
>
</el-tree>
+ <div
+ class="right_menu box_divm"
+ id="menu"
+ v-show="showRightMenu"
+ >
+ <ul>
+ <li @click="setMenuDataCopy">澶嶅埗</li>
+ <li @click="setMenuDataPaste">绮樿创</li>
+ </ul>
+ </div>
</div>
</div>
<div class="cataLog_rightContent right subpage_Div">
@@ -399,6 +410,7 @@
>{{ $t("common.preservation") }}</el-button>
</div>
</el-dialog>
+
<iframe
id="Iframe1"
src=""
@@ -525,9 +537,82 @@
],
currentData: null,
+ showRightMenu: false,
+ checksData: null,
+ checksCopyData: null,
};
},
methods: {
+ // 澶嶅埗
+ setMenuDataCopy() {
+ this.checksCopyData = this.checksData;
+ },
+ //绮樿创
+ setMenuDataPaste() {
+ if (!this.checksCopyData) {
+ return this.$message('鏈�変腑瑕佸鍒剁殑鑺傜偣');
+ }
+ var val = this.$refs.tree.getNode(this.checksCopyData).data;
+
+ var level = this.$refs.tree.getNode(this.checksData).data.level + 1;
+ this.setInsertCopyData([val], this.checksData, level);
+ },
+ setInsertCopyData(val, pid, level) {
+ for (var i in val) {
+ var data = val[i];
+ var pchildNodes = [];
+
+ if (this.$refs.tree.getNode(pid) && this.$refs.tree.getNode(pid).childNodes) {
+ pchildNodes = this.$refs.tree.getNode(pid).childNodes
+ }
+ var orderNum = this.getMaxOrderNum(pchildNodes);
+ var obj = {
+ bak: data.bak,
+ level: level,
+ orderNum: orderNum + 1,
+ pid: pid,
+ checks: data.checks,
+ name: data.name,
+ descr: data.descr,
+ exts: data.exts,
+ }
+ insertDir(obj).then((res) => {
+ if (res.code == 200) {
+ this.getDirTree();
+ if (data.children && data.children.length > 0) {
+ debugger
+ this.setInsertCopyData(data.children, res.result, level + 1)
+ }
+ }
+ })
+ }
+ },
+
+
+
+
+
+ handleNodeClick(data, node) {
+ this.showRightMenu = false;
+ document.removeEventListener('click', this.closeRightMenu)
+ this.layerFormInline(data)
+
+ },
+ //鍙抽敭鑿滃崟
+ openTreeMenu(event, data, node, obj) {
+ this.showRightMenu = true;
+ let menu = document.getElementById('menu')
+ menu.style.left = event.clientX + 20 + 'px'
+ menu.style.top = event.clientY + 'px'
+ document.addEventListener('click', this.closeRightMenu)
+ this.checksData = data.id;
+ console.log(this.checksData)
+ },
+ closeRightMenu() {
+ this.showRightMenu = false;
+ document.removeEventListener('click', this.closeRightMenu)
+
+ },
setTemplateDownload() {
var url = window.location.href;
var testurl = window.location.origin + "/";
@@ -595,8 +680,6 @@
this.tableData = arr;
this.setInsertData(this.tableData);
-
-
},
getNameAndPname(res, result, flag) {
var chLevel = null;
@@ -622,26 +705,21 @@
}
},
setInsertData(res) {
-
var list = this.excelData(res);
-
if (list.length != 0) {
if (list[0].pname != null) {
return this.$message.error("涓婁紶鏁版嵁閿欒锛岀涓�鏉℃暟鎹笉涓虹┖");
}
-
this.getAllNodeId(res);
}
},
async getAllNodeId(res) {
for (let i = 0; i < res.length; i++) {
var val = res[i];
-
if (val.pname == null) {
val.orderNum = this.dirList[this.dirList.length - 1].orderNum + 1;
val.pid = 0;
} else {
-
this.tableData.filter((child) => {
if (child.tid == val.sid) {
val.pid = child.id;
@@ -1137,7 +1215,7 @@
var val = this.$refs.tree.getNode(data.id).data;
this.itemdetail = val;
this.currentData = JSON.stringify(data)
- debugger
+
var checks = [];
if (val.checks) {
if (val.checks.indexOf(',') > -1) {
@@ -1156,12 +1234,7 @@
}
},
- handleNodeClick(data, node) {
- this.layerFormInline(data)
- // console.log(data);
-
- },
async updCata(formName) {
this.fullscreenLoading = true;
var val = JSON.parse(JSON.stringify(this.itemdetail));
@@ -1191,7 +1264,7 @@
// var val = this.itemdetail
// var value = this.itemdetail.checks.toString()
// val.checks = value;
- // debugger
+ //
// let res = JSON.parse(JSON.stringify(this.itemdetail));
// this.itemdetail = res;
//
@@ -1341,6 +1414,36 @@
}
}
}
+ .right_menu {
+ position: fixed;
+ display: block;
+ z-index: 10000;
+ padding: 10px;
+ border: 1px solid #ebeef5;
+ border-radius: 4px;
+ box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+ ul {
+ width: 100%;
+ height: 100%;
+ list-style: none;
+ margin: 0;
+ padding: 0;
+ border-radius: 2%;
+ li {
+ margin: 0 0 1px 0;
+ color: rgb(77, 77, 73);
+ text-align: center;
+ font-size: 14px;
+ padding: 4%;
+ width: 100%;
+ height: 9.7%;
+ float: left;
+ }
+ li:hover {
+ color: #409eff !important;
+ }
+ }
+ }
}
.btnBox {
position: absolute;
diff --git a/src/views/datamanage/dataStatistics.vue b/src/views/datamanage/dataStatistics.vue
index dd26a54..be5fdcb 100644
--- a/src/views/datamanage/dataStatistics.vue
+++ b/src/views/datamanage/dataStatistics.vue
@@ -644,7 +644,7 @@
if (this.queryData.value == 'countServices' || this.queryData.value == 'countOperates') {
this.tjlxData.flag = false;
- debugger
+
} else {
this.tjlxData.flag = true;
}
diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index 4a5a696..9d8762d 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -1436,6 +1436,37 @@
style="display: none"
@change="uploadAnFilesChange"
/>
+ <el-dialog :visible.sync="noteVisible">
+ <div class="nodeBox">
+ <div style="text-align: center;">
+ <h1>
+ 鏁版嵁涓婁紶娉ㄦ剰浜嬮」
+ </h1>
+ </div>
+ <h3>
+ 1銆侀」鐩暣浣撲笂浼�
+ </h3>
+
+ <h5> 鎸夌収椤圭洰鏍囧噯缁撴瀯缁勭粐鏁版嵁骞舵墦zip鍖咃紝鎸夎姹傜紪杈戝ソWBS鏂囦欢銆傞�夋嫨闇�瑕佷笂浼犲搴旂殑椤圭洰鍚嶇О锛岄�夋嫨zip鏁版嵁鍖呭拰WBS鏂囦欢锛屽畬鎴愭暣浣撻」鐩暟鎹笂浼狅紝涓婁紶鍏ュ簱瀹屾垚鍚庯紝绯荤粺鑷姩瑙ｅ帇zip鍖咃紝浠ip鍖呭唴鍘熷鏂囦欢鏍煎紡瀛樺偍鍦ㄩ鍏堢粍缁囩殑鐩綍缁撴瀯涓嬨��</h5>
+ <h3>
+ 2銆佸崟鏂囦欢涓婁紶
+ </h3>
+ <h5> 涓婁紶鍗曚釜鏂囦欢锛岄�夋嫨闇�瑕佷笂浼犵殑瀛樺偍鐩綍浣嶇疆銆佹暟鎹増鏈�佹暟鎹笓涓氥�佹暟鎹紙.xls銆�.xlsx銆乸df銆乴as绛夋牸寮忥級銆佸厓鏁版嵁绛夛紝瀹屾垚鍗曚釜鏂囦欢鏁版嵁涓婁紶锛�</h5>
+ <h5> 鎵归噺涓婁紶涓�涓渶灏忕洰褰曟枃浠跺す涓嬬殑鍚勭被鏁版嵁锛岄�夋嫨闇�瑕佷笂浼犳暟鎹殑瀛樺偍鐩綍浣嶇疆銆佹暟鎹増鏈�佹暟鎹笓涓氥�佹暟鎹紙zip鏍煎紡锛夈�佸厓鏁版嵁绛夛紝瀹屾垚涓�涓枃浠跺す涓嬪悇绫绘暟鎹笂浼狅紝涓婁紶鍏ュ簱瀹屾垚鍚庯紝绯荤粺鑷姩瑙ｅ帇zip鍖咃紝浠ip鍖呭唴鍘熷鏂囦欢瀛樺偍鏁版嵁銆�</h5>
+ <h5> 鍗曟枃浠朵笂浼犱笉鏀寔澶氱骇鐩綍鏂囦欢澶逛互zip鍘嬬缉鍖呮柟寮忎笂浼犮��</h5>
+ <h3>
+ 3銆佺壒瀹氭牸寮忓崟鏂囦欢涓婁紶瑕佹眰
+ </h3>
+ <h5>鈭� <span>DOM鏁版嵁涓婁紶锛�</span>鑷冲皯闇�鍖呭惈.tif銆�.tif.ovr鏂囦欢锛屼互zip鍖呭帇缂╃粺涓�涓婁紶銆�</h5>
+ <h5>鈭� <span>DEM鏁版嵁涓婁紶锛�</span>鑷冲皯闇�鍖呭惈.tif銆�.tif.ovr鏂囦欢锛屼互zip鍖呭帇缂╃粺涓�涓婁紶銆�</h5>
+ <h5>鈭� <span>OSGB鍊炬枩妯″瀷鏁版嵁涓婁紶锛�</span>闇�鍖呭惈Data鏂囦欢澶广�乵etadata.xml鏂囦欢锛屼互zip鍖呭帇缂╃粺涓�涓婁紶銆�</h5>
+ <h5>鈭� <span>Las銆丩az鐐逛簯鏁版嵁涓婁紶锛�</span>鍙崟鐙笂浼犳枃浠讹紝涔熷彲浠ip鍖呭帇缂╃粺涓�涓婁紶銆�</h5>
+ <h5>鈭� <span>CPT鐐逛簯鏁版嵁涓婁紶锛�</span>鍙崟鐙笂浼犳枃浠讹紝涔熷彲浠ip鍖呭帇缂╃粺涓�涓婁紶銆�</h5>
+ <h5>鈭� <span>MPT鍦烘櫙鏁版嵁涓婁紶锛�</span>闇�鍖呭惈.mIdx銆�.Strmi銆�.mpt鏂囦欢锛屼互zip鍖呭帇缂╃粺涓�涓婁紶銆�</h5>
+ <h5>鈭� <span>GDB鏍煎紡鐭㈤噺鏂囦欢涓婁紶锛�</span>闇�鍖呭惈gdb鍚勭被瀛愭枃浠讹紝浠ip鍖呭帇缂╃粺涓�涓婁紶銆�</h5>
+ <h5>鈭� <span>SHP鐭㈤噺鏂囦欢涓婁紶锛�</span>闇�鍖呭惈.shp銆�.shx銆�.dbf銆乸rj瀛愭枃浠讹紝浠ip鍖呭帇缂╃粺涓�涓婁紶銆�</h5>
+ </div>
+ </el-dialog>
</div>
</template>
@@ -1674,11 +1705,12 @@
},
warehouseDialog: false,
wareData: [],
+ noteVisible: false,
};
},
mounted() {
-
+ this.noteVisible = true;
//鑾峰彇鍧愭爣绯�
this.setCoordinateSystem();
//鑾峰彇椤圭洰鍚嶇О
@@ -3103,6 +3135,8 @@
handleTabClick(tab, event) {
if (tab.name == "second") {
this.setStartWareTable();
+ } else {
+ this.noteVisible = true
}
this.calHeight();
},
@@ -3147,7 +3181,23 @@
z-index: 9999;
}
}
-
+.nodeBox {
+ h5 {
+ line-height: 26px;
+ font-size: 14px;
+ span {
+ font-weight: bolder;
+ }
+ }
+ h3 {
+ line-height: 40px;
+ font-size: 16px;
+ font-weight: bold;
+ }
+ h1 {
+ font-weight: bold;
+ }
+}
.inquire {
padding: 8px;
//margin-top: 20px;
diff --git a/src/views/exportMap/index.vue b/src/views/exportMap/index.vue
index 15fd924..e8babcb 100644
--- a/src/views/exportMap/index.vue
+++ b/src/views/exportMap/index.vue
@@ -614,7 +614,7 @@
let feature = e.feature
let geom = feature.getGeometry()
var bbox = geom.getExtent();
- debugger
+
var ss = turf.square(bbox);
geom.setCoordinates([[[ss[0], ss[3]], [ss[2], ss[3]], [ss[2], ss[1]], [ss[0], ss[1]], [ss[0], ss[3]]]]);
e.feature.setGeometry(geom);
--
Gitblit v1.9.3