From d5431e6b00cfc9a1a57b1d67d3b1f5956eca0132 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期四, 02 三月 2023 08:41:57 +0800
Subject: [PATCH] 数据上传添加进度条，样式管理页面修改，属性查询，空间查询页面优化
---
src/views/Archive/index.vue | 2
src/views/Synthesis/LeftMenu.vue | 39 ++++++++++++-------
src/components/MapView/mapMenuPop.vue | 11 ++++-
src/components/MapView/mapSpacePop.vue | 11 ++++-
src/views/datamanage/dataUpdata.vue | 54 +++++++++++++++++++++++---
src/views/datamanage/styleManage.vue | 2
6 files changed, 89 insertions(+), 30 deletions(-)
diff --git a/src/components/MapView/mapMenuPop.vue b/src/components/MapView/mapMenuPop.vue
index 8069838..d5d9419 100644
--- a/src/components/MapView/mapMenuPop.vue
+++ b/src/components/MapView/mapMenuPop.vue
@@ -24,8 +24,9 @@
<el-table
:data="tableData"
ref="dialogPayChannel"
- height="300px"
+ height="100%"
style="width: 100%"
+ border
>
<el-table-column
align="center"
@@ -56,7 +57,10 @@
></el-table-column>
</el-table>
</div>
- <div class="pagination_box">
+ <div
+ class="pagination_box"
+ style="margin-top:10px"
+ >
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -794,7 +798,8 @@
width: 100%;
}
.tableBox {
- height: 327px;
+ position: relative;
+ height: 89%;
}
.rightPage {
margin-left: 50px;
diff --git a/src/components/MapView/mapSpacePop.vue b/src/components/MapView/mapSpacePop.vue
index 1ccd6eb..63fc17d 100644
--- a/src/components/MapView/mapSpacePop.vue
+++ b/src/components/MapView/mapSpacePop.vue
@@ -60,9 +60,10 @@
<div class="centTable">
<el-table
:data="tableData"
- height="260px"
+ height="100%"
ref="filterTable"
style="width: 100%"
+ border
>
<el-table-column
align="center"
@@ -90,6 +91,7 @@
:prop="item.field"
show-overflow-tooltip
align="center"
+ :fit="true"
></el-table-column>
</el-table>
</div>
@@ -475,7 +477,10 @@
border: 1px solid gray;
float: left;
.centTable {
- height: 230px;
+ margin-top: 1%;
+ position: absolute;
+ height: 66%;
+ width: 98%;
}
.rightTitle {
padding: 5px;
@@ -488,7 +493,7 @@
}
.bottomPage {
position: absolute;
- bottom: 1%;
+ bottom: 3%;
}
}
</style>
diff --git a/src/views/Archive/index.vue b/src/views/Archive/index.vue
index aa0942a..3200e8e 100644
--- a/src/views/Archive/index.vue
+++ b/src/views/Archive/index.vue
@@ -1733,7 +1733,7 @@
this.listData.dirs += this.formInline.item.toString();
}
this.listData.depcode = this.formInline.depcode;
- this.listData.tab = this.formInline.keywords;
+ this.listData.name = this.formInline.keywords;
const data = await dataLib_selectByPageForMeta(this.listData);
if (data.code != 200) {
this.$message.error('鏂囦欢鏁版嵁鍒楄〃璋冪敤澶辫触');
diff --git a/src/views/Synthesis/LeftMenu.vue b/src/views/Synthesis/LeftMenu.vue
index 30b063b..baf9642 100644
--- a/src/views/Synthesis/LeftMenu.vue
+++ b/src/views/Synthesis/LeftMenu.vue
@@ -15,6 +15,7 @@
<mapinfo ref="mapinfo" />
<maplayer ref="maplayer" />
<queryinfo ref="queryinfo" />
+ <terrainDig ref="terrainDig" />
<input
type="file"
accept=".kml"
@@ -39,6 +40,7 @@
import mapinfo from "../Tools/mapinfo.vue";
import maplayer from "../Tools/maplayer.vue";
import queryinfo from "../Tools/queryinfo.vue";
+import terrainDig from "../Tools/terrainDig.vue";
import $ from "jquery";
import { getToken } from "@/utils/auth";
import ImageWMS from "ol/source/ImageWMS";
@@ -58,7 +60,7 @@
import { geometry } from "@turf/turf";
export default {
- components: { mapinfo, maplayer, queryinfo },
+ components: { mapinfo, maplayer, queryinfo, terrainDig },
data() {
return {
showTwoMenuFlag: false,
@@ -1342,20 +1344,27 @@
break;
case "d11": //鍦板舰寮�鎸�
- if (window.Excavation) {
- window.Excavation.drawHandler &&
- window.Excavation.drawHandler.destroy();
- Viewer._container.style.cursor = "default";
- window.Excavation.tooltip && window.Excavation.tooltip.show(false);
- window.Excavation.clear();
- window.Excavation = null;
- } else {
- window.Excavation = sgworld.Analysis.TerrainExcavation(
- 10,
- {},
- function () { }
- );
- }
+ this.$refs &&
+ this.$refs.terrainDig &&
+ this.$refs.terrainDig.open("绠￠亾绌洪棿鍒嗘瀽", null, {
+ close: () => {
+
+ },
+ });
+ // if (window.Excavation) {
+ // window.Excavation.drawHandler &&
+ // window.Excavation.drawHandler.destroy();
+ // Viewer._container.style.cursor = "default";
+ // window.Excavation.tooltip && window.Excavation.tooltip.show(false);
+ // window.Excavation.clear();
+ // window.Excavation = null;
+ // } else {
+ // window.Excavation = sgworld.Analysis.TerrainExcavation(
+ // 10,
+ // {},
+ // function () { }
+ // );
+ // }
break;
case "d12": //閫氳鍒嗘瀽
diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index 724103e..23496c2 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -1124,13 +1124,13 @@
</el-dialog>
<el-dialog
:close-on-click-modal="false"
- title="涓婁紶杩涘害"
+ :title="sc.label1"
:visible.sync="jindudialogVisible"
width="30%"
>
<div>
<div>
- 鏂囦欢浼犺緭杩涘害锛�
+ {{sc.label2}}
</div>
<div>
<el-progress
@@ -1604,7 +1604,11 @@
metaDataTable: [],
queryMetaFlag1: false,
metaDataTable1: [],
- getCheckedKeys: null
+ getCheckedKeys: null,
+ sc: {
+ label1: '涓婁紶',
+ label2: '鏂囦欢涓婁紶杩涘害锛�'
+ }
};
},
@@ -1730,9 +1734,14 @@
formData.append("ids", this.enclosureData[i]);
}
const that = this;
+ this.sc = {
+ label1: '涓婁紶',
+ label2: '鏂囦欢涓婁紶杩涘害锛�'
+ }
that.jindudialogVisible = true;
that.$set(this, "jindutiaoname", "闄勪欢涓婁紶");
that.$set(this, "jindutiao", 0);
+
this.loading = true;
$.ajax(
BASE_URL +
@@ -2164,7 +2173,14 @@
// if (this.formCheckAll.diZaiType != "NO") {
// this.formCheckAll.isDiZai = "YES";
// }
- this.loading = true;
+ //
+ this.sc = {
+ label1: '璐ㄦ',
+ label2: '鏂囦欢璐ㄦ杩涘害锛�'
+ }
+ this.jindudialogVisible = true;
+ this.loading = false;
+ this.$set(this, "jindutiao", 0);
this.getStartTestQuayTaskStatus();
},
//鏁翠綋鏂囦欢澶氭潯鏁版嵁璐ㄦ
@@ -2173,6 +2189,7 @@
this.multipleSelection == 0 ||
this.taskStatus == this.multipleSelection.length
) {
+ this.jindudialogVisible = false;
this.loading = false;
return;
}
@@ -2203,20 +2220,31 @@
//鍗曟枃浠舵暟鎹川妫�鎻愪氦
async commonQuayTest() {
- this.loading = true;
+ // this.loading = true;
this.quayTestVisible = false;
this.taskStatus = 0;
this.getStartTaskStatus();
+ this.sc = {
+ label1: '璐ㄦ',
+ label2: '鏂囦欢璐ㄦ杩涘害锛�'
+ }
+ this.jindudialogVisible = true;
+
+ this.$set(this, "jindutiao", 0);
},
//鍗曟枃浠跺鏉℃暟鎹川妫�
async getStartTaskStatus() {
+ const that = this;
if (
this.multipleSelection == 0 ||
this.taskStatus == this.multipleSelection.length
) {
this.loading = false;
+ that.jindudialogVisible = false;
return;
}
+
+
this.quayTestForms.zipPath = this.multipleSelection[this.taskStatus].path;
if (this.quayTestForms.zipPath.indexOf(".zip") == -1) {
this.taskStatus++;
@@ -2297,6 +2325,7 @@
if (
this.tableData[i].path == this.multipleSelection[this.taskStatus].path
) {
+ this.$set(this, "jindutiao", parseInt(this.progress * 100));
this.tableData[i].status = parseInt(this.progress * 100) + "%";
}
}
@@ -2349,11 +2378,14 @@
}
}
this.progress = std / (res.length * 100);
+
+
// for (var i in this.tableData) {
// if (this.tableData[i].path == this.multipleSelection[this.taskStatus].path) {
// this.tableData[i].status = parseInt(this.progress * 100) + "%";
// }
// }
+ this.$set(this, "jindutiao", parseInt(this.progress * 100));
for (var i in this.tableData) {
for (var j in this.multipleSelection) {
if (this.tableData[i].path == this.multipleSelection[j].path) {
@@ -2487,7 +2519,7 @@
});
that.$set(this, "jindutiaoname", listval);
that.$set(this, "jindutiao", 0);
- this.loading = true;
+ // this.loading = true;
$.ajax(
BASE_URL +
"/dataUpload/uploadFiles?token=" +
@@ -2542,7 +2574,15 @@
this.$set(this, "jindutiao", loaded);
},
format(percentage) {
- return percentage === 100 ? "涓婁紶瀹屾瘯" : `${percentage}%`;
+
+ // return percentage === 100 ? "涓婁紶瀹屾瘯" : `${percentage}%`;
+ var label;
+ if (this.sc.label1 == "涓婁紶") {
+ label = "涓婁紶瀹屾瘯"
+ } else {
+ label = `${percentage}%`
+ }
+ return percentage === 100 ? label : `${percentage}%`;
},
//鑾峰彇鏂囦欢涓婁紶璺緞
async getFilePath() {
diff --git a/src/views/datamanage/styleManage.vue b/src/views/datamanage/styleManage.vue
index f825742..29c6aac 100644
--- a/src/views/datamanage/styleManage.vue
+++ b/src/views/datamanage/styleManage.vue
@@ -146,7 +146,7 @@
:label="$t('dataManage.styleObj.bak')"
/> -->
<el-table-column
- min-width="120"
+ min-width="200"
:label="$t('common.operate')"
>
<template slot-scope="scope">
--
Gitblit v1.9.3