From 303f5d5c1296bfdcec63f1de35f3f64739f14007 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期日, 26 二月 2023 15:38:28 +0800
Subject: [PATCH] 资料馆，数据申请界面优化,综合展示三维截面分析
---
src/views/Archive/index.vue | 44 ++++++-
src/views/Synthesis/LeftMenu.vue | 13 ++
src/components/mapsdk.vue | 149 +++++++++++++++++++-----
src/views/Archive/dataApplication.vue | 141 +++++++++++++++--------
4 files changed, 254 insertions(+), 93 deletions(-)
diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue
index ac27717..220c225 100644
--- a/src/components/mapsdk.vue
+++ b/src/components/mapsdk.vue
@@ -1,44 +1,82 @@
<template>
<div class="mapBox">
<div id="mapdiv">
- <div class="menu_Top box_divm" v-if="$store.state.mapMenuBoolean">
+ <div
+ class="menu_Top box_divm"
+ v-if="$store.state.mapMenuBoolean"
+ >
<map-menu-top v-if="$store.state.mapMenuBoxFlag == '1'" />
<map-space-top v-if="$store.state.mapMenuBoxFlag == '2'" />
</div>
- <div class="bufferBox" v-if="showBufferBoxDialog">
+ <div
+ class="bufferBox"
+ v-if="showBufferBoxDialog"
+ >
<el-card class="box-card box_divm">
- <div slot="header" class="clearfix">
+ <div
+ slot="header"
+ class="clearfix"
+ >
<span>缂撳啿鍖哄垎鏋�</span>
<div style="float: right; cursor: pointer">
- <i class="el-icon-close" @click="closeBufferBox(1)"></i>
+ <i
+ class="el-icon-close"
+ @click="closeBufferBox(1)"
+ ></i>
</div>
</div>
<div class="box-body">
- <el-form ref="form" :model="bufFrom" label-width="100px">
+ <el-form
+ ref="form"
+ :model="bufFrom"
+ label-width="100px"
+ >
<el-form-item label="缂撳啿鍗婂緞(绫�):">
<el-input v-model="bufFrom.val"></el-input>
</el-form-item>
<el-form-item>
- <el-button @click="addBuffer(1)" type="info">鐐�</el-button>
- <el-button @click="addBuffer(2)" type="info">绾�</el-button>
- <el-button @click="addBuffer(3)" type="info">闈�</el-button>
- <el-button @click="clearBuffer" type="info">娓呴櫎</el-button>
+ <el-button
+ @click="addBuffer(1)"
+ type="info"
+ >鐐�</el-button>
+ <el-button
+ @click="addBuffer(2)"
+ type="info"
+ >绾�</el-button>
+ <el-button
+ @click="addBuffer(3)"
+ type="info"
+ >闈�</el-button>
+ <el-button
+ @click="clearBuffer"
+ type="info"
+ >娓呴櫎</el-button>
</el-form-item>
</el-form>
</div>
</el-card>
</div>
- <div class="coordLocalBox" v-if="showCoordLocalBoxDialog">
+ <div
+ class="coordLocalBox"
+ v-if="showCoordLocalBoxDialog"
+ >
<el-card class="box-card">
<div slot="header">
<span>鍧愭爣瀹氫綅</span>
<div style="float: right; cursor: pointer">
- <i class="el-icon-close" @click="closeBufferBox(2)"></i>
+ <i
+ class="el-icon-close"
+ @click="closeBufferBox(2)"
+ ></i>
</div>
</div>
<div class="box-body">
- <el-form ref="form" :model="coordFrom" label-width="50px">
+ <el-form
+ ref="form"
+ :model="coordFrom"
+ label-width="50px"
+ >
<el-form-item label="缁忓害:">
<el-input v-model="coordFrom.lon"></el-input>
</el-form-item>
@@ -49,22 +87,38 @@
<el-input v-model="coordFrom.height"></el-input>
</el-form-item>
<el-form-item>
- <el-button @click="setCoordLocal" type="info">瀹氫綅</el-button>
+ <el-button
+ @click="setCoordLocal"
+ type="info"
+ >瀹氫綅</el-button>
</el-form-item>
</el-form>
</div>
</el-card>
</div>
- <div class="toponymicLocalBox" v-if="showToponymicLocalBoxDialog">
+ <div
+ class="toponymicLocalBox"
+ v-if="showToponymicLocalBoxDialog"
+ >
<el-card class="box-card">
- <div slot="header" class="clearfix">
+ <div
+ slot="header"
+ class="clearfix"
+ >
<span>鍦板悕瀹氫綅</span>
<div style="float: right; cursor: pointer">
- <i class="el-icon-close" @click="closeBufferBox(3)"></i>
+ <i
+ class="el-icon-close"
+ @click="closeBufferBox(3)"
+ ></i>
</div>
</div>
<div class="box-body">
- <el-form :model="comprehensive" :inline="true" label-width="50px">
+ <el-form
+ :model="comprehensive"
+ :inline="true"
+ label-width="50px"
+ >
<el-form-item label="鍦板悕:">
<el-input
style="width: 200px"
@@ -72,17 +126,28 @@
></el-input>
</el-form-item>
<el-form-item>
- <el-button @click="setQueryTable" type="info">鏌ヨ</el-button>
+ <el-button
+ @click="setQueryTable"
+ type="info"
+ >鏌ヨ</el-button>
</el-form-item>
</el-form>
- <el-table :data="tableData" height="200px" style="width: 100%">
+ <el-table
+ :data="tableData"
+ height="200px"
+ style="width: 100%"
+ >
<el-table-column
align="center"
type="index"
label="搴忓彿"
width="70px"
/>
- <el-table-column prop="name" align="center" label="瀹氫綅">
+ <el-table-column
+ prop="name"
+ align="center"
+ label="瀹氫綅"
+ >
<template slot-scope="scope">
<el-button
@click="handleLocation(scope.$index, scope.row)"
@@ -91,7 +156,11 @@
></el-button>
</template>
</el-table-column>
- <el-table-column prop="name" align="center" label="鍦板悕">
+ <el-table-column
+ prop="name"
+ align="center"
+ label="鍦板悕"
+ >
</el-table-column>
</el-table>
<div class="pagination_box">
@@ -109,12 +178,21 @@
</div>
</el-card>
</div>
- <div class="pathAnalysisBox" v-if="showPathAnalysisBoxDialog">
+ <div
+ class="pathAnalysisBox"
+ v-if="showPathAnalysisBoxDialog"
+ >
<el-card class="box-card">
- <div slot="header" class="clearfix">
+ <div
+ slot="header"
+ class="clearfix"
+ >
<span>璺緞鍒嗘瀽</span>
<div style="float: right; cursor: pointer">
- <i class="el-icon-close" @click="closeBufferBox(4)"></i>
+ <i
+ class="el-icon-close"
+ @click="closeBufferBox(4)"
+ ></i>
</div>
</div>
<div class="box-body">
@@ -124,7 +202,10 @@
:rules="rules"
label-width="55px"
>
- <el-form-item label="璧风偣:" prop="lon">
+ <el-form-item
+ label="璧风偣:"
+ prop="lon"
+ >
<el-input
style="width: 250px"
v-model="pathFrom.lon"
@@ -134,10 +215,12 @@
:underline="false"
@click="showMouseLeftClick(1)"
style="margin-left: 10px"
- ><i style="color: white" class="el-icon-plus"></i
- ></el-link>
+ ><i class="el-icon-plus"></i></el-link>
</el-form-item>
- <el-form-item label="缁堢偣:" prop="lat">
+ <el-form-item
+ label="缁堢偣:"
+ prop="lat"
+ >
<el-input
style="width: 250px"
v-model="pathFrom.lat"
@@ -147,13 +230,13 @@
:underline="false"
@click="showMouseLeftClick(2)"
style="margin-left: 10px"
- ><i style="color: white" class="el-icon-plus"></i
- ></el-link>
+ ><i class="el-icon-plus"></i></el-link>
</el-form-item>
<el-form-item>
- <el-button @click="showMouseLeftClick(3)" type="info"
- >鏌ヨ</el-button
- >
+ <el-button
+ @click="showMouseLeftClick(3)"
+ type="info"
+ >鏌ヨ</el-button>
</el-form-item>
</el-form>
</div>
diff --git a/src/views/Archive/dataApplication.vue b/src/views/Archive/dataApplication.vue
index c790741..d3ee7ea 100644
--- a/src/views/Archive/dataApplication.vue
+++ b/src/views/Archive/dataApplication.vue
@@ -1,14 +1,19 @@
<template>
<div class="logLog_box box_div">
- <My-bread
- :list="[
+ <My-bread :list="[
`${$t('synthesis.synthesis')}`,
`${$t('synthesis.dataApplication')}`,
- ]"
- ></My-bread>
+ ]"></My-bread>
<el-divider />
- <div class="inquire subpage_Div" ref="container">
- <el-form :inline="true" ref="sizeForm" :model="sizeForm">
+ <div
+ class="inquire subpage_Div"
+ ref="container"
+ >
+ <el-form
+ :inline="true"
+ ref="sizeForm"
+ :model="sizeForm"
+ >
<div class="flex_box">
<div style="margin-right: auto">
<el-form-item
@@ -16,6 +21,7 @@
:label="$t('operatManage.operationLogObj.username')"
>
<el-input
+ size="small"
v-model="sizeForm.uname"
:placeholder="$t('operatManage.operationLogObj.pleaseInput')"
/>
@@ -25,13 +31,26 @@
:label="$t('operatManage.operationLogObj.status')"
>
<el-select
+ size="small"
v-model="sizeForm.status"
:placeholder="$t('operatManage.operationLogObj.pleaseSelect')"
>
- <el-option :label="$t('dataApply.type1')" value="-10" />
- <el-option :label="$t('dataApply.type2')" value="-1" />
- <el-option :label="$t('dataApply.type3')" value="0" />
- <el-option :label="$t('dataApply.type4')" value="-9" />
+ <el-option
+ :label="$t('dataApply.type1')"
+ value="-10"
+ />
+ <el-option
+ :label="$t('dataApply.type2')"
+ value="-1"
+ />
+ <el-option
+ :label="$t('dataApply.type3')"
+ value="0"
+ />
+ <el-option
+ :label="$t('dataApply.type4')"
+ value="-9"
+ />
</el-select>
</el-form-item>
<el-form-item
@@ -39,6 +58,7 @@
:label="$t('operatManage.operationLogObj.startTime')"
>
<el-date-picker
+ size="small"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="sizeForm.start"
@@ -52,6 +72,7 @@
:label="$t('operatManage.operationLogObj.endTime')"
>
<el-date-picker
+ size="small"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
v-model="sizeForm.end"
@@ -67,26 +88,29 @@
<el-button
@click="onSubmit"
icon="el-icon-search"
- style="
- background: #409eff;
- border: 1px solid #409eff;
- color: white;
- "
- >{{ $t("operatManage.operationLogObj.inquire") }}</el-button
- >
+ size="small"
+ type="primary"
+ >{{ $t("operatManage.operationLogObj.inquire") }}</el-button>
<el-button
+ size="small"
@click="resAllTable"
icon="el-icon-delete"
type="info"
- >{{ $t("operatManage.operationLogObj.empty") }}</el-button
- >
+ >{{ $t("operatManage.operationLogObj.empty") }}</el-button>
</el-form-item>
</div>
</div>
</el-form>
</div>
- <div class="table_box subpage_Div" :style="styleVar">
- <el-table :data="tableData" style="width: 100%" height="calc(100% - 57px)">
+ <div
+ class="table_box subpage_Div"
+ :style="styleVar"
+ >
+ <el-table
+ :data="tableData"
+ style="width: 100%"
+ height="calc(100% - 20px)"
+ >
<el-table-column
align="center"
type="index"
@@ -118,7 +142,10 @@
:formatter="formatStatus"
/>
- <el-table-column min-width="150" :label="$t('common.operate')">
+ <el-table-column
+ min-width="150"
+ :label="$t('common.operate')"
+ >
<template slot-scope="scope">
<el-button
type="danger"
@@ -126,28 +153,25 @@
@click="handleApplyCancel(scope.$index, scope.row)"
v-if="matchState(scope, /[]/)"
plain
- >{{ $t("dataApply.ApplicationCancel") }}</el-button
- >
+ >{{ $t("dataApply.ApplicationCancel") }}</el-button>
<el-button
type="warning"
size="mini"
@click="handleReApply(scope.$index, scope.row)"
v-if="matchState1(scope, /[]/)"
plain
- >{{ $t("dataApply.ReApply") }}</el-button
- >
+ >{{ $t("dataApply.ReApply") }}</el-button>
<el-button
type="info"
size="mini"
plain
@click="handlDetails(scope.$index, scope.row)"
- >{{ $t("dataApply.details") }}</el-button
- >
+ >{{ $t("dataApply.details") }}</el-button>
</template>
</el-table-column>
</el-table>
- <div class="pagination_box">
+ <div style="margin-top:10px">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -167,10 +191,14 @@
:before-close="handleClose"
>
<div>
- <el-form :inline="true" :model="detailsFrom" class="demo-form-inline">
+ <el-form
+ :inline="true"
+ :model="detailsFrom"
+ class="demo-form-inline"
+ >
<el-form-item label="琛ㄥ悕锛�">
- <div class="statusLabel">{{ detailsFrom.tabs }}</div> </el-form-item
- ><br />
+ <div class="statusLabel">{{ detailsFrom.tabs }}</div>
+ </el-form-item><br />
<el-form-item label="鐢宠浜猴細">
<div class="statusLabel">{{ detailsFrom.uname }}</div>
</el-form-item>
@@ -181,16 +209,31 @@
<div class="statusLabel">{{ detailsFrom.status }}</div>
</el-form-item>
</el-form>
- <el-table :data="detailsFrom.tableData" style="width: 100%">
+ <el-table
+ :data="detailsFrom.tableData"
+ style="width: 100%"
+ >
<el-table-column
align="center"
type="index"
:label="$t('operatManage.ELM.index')"
width="70px"
/>
- <el-table-column align="center" prop="depName" label="鍗曚綅" />
- <el-table-column align="center" prop="uname" label="瀹℃牳浜�" />
- <el-table-column align="center" prop="uname" label="鎻忚堪">
+ <el-table-column
+ align="center"
+ prop="depName"
+ label="鍗曚綅"
+ />
+ <el-table-column
+ align="center"
+ prop="uname"
+ label="瀹℃牳浜�"
+ />
+ <el-table-column
+ align="center"
+ prop="uname"
+ label="鎻忚堪"
+ >
<template slot-scope="scope">
<el-input
type="textarea"
@@ -208,7 +251,10 @@
label="鐘舵��"
:formatter="formatStatus1"
/>
- <el-table-column min-width="150" :label="$t('common.operate')">
+ <el-table-column
+ min-width="150"
+ :label="$t('common.operate')"
+ >
<template slot-scope="scope">
<div v-if="matchState3(scope, /[]/)">
<el-button
@@ -216,16 +262,14 @@
size="mini"
@click="handleApplyRepulse(scope.$index, scope.row)"
plain
- >鎵撳洖</el-button
- >
+ >鎵撳洖</el-button>
<el-button
@click="handleApplyAdopt(scope.$index, scope.row)"
type="success"
size="mini"
plain
- >閫氳繃</el-button
- >
+ >閫氳繃</el-button>
</div>
<div v-if="!matchState3(scope, /[]/)">- -</div>
</template>
@@ -275,14 +319,14 @@
},
count: 0,
detailsId: null,
- tableHeight: 0,
+ tableHeight: 0,
timer: 0,
styleVar: {
height: "calc(100% - 109px)",
},
};
},
- beforeDestroy() {
+ beforeDestroy() {
this.timer && clearTimeout(this.timer);
window.removeEventListener("resize", this.onResize);
},
@@ -291,7 +335,7 @@
this.calHeight();
},
methods: {
- onResize() {
+ onResize() {
this.timer && clearTimeout(this.timer);
this.timer = setTimeout(() => {
this.calHeight();
@@ -521,7 +565,7 @@
width: 100%;
height: 100%;
- padding: 1%;
+ padding: 10px;
box-sizing: border-box;
.el-input {
@@ -530,7 +574,7 @@
.inquire {
padding: 8px;
- margin-top: 20px;
+ margin-top: 20px;
border-radius: 5px;
@@ -544,11 +588,6 @@
font-size: 14px;
}
.table_box {
- // overflow: auto;
- // height: 70%;
- // padding: 10px;
- // height: auto;
- // border-radius: 5px;
}
.text-center {
text-align: center;
diff --git a/src/views/Archive/index.vue b/src/views/Archive/index.vue
index ff1a79a..a92fe28 100644
--- a/src/views/Archive/index.vue
+++ b/src/views/Archive/index.vue
@@ -146,7 +146,10 @@
</el-form>
</div>
<div class="contBox">
- <div class="archTopBox">
+ <div
+ id="archTopBox"
+ class="archTopBox"
+ >
<div
class="boxCard"
@@ -214,7 +217,7 @@
</div>
</div>
<div class="archBottomBox">
- <div class="pagination_box">
+ <div style="margin-top:10px">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -545,7 +548,7 @@
</el-table-column>
</el-table>
<div class="archBottomBox">
- <div class="pagination_box">
+ <div>
<el-pagination
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"
@@ -1325,12 +1328,28 @@
handleSizeChange(val) {
this.listData.pageIndex = 1;
this.listData.pageSize = val;
- this.getAllTabesData();
+ switch (this.formInline.dataType) {
+
+ case "type2"://鏂囦欢鏁版嵁
+ this.getQueryFileData();
+ break;
+ case "type1"://鏁版嵁搴撴暟鎹�
+ this.getQueryBankData();
+ break;
+ }
},
handleCurrentChange(val) {
this.listData.pageIndex = val;
- this.getAllTabesData();
+ switch (this.formInline.dataType) {
+
+ case "type2"://鏂囦欢鏁版嵁
+ this.getQueryFileData();
+ break;
+ case "type1"://鏁版嵁搴撴暟鎹�
+ this.getQueryBankData();
+ break;
+ }
},
// 鍏抽敭瀛楁煡璇�
submitForm() {
@@ -1350,16 +1369,22 @@
},
handleSizeChange1(val) {
+
this.listBankData.pageIndex = 1;
this.listBankData.pageSize = val;
//鑾峰彇table淇℃伅
this.getCollapseTable(this.filedsLayer);
+
+
},
handleCurrentChange1(val) {
+ // 灏哾iv鐨勬粴鍔ㄦ潯澶嶄綅鍒伴《閮�
+
this.listBankData.pageIndex = val;
//鑾峰彇table淇℃伅
this.getCollapseTable(this.filedsLayer);
+
},
//鏌ヨ鏁版嵁搴撴暟鎹�
async getQueryBankData() {
@@ -1507,8 +1532,7 @@
height: calc(100% - 20px);
padding: 10px;
position: relative;
- overflow: auto;
-
+ overflow: hidden;
.menu_top {
display: flex;
justify-content: space-between;
@@ -1519,7 +1543,7 @@
}
.contBox {
width: 100%;
- min-height: calc(100% - 111px);
+ height: calc(100% - 111px);
flex-direction: column;
align-items: center;
justify-content: space-between;
@@ -1527,6 +1551,10 @@
.archTopBox {
width: 100%;
+
+ overflow: auto;
+
+ position: relative;
.cardItem {
margin-bottom: 10px;
margin-left: 20px;
diff --git a/src/views/Synthesis/LeftMenu.vue b/src/views/Synthesis/LeftMenu.vue
index 4dc39c7..7a1653f 100644
--- a/src/views/Synthesis/LeftMenu.vue
+++ b/src/views/Synthesis/LeftMenu.vue
@@ -1242,7 +1242,7 @@
var that = this;
window.model = sgworld.Creator.create3DTilesets(
"",
- modelUrl,
+ modelUrl + '/tileset/m/SN/tileset.json',
{},
{},
"0",
@@ -1644,6 +1644,17 @@
// this.$refs.tree.setCheckedKeys(checkKey);
this.$store.state.checkedKeys = checkKey
},
+ setTreeData(source) {
+ let cloneData = JSON.parse(JSON.stringify(source)); // 瀵规簮鏁版嵁娣卞害鍏嬮殕
+ return cloneData.filter((father) => {
+ // 寰幆鎵�鏈夐」
+ let branchArr = cloneData.filter((child) => father.id == child.pid); // 瀵规瘮ID锛屽垎鍒笂涓嬬骇鑿滃崟锛屽苟杩斿洖鏁版嵁
+ branchArr.length > 0 ? (father.children = branchArr) : ""; // 缁欑埗绾ф坊鍔犱竴涓猚hildren灞炴�э紝骞惰祴鍊�
+ // 灞炰簬鍚屼竴瀵硅薄闂锛屼緥濡傦細浠� a=b銆乧=1 锛岀劧鍚庡啀浠� b.c=c 锛� 閭ｄ箞 a.c=b.c=c=1 锛涘悓鐞嗭紝鍚庣画浠� c.d=2 ,閭ｄ箞 a.c.d 涔熸槸=2锛�
+ // 鐢辨寰幆澶氭鍚庯紝灏辫兘褰㈡垚鐩稿簲鐨勬爲褰㈡暟鎹粨鏋�
+ return father.pid == 0; // 杩斿洖涓�绾ц彍鍗�
+ });
+ },
setAddLayers(res) {
if (res.serveType == "WMS") {
var resource = geoServerURl;
--
Gitblit v1.9.3