From 4b8943bd66fc721f8381b74eff259a2f7ffef513 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期一, 27 二月 2023 17:34:19 +0800
Subject: [PATCH] 地形压平添加参数；坡度分析 添加图例，数据上传，元数据管理，资料馆添加元数据查询，综合展示图片更换
---
src/assets/img/图层 3.png | 0
src/views/datamanage/metadataManage.vue | 979 +++++++++------
src/assets/img/图层 37 拷贝 4(1).png | 0
src/assets/img/2D 拷贝.png | 0
src/assets/img/synthesis/3D.png | 0
src/views/Archive/index.vue | 300 ++++
src/assets/img/图层 37 拷贝 4.png | 0
src/components/mapol.vue | 68
src/views/datamanage/projectManage.vue | 116 +
src/assets/css/index.css | 10
src/components/MyBread.vue | 22
src/views/Synthesis/LeftMenu.vue | 69
src/assets/css/configure.css | 4
src/assets/css/content.css | 4
src/assets/img/synthesis/图层 37 拷贝 4.png | 0
src/components/mapsdk.vue | 293 +++-
src/assets/img/synthesis/图层 4.png | 0
src/assets/img/图层 4.png | 0
src/assets/img/图层 2.png | 0
src/assets/img/synthesis/2D 拷贝.png | 0
src/api/api.js | 23
src/assets/img/synthesis/图层 3.png | 0
src/assets/css/config.css | 4
src/assets/img/图层 1.png | 0
src/assets/img/synthesis/图层 2.png | 0
src/assets/img/synthesis/图层 14 拷贝 8.png | 0
src/assets/img/synthesis/图层 37 拷贝 4(1).png | 0
src/views/Tools/queryinfo.vue | 2
src/views/datamanage/dataUpdata.vue | 1552 +++++++++++++----------
src/views/datamanage/SpatialData.vue | 100
src/assets/img/synthesis/图层 14 拷贝 10.png | 0
src/assets/lang/zh.js | 10
src/views/Synthesis/index.vue | 49
src/assets/img/synthesis/2D 拷贝 2.png | 0
src/assets/img/synthesis/图层 1.png | 0
src/components/MapView/mapMenuTop.vue | 45
src/assets/img/2D 拷贝 2.png | 0
src/views/datamanage/catalogueManage.vue | 130 +
src/assets/lang/en.js | 7
src/assets/img/图层 14 拷贝 10.png | 0
src/assets/img/图层 14 拷贝 8.png | 0
41 files changed, 2,395 insertions(+), 1,392 deletions(-)
diff --git a/src/api/api.js b/src/api/api.js
index 81cb5be..11d50d2 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -79,6 +79,11 @@
//璇锋眰鍦板潃
return request.get('/meta/selectPageAndCountByPid', { params: params });
}
+//鍏冩暟鎹�=>鏍规嵁鐖禝D鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟
+export function meta_selectById(params) {
+ //璇锋眰鍦板潃
+ return request.get('/meta/selectById', { params: params });
+}
//缁勭粐鏈烘瀯鏍规嵁id鏌ヨ
@@ -542,7 +547,14 @@
export function dataUploadSelectVerByDirid(params) {
return request.get('/dataUpload/selectVerByDirid', { params: params });
}
-//鏁版嵁涓婁紶=>鑾峰彇鏂囦欢涓婁紶璺緞
+
+//鏁版嵁涓婁紶=>鑾峰彇鐗堟湰Id
+export function dataUpload_selectMetaById(params) {
+ return request.get('/dataUpload/selectMetaById', { params: params });
+}
+
+
+//鏁版嵁涓婁紶=>鏍规嵁婧愭暟鎹甀D鏌ヨ
export function dataUploadSelectPath(params) {
return request.get('/dataUpload/selectPath', { params: params });
}
@@ -763,6 +775,15 @@
export function dataLib_selectPageCountForDownload(params) {
return request.get('/dataLib/selectPageCountForDownload', { params: params });
}
+//璧勬枡棣�=>鏍规嵁婧愭暟鎹甀D鏌ヨ
+export function dataLib_selectMetaById(params) {
+ return request.get('/dataLib/selectMetaById', { params: params });
+}
+//璧勬枡棣�=>鏍规嵁鐖禝D鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟
+export function dataLib_selectPageAndCountByPid(params) {
+ return request.get('/dataLib/selectPageAndCountByPid', { params: params });
+}
+
//涓嬭浇鏃ュ織=銆嬪垎椤垫煡璇㈠苟杩斿洖璁板綍鏁�
export function downlog_selectByPageAndCount(params) {
diff --git a/src/assets/css/config.css b/src/assets/css/config.css
index ec7ce03..a6bc59e 100644
--- a/src/assets/css/config.css
+++ b/src/assets/css/config.css
@@ -372,7 +372,7 @@
}
.Black_theme .twoMenu_imge46 {
- background: url("../../assets/img/synthesis/鍥惧眰 14 鎷疯礉 3.png") no-repeat center;
+ background: url("../../assets/img/synthesis/鍥惧眰 14 鎷疯礉 10.png") no-repeat center;
}
.Black_theme .twoMenu_imge47 {
@@ -456,7 +456,7 @@
/* 楂樺眰閲忔祴鍥炬爣 */
.Black_theme .twoMenu_imge77 {
- background: url("../../assets/img/synthesis/鍥惧眰 31 鎷疯礉.png") no-repeat center;
+ background: url("../../assets/img/synthesis/鍥惧眰 37 鎷疯礉 4.png") no-repeat center;
}
diff --git a/src/assets/css/configure.css b/src/assets/css/configure.css
index d8cadd9..75f1df6 100644
--- a/src/assets/css/configure.css
+++ b/src/assets/css/configure.css
@@ -215,7 +215,7 @@
}
.twoMenu_imge46 {
- background: url("../../assets/img/synthesis/images/3鐧藉簳_133.png") no-repeat center;
+ background: url("../../assets/img/synthesis/鍥惧眰 14 鎷疯礉 8.png") no-repeat center;
}
.twoMenu_imge47 {
@@ -299,7 +299,7 @@
/* 楂樺眰閲忔祴鍥炬爣 */
.twoMenu_imge77 {
- background: url("../../assets/img/synthesis/images/3鐧藉簳_198.png") no-repeat center;
+ background: url("../../assets/img/synthesis/鍥惧眰 37 鎷疯礉 4(1).png") no-repeat center;
}
diff --git a/src/assets/css/content.css b/src/assets/css/content.css
index 04e4e8f..95b3678 100644
--- a/src/assets/css/content.css
+++ b/src/assets/css/content.css
@@ -73,7 +73,7 @@
width: 98%;
height: 98%;
padding: 1%;
- overflow: auto;
+ /* overflow: auto; */
}
.subpage_Iquery {
@@ -210,4 +210,4 @@
.infoBox p {
font-size: 14px;
-}
+}
\ No newline at end of file
diff --git a/src/assets/css/index.css b/src/assets/css/index.css
index 917cd74..11697f2 100644
--- a/src/assets/css/index.css
+++ b/src/assets/css/index.css
@@ -195,7 +195,7 @@
}
.userText {
- font-size: 15px;
+ font-size: 10px;
line-height: 15px;
font-family: Microsoft YaHei;
font-weight: 400;
@@ -204,7 +204,7 @@
}
.TextLanguage {
- font-size: 15px;
+ font-size: 10px;
line-height: 15px;
font-family: Microsoft YaHei;
font-weight: 400;
@@ -214,7 +214,7 @@
.elLink {
margin-left: 5px;
- font-size: 15px;
+ font-size: 10px;
margin-bottom: 4px;
color: white;
}
@@ -238,7 +238,7 @@
z-index: 1024;
margin-top: 15px;
background: rgba(244, 248, 255, 1);
- box-shadow: 0px 0px 6px 2px rgba(244,248,255, 0.85);
+ box-shadow: 0px 0px 6px 2px rgba(244, 248, 255, 0.85);
border-radius: 5px;
border: 1px solid #DCDFE6;
}
@@ -275,4 +275,4 @@
.ol-scale-line {
display: block !important;
-}
+}
\ No newline at end of file
diff --git "a/src/assets/img/2D \346\213\267\350\264\235 2.png" "b/src/assets/img/2D \346\213\267\350\264\235 2.png"
new file mode 100644
index 0000000..1ed35a0
--- /dev/null
+++ "b/src/assets/img/2D \346\213\267\350\264\235 2.png"
Binary files differ
diff --git "a/src/assets/img/2D \346\213\267\350\264\235.png" "b/src/assets/img/2D \346\213\267\350\264\235.png"
new file mode 100644
index 0000000..72159d3
--- /dev/null
+++ "b/src/assets/img/2D \346\213\267\350\264\235.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/2D \346\213\267\350\264\235 2.png" "b/src/assets/img/synthesis/2D \346\213\267\350\264\235 2.png"
new file mode 100644
index 0000000..1ed35a0
--- /dev/null
+++ "b/src/assets/img/synthesis/2D \346\213\267\350\264\235 2.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/2D \346\213\267\350\264\235.png" "b/src/assets/img/synthesis/2D \346\213\267\350\264\235.png"
new file mode 100644
index 0000000..72159d3
--- /dev/null
+++ "b/src/assets/img/synthesis/2D \346\213\267\350\264\235.png"
Binary files differ
diff --git a/src/assets/img/synthesis/3D.png b/src/assets/img/synthesis/3D.png
new file mode 100644
index 0000000..9df949c
--- /dev/null
+++ b/src/assets/img/synthesis/3D.png
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 1.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 1.png"
new file mode 100644
index 0000000..d52d9e2
--- /dev/null
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 1.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 14 \346\213\267\350\264\235 10.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 14 \346\213\267\350\264\235 10.png"
new file mode 100644
index 0000000..b9a98c1
--- /dev/null
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 14 \346\213\267\350\264\235 10.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 14 \346\213\267\350\264\235 8.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 14 \346\213\267\350\264\235 8.png"
new file mode 100644
index 0000000..b5201af
--- /dev/null
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 14 \346\213\267\350\264\235 8.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 2.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 2.png"
new file mode 100644
index 0000000..96855e7
--- /dev/null
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 2.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 3.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 3.png"
new file mode 100644
index 0000000..647248e
--- /dev/null
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 3.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 37 \346\213\267\350\264\235 4\0501\051.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 37 \346\213\267\350\264\235 4\0501\051.png"
new file mode 100644
index 0000000..70bd6f8
--- /dev/null
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 37 \346\213\267\350\264\235 4\0501\051.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 37 \346\213\267\350\264\235 4.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 37 \346\213\267\350\264\235 4.png"
new file mode 100644
index 0000000..e641b28
--- /dev/null
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 37 \346\213\267\350\264\235 4.png"
Binary files differ
diff --git "a/src/assets/img/synthesis/\345\233\276\345\261\202 4.png" "b/src/assets/img/synthesis/\345\233\276\345\261\202 4.png"
new file mode 100644
index 0000000..eb2e995
--- /dev/null
+++ "b/src/assets/img/synthesis/\345\233\276\345\261\202 4.png"
Binary files differ
diff --git "a/src/assets/img/\345\233\276\345\261\202 1.png" "b/src/assets/img/\345\233\276\345\261\202 1.png"
new file mode 100644
index 0000000..d52d9e2
--- /dev/null
+++ "b/src/assets/img/\345\233\276\345\261\202 1.png"
Binary files differ
diff --git "a/src/assets/img/\345\233\276\345\261\202 14 \346\213\267\350\264\235 10.png" "b/src/assets/img/\345\233\276\345\261\202 14 \346\213\267\350\264\235 10.png"
new file mode 100644
index 0000000..b9a98c1
--- /dev/null
+++ "b/src/assets/img/\345\233\276\345\261\202 14 \346\213\267\350\264\235 10.png"
Binary files differ
diff --git "a/src/assets/img/\345\233\276\345\261\202 14 \346\213\267\350\264\235 8.png" "b/src/assets/img/\345\233\276\345\261\202 14 \346\213\267\350\264\235 8.png"
new file mode 100644
index 0000000..b5201af
--- /dev/null
+++ "b/src/assets/img/\345\233\276\345\261\202 14 \346\213\267\350\264\235 8.png"
Binary files differ
diff --git "a/src/assets/img/\345\233\276\345\261\202 2.png" "b/src/assets/img/\345\233\276\345\261\202 2.png"
new file mode 100644
index 0000000..96855e7
--- /dev/null
+++ "b/src/assets/img/\345\233\276\345\261\202 2.png"
Binary files differ
diff --git "a/src/assets/img/\345\233\276\345\261\202 3.png" "b/src/assets/img/\345\233\276\345\261\202 3.png"
new file mode 100644
index 0000000..647248e
--- /dev/null
+++ "b/src/assets/img/\345\233\276\345\261\202 3.png"
Binary files differ
diff --git "a/src/assets/img/\345\233\276\345\261\202 37 \346\213\267\350\264\235 4\0501\051.png" "b/src/assets/img/\345\233\276\345\261\202 37 \346\213\267\350\264\235 4\0501\051.png"
new file mode 100644
index 0000000..70bd6f8
--- /dev/null
+++ "b/src/assets/img/\345\233\276\345\261\202 37 \346\213\267\350\264\235 4\0501\051.png"
Binary files differ
diff --git "a/src/assets/img/\345\233\276\345\261\202 37 \346\213\267\350\264\235 4.png" "b/src/assets/img/\345\233\276\345\261\202 37 \346\213\267\350\264\235 4.png"
new file mode 100644
index 0000000..e641b28
--- /dev/null
+++ "b/src/assets/img/\345\233\276\345\261\202 37 \346\213\267\350\264\235 4.png"
Binary files differ
diff --git "a/src/assets/img/\345\233\276\345\261\202 4.png" "b/src/assets/img/\345\233\276\345\261\202 4.png"
new file mode 100644
index 0000000..eb2e995
--- /dev/null
+++ "b/src/assets/img/\345\233\276\345\261\202 4.png"
Binary files differ
diff --git a/src/assets/lang/en.js b/src/assets/lang/en.js
index d301641..8a80fd0 100644
--- a/src/assets/lang/en.js
+++ b/src/assets/lang/en.js
@@ -53,7 +53,7 @@
dataManage: {
dataManage: 'Data Manage',
- catalogueManage: 'project management',
+ catalogueManage: 'Directory management',
dataUpdata: 'dataUpdata',
datawarehousing: 'Data warehousing',
rangeManage: 'Range management',
@@ -110,7 +110,7 @@
code: 'Code'
},
- metadataManage: 'Source Data Management',
+ metadataManage: 'Metadata management',
dataLoading: 'dataLoading',
SpatialData: 'SpatialData',
versionManage: 'versionManage',
@@ -837,7 +837,8 @@
CavernSpecialty: "Cavern Specialty",
},
shuJuJianSuo: {
- valueone: "Please enter content"
+ valueone: "Please enter content",
+ label: "Please add the condition to query"
},
butten: {
uploadFile: "Upload File",
diff --git a/src/assets/lang/zh.js b/src/assets/lang/zh.js
index 59c3b46..2867bdb 100644
--- a/src/assets/lang/zh.js
+++ b/src/assets/lang/zh.js
@@ -52,7 +52,7 @@
},
dataManage: {
dataManage: '鏁版嵁绠＄悊',
- catalogueManage: '椤圭洰绠＄悊',
+ catalogueManage: '鐩綍绠＄悊',
dataUpdata: '鏁版嵁涓婁紶',
datawarehousing: '鏁版嵁鍏ュ簱',
rangeManage: '鍊煎煙绠＄悊',
@@ -102,7 +102,7 @@
storageDirectory: '瀛樺偍鐩綍',
dataVersion: '鏁版嵁鐗堟湰',
selectData: '閫夋嫨鏁版嵁',
- selectMetadata: '閫夋嫨婧愭暟鎹�',
+ selectMetadata: '閫夋嫨鍏冩暟鎹�',
entryName: '椤圭洰鍚嶇О',
selectWBSData: '閫夋嫨WBS鏁版嵁',
coordinateSystem: '鍧愭爣绯�',
@@ -110,7 +110,7 @@
inspectionItems: "妫�鏌ラ」",
code: '缂栫爜'
},
- metadataManage: '婧愭暟鎹鐞�',
+ metadataManage: '鍏冩暟鎹鐞�',
dataLoading: '鏁版嵁鍏ュ簱',
SpatialData: '绌洪棿鏁版嵁绠＄悊',
versionManage: '鐗堟湰绠＄悊',
@@ -848,7 +848,9 @@
CavernSpecialty: "娲炲簱涓撲笟",
},
shuJuJianSuo: {
- valueone: "璇疯緭鍏ュ唴瀹�"
+ valueone: "璇疯緭鍏ュ唴瀹�",
+
+ label: '璇锋坊鍔犺鏌ヨ鐨勬潯浠�'
},
butten: {
uploadFile: "涓婁紶鏂囦欢",
diff --git a/src/components/MapView/mapMenuTop.vue b/src/components/MapView/mapMenuTop.vue
index 7155efe..a57a862 100644
--- a/src/components/MapView/mapMenuTop.vue
+++ b/src/components/MapView/mapMenuTop.vue
@@ -1,6 +1,10 @@
<template>
<div class="menuBox">
- <el-form :inline="true" :model="menuTopFrom" class="demo-form-inline">
+ <el-form
+ :inline="true"
+ :model="menuTopFrom"
+ class="demo-form-inline"
+ >
<el-form-item>
<el-select
v-model="menuTopFrom.queryLayer"
@@ -8,7 +12,10 @@
placeholder="璇烽�夋嫨..."
:popper-append-to-body="false"
>
- <el-option :value="menuTopFrom.queryLayer" style="height: 100%">
+ <el-option
+ :value="menuTopFrom.queryLayer"
+ style="height: 100%"
+ >
<div style="height: 200px; overflow: auto">
<el-tree
:data="layerData"
@@ -22,16 +29,17 @@
</el-tree>
</div>
<div style="margin-top: 5px">
- <el-button size="small" plain @click="getCheckedNodes"
- >纭</el-button
- >
+ <el-button
+ size="small"
+ plain
+ @click="getCheckedNodes"
+ >纭</el-button>
<el-button
size="small"
type="info"
plain
@click="resetCheckedNodes"
- >閲嶇疆</el-button
- >
+ >閲嶇疆</el-button>
</div>
</el-option>
</el-select>
@@ -69,12 +77,17 @@
> -->
</el-form-item>
<el-form-item>
- <el-button plain size="small" @click="getAttributeQuery"
- >鏌ヨ</el-button
- >
- <el-button type="info" size="small" @click="clearQuery" plain
- >閲嶇疆</el-button
- >
+ <el-button
+ plain
+ size="small"
+ @click="getAttributeQuery"
+ >鏌ヨ</el-button>
+ <el-button
+ type="info"
+ size="small"
+ @click="clearQuery"
+ plain
+ >閲嶇疆</el-button>
</el-form-item>
<!-- <el-form-item>
<el-button
@@ -209,7 +222,11 @@
this.menuTopFrom.queryLayer = valTree[0].tabDesc;
for (var i = 0; i < valTree.length; i++) {
- this.treeChange.push(valTree[i]);
+ if (valTree[i].entity) {
+ debugger
+ this.treeChange.push(valTree[i]);
+ }
+
}
},
//娓呯┖鏍戦�変腑鐨勮妭鐐�
diff --git a/src/components/MyBread.vue b/src/components/MyBread.vue
index 4297e9d..ffb82bd 100644
--- a/src/components/MyBread.vue
+++ b/src/components/MyBread.vue
@@ -1,15 +1,14 @@
<template>
<div class="breadcrumb">
- <el-breadcrumb separator="/">
- <el-breadcrumb-item
- style="color: #409eff !important"
- :to="{ path: '/' }"
- >{{ list[0] }}</el-breadcrumb-item
- >
- <el-breadcrumb-item style="color: #409eff !important">{{
+ <el-breadcrumb style="color: #409eff !important">
+ <el-breadcrumb-item style="color: #409eff !important; cursor: default;">{{ list[0] }}</el-breadcrumb-item>
+ <el-breadcrumb-item style="color: #409eff !important; cursor: default ;">{{
list[1]
}}</el-breadcrumb-item>
- <el-breadcrumb-item style="" v-if="list[2]">{{
+ <el-breadcrumb-item
+ style="cursor: default;"
+ v-if="list[2]"
+ >{{
list[2]
}}</el-breadcrumb-item>
</el-breadcrumb>
@@ -42,4 +41,11 @@
.el-breadcrumb__item:last-child .el-breadcrumb__inner:hover {
color: #409eff !important;
}
+.el-breadcrumb__inner {
+ color: #409eff !important;
+ cursor: default;
+}
+.el-breadcrumb__inner {
+ cursor: default !important ;
+}
</style>
diff --git a/src/components/mapol.vue b/src/components/mapol.vue
index 093ac52..0642c2a 100644
--- a/src/components/mapol.vue
+++ b/src/components/mapol.vue
@@ -2,32 +2,41 @@
<div id="mapol">
<div style="display: flex">
<div
- @click="changeMenulayer"
- class="center CenDiv"
- :class="{ center1: centerFlag }"
+ @click="changeMenulayer"
+ class="center CenDiv"
+ :class="{ center1: centerFlag }"
>
<div
- id="cenBg"
- v-bind:class="{ active: isActive, menuLayer: isMenuLayer }"
+ id="cenBg"
+ v-bind:class="{ active: isActive, menuLayer: isMenuLayer }"
></div>
</div>
- <div @click="changeMapType" class="changeMapType">
- <div id="cenBg" :class="show2DMap ? 'mapTypeTwo' : 'mapTypeThree'"></div>
+ <div
+ @click="changeMapType"
+ class="changeMapType"
+ >
+ <div
+ id="cenBg"
+ :class="show2DMap ? 'mapTypeTwo' : 'mapTypeThree'"
+ ></div>
</div>
</div>
-<!-- <div-->
-<!-- @click="changeMenulayer"-->
-<!-- class="center CenDiv"-->
-<!-- :class="{ center1: centerFlag }"-->
-<!-- >-->
-<!-- <div-->
-<!-- id="cenBg"-->
-<!-- v-bind:class="{ active: isActive, menuLayer: isMenuLayer }"-->
-<!-- ></div>-->
+ <!-- <div-->
+ <!-- @click="changeMenulayer"-->
+ <!-- class="center CenDiv"-->
+ <!-- :class="{ center1: centerFlag }"-->
+ <!-- >-->
+ <!-- <div-->
+ <!-- id="cenBg"-->
+ <!-- v-bind:class="{ active: isActive, menuLayer: isMenuLayer }"-->
+ <!-- ></div>-->
-<!-- </div>-->
- <div v-show="$store.state.isNaviget" class="sindagis-map-compass">
+ <!-- </div>-->
+ <div
+ v-show="$store.state.isNaviget"
+ class="sindagis-map-compass"
+ >
<span
class="left"
@click="leftClick"
@@ -74,7 +83,7 @@
isMenuLayer: false,
rotate: 0,
currentDir: '',
- show2DMap:false,
+ show2DMap: false,
}
},
mounted() {
@@ -99,7 +108,7 @@
target: "mapol",
layers: [imageLayer, vectorLayer],
view: new View({
- center: [105.02, 34.9] ,
+ center: [105.02, 34.9],
zoom: 4,
projection: "EPSG:4326",
}),
@@ -122,11 +131,11 @@
},
//浜岀淮/涓夌淮鍦板浘鍒囨崲
- changeMapType(){
+ changeMapType() {
// debugger
this.show2DMap = !this.show2DMap;
//浜岀淮
- if (this.show2DMap){
+ if (this.show2DMap) {
this.$bus.$emit("changemap", 2);
}
//涓夌淮
@@ -316,7 +325,7 @@
background: url("../assets/img/compass.png") -89px -5px / 266px no-repeat;
}
-.changeMapType{
+.changeMapType {
position: absolute;
bottom: 1%;
left: calc(1% + 75px);
@@ -326,26 +335,25 @@
display: flex;
justify-content: center;
align-items: center;
- box-shadow: 3px 3px 6px #666;
+ // box-shadow: 3px 3px 6px #666;
border-radius: 5px;
- background: #fff;
+ // background: #fff;
cursor: pointer;
}
-.mapTypeTwo{
+.mapTypeTwo {
width: 100%;
height: 100%;
margin-left: 10px;
- background-image: url("../assets/img/3dmap.png");
+ background-image: url("../assets/img/synthesis/3D.png");
background-repeat: no-repeat;
background-size: contain;
}
-.mapTypeThree{
+.mapTypeThree {
width: 100%;
height: 100%;
margin-left: 10px;
- background-image: url("../assets/img/2dmap.png");
+ background-image: url("../assets/img/synthesis/2D 鎷疯礉 2.png");
background-repeat: no-repeat;
background-size: contain;
}
-
</style>
diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue
index ccab4d6..791b4ae 100644
--- a/src/components/mapsdk.vue
+++ b/src/components/mapsdk.vue
@@ -97,6 +97,44 @@
</el-card>
</div>
<div
+ class="terrainLevelBox"
+ v-if="showTerrainLevelDialog"
+ >
+ <el-card class="box-card">
+ <div slot="header">
+ <span>鍦板舰骞虫暣</span>
+ <div style="float: right; cursor: pointer">
+ <i
+ class="el-icon-close"
+ @click="closeBufferBox(5)"
+ ></i>
+ </div>
+ </div>
+ <div class="box-body">
+ <el-form
+ ref="form"
+ :model="terrainFrom"
+ label-width="100px"
+ >
+ <el-form-item label="骞虫暣楂樺害:">
+ <el-input v-model="terrainFrom.height"></el-input>
+ </el-form-item>
+
+ <el-form-item>
+ <el-button
+ @click="drawTerrainLevel"
+ type="parmary"
+ >缁樺埗</el-button>
+ <el-button
+ @click="clearTerrainLevel"
+ type="info"
+ >娓呴櫎</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ </el-card>
+ </div>
+ <div
class="toponymicLocalBox"
v-if="showToponymicLocalBoxDialog"
>
@@ -141,33 +179,40 @@
type="index"
label="搴忓彿"
/>
- <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)"
- size="small"
- >{{scope.row.name}}<i class="el-icon-place" style="padding-left: 5px"></i></el-button>
+ @click="handleLocation(scope.$index, scope.row)"
+ size="small"
+ >{{scope.row.name}}<i
+ class="el-icon-place"
+ style="padding-left: 5px"
+ ></i></el-button>
</template>
</el-table-column>
-<!-- <el-table-column-->
-<!-- prop="name"-->
-<!-- align="center"-->
-<!-- label="瀹氫綅"-->
-<!-- >-->
-<!-- <template slot-scope="scope">-->
-<!-- <el-button-->
-<!-- @click="handleLocation(scope.$index, scope.row)"-->
-<!-- size="small"-->
-<!-- icon="el-icon-place"-->
-<!-- ></el-button>-->
-<!-- </template>-->
-<!-- </el-table-column>-->
-<!-- <el-table-column-->
-<!-- prop="name"-->
-<!-- align="center"-->
-<!-- label="鍦板悕"-->
-<!-- >-->
-<!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="name"-->
+ <!-- align="center"-->
+ <!-- label="瀹氫綅"-->
+ <!-- >-->
+ <!-- <template slot-scope="scope">-->
+ <!-- <el-button-->
+ <!-- @click="handleLocation(scope.$index, scope.row)"-->
+ <!-- size="small"-->
+ <!-- icon="el-icon-place"-->
+ <!-- ></el-button>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="name"-->
+ <!-- align="center"-->
+ <!-- label="鍦板悕"-->
+ <!-- >-->
+ <!-- </el-table-column>-->
</el-table>
<div class="pagination_box">
<el-pagination
@@ -175,7 +220,7 @@
@current-change="handleCurrentChange"
:current-page="listData.pageIndex"
:page-sizes="[10, 20, 50, 100]"
- :pager-count = "3"
+ :pager-count="3"
:page-size="listData.pageSize"
layout="total, prev, pager, next"
:total="count"
@@ -251,29 +296,59 @@
</div>
<div style="display: flex">
<div
- @click="changeMenulayer"
- class="center CenDiv"
- :class="{ center1: centerFlag }"
+ @click="changeMenulayer"
+ class="center CenDiv"
+ :class="{ center1: centerFlag }"
>
<div
- id="cenBg"
- v-bind:class="{ active: isActive, menuLayer: isMenuLayer }"
+ id="cenBg"
+ v-bind:class="{ active: isActive, menuLayer: isMenuLayer }"
></div>
</div>
- <div @click="changeMapType" class="changeMapType">
- <div id="cenBg" :class="show2DMap ? 'mapTypeTwo' : 'mapTypeThree'"></div>
+ <div
+ @click="changeMapType"
+ class="changeMapType"
+ >
+ <div
+ id="cenBg"
+ :class="show2DMap ? 'mapTypeTwo' : 'mapTypeThree'"
+ ></div>
</div>
</div>
-<!-- <div-->
-<!-- @click="changeMenulayer"-->
-<!-- class="center CenDiv"-->
-<!-- :class="{ center1: centerFlag }"-->
-<!-- >-->
-<!-- <div-->
-<!-- id="cenBg"-->
-<!-- v-bind:class="{ active: isActive, menuLayer: isMenuLayer }"-->
-<!-- ></div>-->
-<!-- </div>-->
+ <div
+ class="lengend"
+ v-show="showLengendDialog"
+ >
+ <el-card class="box-card">
+ <!-- <div
+ class="lengend_color"
+ style="height:205px"
+ >
+
+ </div> -->
+ <div class="lengendBox">
+ <div class="lengendSpan">
+ <div style="left:10px">0掳</div>
+ <div style="align-self: flex-end;left:10px; position: absolute;
+ bottom: 8%; ">70掳</div>
+ </div>
+ <div
+ class="lengend_color"
+ style="height:205px; width:30px "
+ ></div>
+ </div>
+ </el-card>
+ </div>
+ <!-- <div-->
+ <!-- @click="changeMenulayer"-->
+ <!-- class="center CenDiv"-->
+ <!-- :class="{ center1: centerFlag }"-->
+ <!-- >-->
+ <!-- <div-->
+ <!-- id="cenBg"-->
+ <!-- v-bind:class="{ active: isActive, menuLayer: isMenuLayer }"-->
+ <!-- ></div>-->
+ <!-- </div>-->
</div>
</div>
</template>
@@ -375,13 +450,16 @@
isMenuLayer: true,
selFrom: {},
selectTree: null,
-
+ showTerrainLevelDialog: false,
menuList: [],
defaultProps: {
children: "children",
label: "label",
}, //鏍戠粦瀹氬璞�
- show2DMap:false,
+ show2DMap: false,
+ terrainFrom: {
+ height: '10'
+ }, showLengendDialog: false,
};
},
mounted() {
@@ -394,6 +472,28 @@
});
},
methods: {
+ drawTerrainLevel() {
+ this.clearTerrainLevel()
+ var deep = parseFloat(this.terrainFrom.height)
+ sgworld.Creator.createSimpleGraphic(
+ 'polygon',
+ {
+ clampToGround: true,
+ },
+ function (entity) {
+
+ var positions = entity.polygon.hierarchy.getValue().positions;
+ sgworld.Creator.SimpleGraphic.remove(entity.id);
+
+ window.TerrainFlattening = sgworld.Creator.createTerrainModifier("鍦板舰鍘嬪钩", positions, deep, {});
+ }
+ );
+ },
+ clearTerrainLevel() {
+ if (window.TerrainFlattening) {
+ window.TerrainFlattening && window.TerrainFlattening.remove();
+ }
+ },
init3DMap() {
var webKey = "94a34772eb88317fcbf8428e10448561";
@@ -544,6 +644,23 @@
this.closeBufferBox(4);
}
}
+ } else if (res.name == "Trrain") {
+ switch (res.id) {
+ case "d10":
+ this.showTerrainLevelDialog = !this.showTerrainLevelDialog;
+ this.clearTerrainLevel();
+ break;
+ }
+
+ } else if (res.name == "Lengend") {
+ switch (res.id) {
+ case "d2":
+
+ this.showLengendDialog = res.vshow;
+
+ break;
+ }
+
}
},
handleSizeChange(val) {
@@ -628,7 +745,10 @@
case 4:
this.showPathAnalysisBoxDialog = false;
this.clearPathAll(3);
-
+ break;
+ case 5:
+ this.showTerrainLevelDialog = false;
+ this.clearTerrainLevel()
break;
}
},
@@ -643,23 +763,23 @@
Altitude: 2000,
};
this.imagePoint = sgworld.Creator.CreateLabel(
- position,
- "",
- SmartEarthRootUrl + "Workers/image/mark.png",
- {
- disableDepthTestDistance: Infinity,
- scale: 0.8,
- },
- 0,
- "宸℃鐐�"
+ position,
+ "",
+ SmartEarthRootUrl + "Workers/image/mark.png",
+ {
+ disableDepthTestDistance: Infinity,
+ scale: 0.8,
+ },
+ 0,
+ "宸℃鐐�"
);
sgworld.Navigate.jumpTo({
//璺宠浆瑙嗚
destination: new Cesium.Cartesian3.fromDegrees(
- lon,
- lat,
- height
+ lon,
+ lat,
+ height
),
});
// sgworld.Navigate.jumpTo({
@@ -910,11 +1030,11 @@
}
},
//浜岀淮/涓夌淮鍦板浘鍒囨崲
- changeMapType(){
+ changeMapType() {
// debugger
this.show2DMap = !this.show2DMap;
//浜岀淮
- if (this.show2DMap){
+ if (this.show2DMap) {
this.$bus.$emit("changemap", 2);
}
//涓夌淮
@@ -944,7 +1064,7 @@
height: 450x;
z-index: 40;
position: absolute;
- right: 6%;
+ right: 8%;
bottom: 1%;
}
.bufferBox {
@@ -960,15 +1080,23 @@
height: 370px;
z-index: 40;
position: absolute;
- right: 6%;
+ right: 8%;
bottom: 1%;
+ }
+ .terrainLevelBox {
+ width: 350px;
+ height: 370px;
+ z-index: 40;
+ position: absolute;
+ right: 8%;
+ bottom: -11%;
}
.pathAnalysisBox {
width: 412px;
z-index: 40;
position: absolute;
- right: 6%;
+ right: 8%;
bottom: 1%;
}
@@ -995,6 +1123,35 @@
bottom: 5%;
position: absolute;
z-index: 40;
+ }
+ .lengend {
+ width: 80px;
+
+ z-index: 40;
+ position: absolute;
+ right: 8%;
+ bottom: 1%;
+ .lengendBox {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ .lengendSpan {
+ flex-direction: column;
+ align-items: center;
+ justify-content: space-between;
+ }
+ .lengend_color {
+ background-image: linear-gradient(
+ #0055ff,
+ #2448da,
+ #483cb6,
+ #6d3091,
+ #91246d,
+ #b61848,
+ #da0c24
+ );
+ }
+ }
}
}
}
@@ -1094,7 +1251,7 @@
border-radius: 5px;
}
-.changeMapType{
+.changeMapType {
position: absolute;
bottom: 1%;
left: calc(1% + 75px);
@@ -1104,25 +1261,25 @@
display: flex;
justify-content: center;
align-items: center;
- box-shadow: 3px 3px 6px #666;
+ // box-shadow: 3px 3px 6px #666;
//border: 1px solid rgba(204, 204, 204, 0.76);
border-radius: 5px;
- background: #fff;
+
cursor: pointer;
}
-.mapTypeTwo{
+.mapTypeTwo {
width: 100%;
height: 100%;
margin-left: 10px;
- background-image: url("../assets/img/3dmap.png");
+ background-image: url("../assets/img/synthesis/3D.png");
background-repeat: no-repeat;
background-size: contain;
}
-.mapTypeThree{
+.mapTypeThree {
width: 100%;
height: 100%;
margin-left: 10px;
- background-image: url("../assets/img/2dmap.png");
+ background-image: url("../assets/img/synthesis/2D 鎷疯礉 2.png");
background-repeat: no-repeat;
background-size: contain;
}
diff --git a/src/views/Archive/index.vue b/src/views/Archive/index.vue
index 38e011a..dc0998c 100644
--- a/src/views/Archive/index.vue
+++ b/src/views/Archive/index.vue
@@ -160,8 +160,25 @@
slot="header"
class="clearfix"
>
- <span v-show="formInline.dataType=='type2'">{{item.name}}</span>
- <span>{{item.tabDesc}}</span>
+
+ <span v-show="formInline.dataType=='type2'">
+ <span v-if="item.ismeta > 0">
+ <el-link
+ style="color: #409eff"
+ title="婧愭暟鎹煡璇�"
+ target="_blank"
+ @click="setQueryMetaData(item)"
+ >{{ item.name }}</el-link>
+ </span>
+ <span v-else-if="item.metaid > 0"> <el-link
+ style="color: #409eff"
+ title="鍏冩暟鎹煡璇�"
+ target="_blank"
+ @click="setMetaDataQuery(item)"
+ >{{ item.name }}</el-link></span>
+ <span v-else>{{ item.name }}</span>
+ </span>
+ <span v-show="!formInline.dataType">{{item.tabDesc}}</span>
<div style="float: right; padding: 3px 0">
<i
class="el-icon-tickets"
@@ -694,6 +711,205 @@
<map-sdk v-if='showMapVisible'></map-sdk>
</div>
</el-dialog>
+ <el-dialog
+ :title="fromQueryMeta.title"
+ :visible.sync="queryMetaFlag1"
+ width="70%"
+ >
+ <div style="height: 65vh; width: 100%">
+
+ <el-table
+ ref="filterTable"
+ :data="metaDataTable1"
+ style="width: 100%"
+ height="100%"
+ >
+ <el-table-column
+ align="center"
+ type="index"
+ :label="$t('common.index')"
+ width="70px"
+ ></el-table-column>
+ <el-table-column
+ align="center"
+ prop="name"
+ :label="$t('common.name')"
+ width="120"
+ >
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="dirName"
+ :label="$t('dataManage.dataUpObj.catalogue')"
+ width="300"
+ />
+ <el-table-column
+ align="center"
+ prop="depName"
+ :label="$t('dataManage.dataUpObj.company')"
+ width="200"
+ />
+ <el-table-column
+ align="center"
+ prop="verName"
+ :label="$t('dataManage.dataUpObj.versionNo')"
+ />
+ <el-table-column
+ align="center"
+ prop="type"
+ :label="$t('common.type')"
+ />
+ <el-table-column
+ align="center"
+ prop="sizes"
+ :label="$t('common.size')"
+ :formatter="changeSizeFile"
+ />
+ <el-table-column
+ align="center"
+ :label="$t('dataManage.dataUpObj.tableName')"
+ >
+ <template slot-scope="scope">
+ <a class="scopeRowColor">{{
+ scope.row.tab
+ }}</a>
+ </template>
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="rows"
+ :label="$t('common.lineNuber')"
+ />
+ <el-table-column
+ align="center"
+ prop="desc"
+ :label="$t('dataManage.dataUpObj.describe')"
+ />
+ </el-table>
+
+ </div>
+ </el-dialog>
+ <el-dialog
+ :title="fromQueryMeta.title"
+ :visible.sync="queryMetaFlag"
+ width="70%"
+ >
+ <div style="height: 65vh; width: 100%">
+ <el-form
+ :inline="true"
+ :model="fromQueryMeta"
+ class="demo-form-inline"
+ >
+ <el-form-item>
+ <el-input
+ size="small"
+ v-model="fromQueryMeta.name"
+ ></el-input>
+ </el-form-item>
+
+ <el-form-item>
+ <el-button
+ type="primary"
+ size="small"
+ @click="setSearchMetaData()"
+ >鏌ヨ
+ </el-button>
+ <el-button
+ type="info"
+ size="small"
+ @click="setRestMetaData()"
+ >閲嶇疆
+ </el-button>
+ </el-form-item>
+ </el-form>
+ <el-table
+ ref="filterTable"
+ :data="metaDataTable"
+ style="width: 100%"
+ height="calc(100% - 100px)"
+ >
+ <el-table-column
+ align="center"
+ type="index"
+ :label="$t('common.index')"
+ width="70px"
+ ></el-table-column>
+ <el-table-column
+ align="center"
+ prop="name"
+ :label="$t('common.name')"
+ width="120"
+ >
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="dirName"
+ :label="$t('dataManage.dataUpObj.catalogue')"
+ width="300"
+ />
+ <el-table-column
+ align="center"
+ prop="depName"
+ :label="$t('dataManage.dataUpObj.company')"
+ width="200"
+ />
+ <el-table-column
+ align="center"
+ prop="verName"
+ :label="$t('dataManage.dataUpObj.versionNo')"
+ />
+ <el-table-column
+ align="center"
+ prop="type"
+ :label="$t('common.type')"
+ />
+ <el-table-column
+ align="center"
+ prop="sizes"
+ :label="$t('common.size')"
+ :formatter="changeSizeFile"
+ />
+ <el-table-column
+ align="center"
+ :label="$t('dataManage.dataUpObj.tableName')"
+ >
+ <template slot-scope="scope">
+ <a
+ class="scopeRowColor"
+ @click="detail(scope.row)"
+ >{{
+ scope.row.tab
+ }}</a>
+ </template>
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="rows"
+ :label="$t('common.lineNuber')"
+ />
+ <el-table-column
+ align="center"
+ prop="desc"
+ :label="$t('dataManage.dataUpObj.describe')"
+ />
+ </el-table>
+ <div
+ class="pagination_box"
+ style="margin-top: 15px"
+ >
+ <el-pagination
+ @size-change="handleMetaSizeChange"
+ @current-change="handMetaCurrentChange"
+ :current-page="listMetaData.pageIndex"
+ :page-sizes="[10, 20, 50, 100]"
+ :page-size="listMetaData.pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="listMetaData.count"
+ >
+ </el-pagination>
+ </div>
+ </div>
+ </el-dialog>
<iframe
id="downFrame"
src=""
@@ -720,7 +936,9 @@
sign_getPublicKey,
dataLib_downloadReq,
dataLib_selectDownloadFile,
- dataLib_selectPageCountForDownload
+ dataLib_selectPageCountForDownload,
+ dataLib_selectPageAndCountByPid,
+ dataLib_selectMetaById
} from '../../api/api';
export default {
components: {
@@ -819,6 +1037,23 @@
downloadTableData: [],
dialogMapVisible: false,
showMapVisible: false,
+ queryMetaFlag1: false,
+ metaDataTable1: [],
+ fromQueryMeta: {
+ title: ""
+ },
+ listMetaData: {
+ metaid: 0,
+ name: "",
+ pageIndex: 1,
+ pageSize: 10,
+ count: 0,
+ },
+ fromQueryMeta: {
+ name: ""
+ },
+ queryMetaFlag: false,
+ metaDataTable: [],
};
},
mounted() {
@@ -828,8 +1063,67 @@
this.signGetPublicKey();
},
methods: {
+ setRestMetaData() {
+ this.fromQueryMeta.name = "";
+ this.listMetaData.name = this.fromQueryMeta.name;
+ this.listMetaData.pageIndex = 1;
+ this.listMetaData.pageSize = 10;
+ this.startQueryMetaData();
+ },
+ setSearchMetaData() {
+ this.listMetaData.name = this.fromQueryMeta.name;
+ this.listMetaData.pageIndex = 1;
+ this.listMetaData.pageSize = 10;
+ this.startQueryMetaData();
+ },
+ //婧愭暟鎹〉闈㈠垏鎹�
+ handleMetaSizeChange(val) {
+ this.listMetaData.pageIndex = 1;
+ this.listMetaData.pageSize = val;
+ this.startQueryMetaData();
+ },
+ //婧愭暟鎹〉闈㈠垏鎹�
+ handMetaCurrentChange(val) {
+ this.listMetaData.pageIndex = val;
+ this.startQueryMetaData();
+ },
+ //婧愭暟鎹煡璇�
+ setQueryMetaData(row) {
+ this.fromQueryMeta.title = row.name;
+ this.listMetaData = {
+ metaid: row.id,
+ name: "",
+ pageIndex: 1,
+ pageSize: 10,
+ count: 0,
+ };
+ this.startQueryMetaData();
+ this.queryMetaFlag = true;
+ },
+ async startQueryMetaData() {
+ const data = await dataLib_selectPageAndCountByPid(this.listMetaData);
+ if (data.code != 200) {
+ return;
+ }
+ this.metaDataTable = data.result;
+ this.listMetaData.count = data.count;
+ },
+ //鍏冩暟鎹煡璇�
+ async setMetaDataQuery(row) {
+
+ this.fromQueryMeta.title = row.name;
+ this.listMetaData = {
+ id: row.metaid,
+ };
+ const data = await dataLib_selectMetaById(this.listMetaData);
+ if (data.code != 200) {
+ return;
+ }
+ this.queryMetaFlag1 = true;
+ this.metaDataTable1 = [data.result];
+ },
getSpaceMapVisibale() {
sgworld.Creator.SimpleGraphic.clear();
for (var i in this.$store.state.queryInfo) {
diff --git a/src/views/Synthesis/LeftMenu.vue b/src/views/Synthesis/LeftMenu.vue
index 0df451e..e5058a4 100644
--- a/src/views/Synthesis/LeftMenu.vue
+++ b/src/views/Synthesis/LeftMenu.vue
@@ -1171,6 +1171,12 @@
break;
case "d2": //鍧″害鍒嗘瀽
that.isslopeFlag = !that.isslopeFlag;
+ var val = {
+ name: "Lengend",
+ id: res,
+ vshow: that.isslopeFlag
+ };
+ this.$bus.$emit("mapChangeBox", val);
window.PDelevationTool = new SmartEarth.ElevationTool(sgworld); //鍏ㄥ眬鍙橀噺
if (that.isslopeFlag == true) {
PDelevationTool.type = "slope";
@@ -1179,6 +1185,7 @@
PDelevationTool.type = "none";
}
PDelevationTool.render();
+debugger
break;
case "d3": //璺緞鍒嗘瀽
@@ -1298,34 +1305,39 @@
}
break;
case "d10": //鍦伴潰鏁村钩
- if (this.DXZPState != null) {
- this.DXZPState.drawHandler && this.DXZPState.drawHandler.destroy();
- Viewer._container.style.cursor = "default";
- this.DXZPState.tooltip && this.DXZPState.tooltip.show(false);
- if (window.DXTerrainFlattening != null) {
- DXTerrainFlattening.remove();
- }
- window.DXTerrainFlattening = null;
- this.DXZPState = null;
- } else {
- this.DXZPState = sgworld.Creator.createSimpleGraphic(
- "polygon",
- {
- clampToGround: true,
- },
- function (entity) {
- let positions = entity.polygon.hierarchy.getValue().positions;
- sgworld.Creator.SimpleGraphic.remove(entity.id);
- window.DXTerrainFlattening =
- sgworld.Creator.createTerrainModifier(
- "鍦板舰鍘嬪钩",
- positions,
- 10,
- {}
- );
- }
- );
- }
+ var val = {
+ name: "Trrain",
+ id: res,
+ };
+ this.$bus.$emit("mapChangeBox", val);
+ // if (this.DXZPState != null) {
+ // this.DXZPState.drawHandler && this.DXZPState.drawHandler.destroy();
+ // Viewer._container.style.cursor = "default";
+ // this.DXZPState.tooltip && this.DXZPState.tooltip.show(false);
+ // if (window.DXTerrainFlattening != null) {
+ // DXTerrainFlattening.remove();
+ // }
+ // window.DXTerrainFlattening = null;
+ // this.DXZPState = null;
+ // } else {
+ // this.DXZPState = sgworld.Creator.createSimpleGraphic(
+ // "polygon",
+ // {
+ // clampToGround: true,
+ // },
+ // function (entity) {
+ // let positions = entity.polygon.hierarchy.getValue().positions;
+ // sgworld.Creator.SimpleGraphic.remove(entity.id);
+ // window.DXTerrainFlattening =
+ // sgworld.Creator.createTerrainModifier(
+ // "鍦板舰鍘嬪钩",
+ // positions,
+ // 10,
+ // {}
+ // );
+ // }
+ // );
+ // }
break;
@@ -1794,6 +1806,7 @@
.menu_Box {
width: 100%;
height: 100%;
+
margin: 0;
padding: 0;
overflow-y: auto;
diff --git a/src/views/Synthesis/index.vue b/src/views/Synthesis/index.vue
index 73e40e9..48f7ff9 100644
--- a/src/views/Synthesis/index.vue
+++ b/src/views/Synthesis/index.vue
@@ -11,18 +11,38 @@
class="MenuIcon"
:class="{ lefMenuActive: showMenuFlag == item.id }"
>
- <div class="menuDiv" :title="item.name" @click="setMenuChange(item)">
- <div class="menuImage" :class="item.class"></div>
+ <div
+ class="menuDiv"
+ :title="item.name"
+ @click="setMenuChange(item)"
+ >
+ <div
+ class="menuImage"
+ :class="item.class"
+ ></div>
</div>
</div>
- <div class="MenuIcon menu-class" :class="{ lefMenuActive: showMenuFlag == menuItem.id }">
- <div class="menuDiv" :title="menuItem.name" @click="setMenuChange(menuItem)">
- <div class="menuImage" :class="menuItem.class"></div>
+ <div
+ class="MenuIcon menu-class"
+ :class="{ lefMenuActive: showMenuFlag == menuItem.id }"
+ >
+ <div
+ class="menuDiv"
+ :title="menuItem.name"
+ @click="setMenuChange(menuItem)"
+ >
+ <div
+ class="menuImage"
+ :class="menuItem.class"
+ ></div>
</div>
</div>
</div>
<div class="rightContent">
- <div class="left_main" :class="{ left_main_show: !openStatus }">
+ <div
+ class="left_main"
+ :class="{ left_main_show: !openStatus }"
+ >
<div class="right_Map">
<left-menu></left-menu>
</div>
@@ -130,7 +150,7 @@
methods: {
//宸︿晶鑿滃崟婊戝姩鏄鹃殣
setMenuChange(res) {
- if (res.id == this.showMenuFlag){
+ if (res.id == this.showMenuFlag) {
return;
}
//娓呴櫎鏌ヨ寮圭獥
@@ -266,8 +286,8 @@
center;
}
.menu_img4 {
- background: url("../../assets/img/synthesis/鍥惧眰 8 鎷疯礉 2.png")
- no-repeat center;
+ background: url("../../assets/img/synthesis/鍥惧眰 3.png") no-repeat
+ center;
}
.menu_img5 {
background: url("../../assets/img/synthesis/鐭㈤噺鏅鸿兘瀵硅薄 鎷疯礉 3.png")
@@ -313,13 +333,14 @@
.left_main {
margin: 0;
//width: 255px;
- width: 130px;
- padding-bottom: 10px;
- height: calc(100% - 10px);
+ width: 140px;
+ // padding-bottom: 10px;
+ height: 100%;
+
overflow-y: auto;
//height: auto;
transition: width 1s;
- background: #F4F8FF;
+ // background: #f4f8ff;
}
.right_main {
@@ -369,7 +390,7 @@
}
}
- .menu-class{
+ .menu-class {
position: absolute;
bottom: 10px;
left: 0;
diff --git a/src/views/Tools/queryinfo.vue b/src/views/Tools/queryinfo.vue
index 1af86b6..1b8e65c 100644
--- a/src/views/Tools/queryinfo.vue
+++ b/src/views/Tools/queryinfo.vue
@@ -7,7 +7,7 @@
:title="data.title || '鎻愮ず'"
maxHeight="400"
@close="close(data.id)"
- left="calc(100% - 960px)"
+ left="calc(90% - 900px)"
top="calc(100% - 470px) "
>
<div>
diff --git a/src/views/datamanage/SpatialData.vue b/src/views/datamanage/SpatialData.vue
index c8d6ed6..027a684 100644
--- a/src/views/datamanage/SpatialData.vue
+++ b/src/views/datamanage/SpatialData.vue
@@ -10,7 +10,8 @@
class="spatial_leftTree subpage_Div "
style="border: 1px solid #dcdfe6;"
>
- <el-input size="small"
+ <el-input
+ size="small"
v-model="filterText"
style="width:220px;"
:placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')"
@@ -37,33 +38,45 @@
:inline="true"
>
- <el-form-item size="small">
+ <el-form-item>
<!-- type="textarea" disabled-->
<el-input
v-model="ruleForm.fileName"
- class="nm-skin-pretty"
- show-word-limit
+ size="small"
:rows="2"
- resize='none'
- style="width: 220px;"
+ style="width: 300px;"
disabled
- :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')"
- ><i slot="suffix" class="el-icon-search" @click="submitForm" style="padding-right: 8px"></i>
+ :placeholder="$t('shuJuGuanLi.shuJuJianSuo.label')"
+ >
+ <!-- <i
+ slot="suffix"
+ class="el-icon-search"
+ @click="submitForm"
+ style="padding-right: 8px"
+ ></i> -->
</el-input>
- <el-button plain @click="conditionVisible = true" size="small" style="color: rgba(212,213,215,0.8)">楂樼骇鏌ヨ鏉′欢</el-button>
+
+ </el-form-item>
+ <el-form-item>
+ <el-button
+ @click="conditionVisible = true"
+ size="small"
+ type="success"
+ icon="el-icon-plus"
+ >{{$t('common.append')}}</el-button>
</el-form-item>
<el-form-item style="float: right">
<el-button
- @click="resetForm"
- type="info"
- size="small"
- icon="el-icon-refresh"
+ @click="resetForm"
+ type="info"
+ size="small"
+ icon="el-icon-refresh"
>{{$t('common.reset')}}</el-button>
</el-form-item>
-<!-- <el-form-item style="float: right">
+ <!-- <el-form-item style="float: right">
<el-button
@click="submitForm"
type="primary"
@@ -73,7 +86,7 @@
</el-form-item>-->
<!-- 鍘绘帀 -->
-<!-- <el-form-item style="float: right">
+ <!-- <el-form-item style="float: right">
<el-button
v-if="btnStatus.insert"
@click="conditionVisible = true"
@@ -85,10 +98,10 @@
<el-form-item style="float: right">
<el-button
- @click="getSpaceMapVisibale"
- size="small"
- type="primary"
- icon="el-icon-search"
+ @click="getSpaceMapVisibale"
+ size="small"
+ type="primary"
+ icon="el-icon-search"
>{{
$t('synthesis.rangequery')
}}</el-button>
@@ -99,7 +112,7 @@
<div class="dividing-line"></div>
<div
class="table_box"
- style="height:calc(100% - 60px)"
+ style="height:calc(100% - 130px)"
>
<!-- border-->
<!-- ref="filterTable"-->
@@ -108,22 +121,24 @@
<!-- height="calc(100% - 57px)"-->
<!-- :header-cell-style="{background:'#e6eaee',color:'#181818', 'text-align': 'center'} "-->
<el-table
+ ref="refTableData"
:data="tableData"
- style="width: 100% ;height: auto"
- height="calc(100% - 50px)"
+ style="width: 100% ;"
+ height="100% "
>
<el-table-column
type="selection"
width="20"
+ align="center"
/>
-<!-- <el-table-column
+ <!-- <el-table-column
width="60"
align="center"
type="index"
:label="$t('common.index')"
/>-->
<el-table-column
- min-width="135"
+ min-width="135"
v-for="(item, index) in attributeData"
:key="index"
:label="item.alias"
@@ -151,19 +166,25 @@
</template>
</el-table-column>
</el-table>
- <div class="pagination_box" style="margin-top: 15px">
- <el-pagination
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- :current-page="listData.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
- :page-size="listData.pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="count"
- >
- </el-pagination>
- </div>
+
</div>
+
+ <div
+ class="pagination_box"
+ style="margin-top: 15px"
+ >
+ <el-pagination
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="listData.pageIndex"
+ :page-sizes="[10, 20, 50, 100]"
+ :page-size="listData.pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="count"
+ >
+ </el-pagination>
+ </div>
+
</div>
</div>
@@ -728,6 +749,7 @@
this.$message.error("璋冪敤鍒楄〃澶辫触,璇疯仈绯诲伐浣滀汉鍛�!");
return;
}
+ this.tableData = []
var res_val = this.attributeData;
this.count = data.count;
for (var i in data.result) {
@@ -741,7 +763,10 @@
}
this.tableData = data.result;
- this.$refs.filterTable.doLayout();
+
+ this.$nextTick(() => {
+ this.$refs.refTableData.doLayout();
+ });
},
//鑾峰彇姣忎釜琛ㄥ瓧娈靛悕绉板強闃堝��
async getCollapseDomFiled() {
@@ -868,6 +893,7 @@
this.formSql.field + " " + this.formSql.condition + " " + val;
this.startFiledAndcondition();
+ this.submitForm();
},
//鍊煎煙瀛楁鍖归厤
diff --git a/src/views/datamanage/catalogueManage.vue b/src/views/datamanage/catalogueManage.vue
index 5de242a..1c6b226 100644
--- a/src/views/datamanage/catalogueManage.vue
+++ b/src/views/datamanage/catalogueManage.vue
@@ -1,15 +1,16 @@
<template>
<div class="subpage_Box">
- <My-bread
- :list="[
+ <My-bread :list="[
`${$t('dataManage.dataManage')}`,
`${$t('dataManage.catalogueManage')}`,
- ]"
- ></My-bread>
- <el-divider />
+ ]"></My-bread>
+ <el-divider />
<div class="mainBox">
- <div class="cataLogContent leftTree subpage_Div" style="border: 1px solid #dcdfe6;">
+ <div
+ class="cataLogContent leftTree subpage_Div"
+ style="border: 1px solid #dcdfe6;"
+ >
<div style="min-width: 450px">
<el-tree
ref="tree"
@@ -26,7 +27,7 @@
</div>
<div class="cataLog_rightContent right subpage_Div">
<div
- class="inquire"
+ class="inquire"
style="
align-items: center;
display: flex;
@@ -35,12 +36,15 @@
>
<el-breadcrumb separator="/">
<el-breadcrumb-item :to="{ path: '/' }">{{
- $t("dataManage.dictionaryManageObj.particulars")
+
}}</el-breadcrumb-item>
</el-breadcrumb>
<div style="margin-right: -5px">
<div class="menuTop">
- <el-form :inline="true" class="demo-form-inline">
+ <el-form
+ :inline="true"
+ class="demo-form-inline"
+ >
<el-form-item>
<el-upload
action
@@ -50,7 +54,11 @@
:on-change="handleChange"
:file-list="fileList"
>
- <el-button type="success" icon="el-icon-plus" size="small">{{ $t("shuJuGuanLi.butten.uploadFile") }}</el-button>
+ <el-button
+ type="success"
+ icon="el-icon-plus"
+ size="small"
+ >{{ $t("shuJuGuanLi.butten.uploadFile") }}</el-button>
</el-upload>
</el-form-item>
<el-form-item>
@@ -61,8 +69,7 @@
type="success"
icon="el-icon-plus"
size="small"
- >{{ $t("shuJuGuanLi.butten.NewPeer") }}</el-button
- >
+ >{{ $t("shuJuGuanLi.butten.NewPeer") }}</el-button>
</el-form-item>
<el-form-item>
<el-button
@@ -72,8 +79,7 @@
type="success"
icon="el-icon-plus"
size="small"
- >{{ $t("shuJuGuanLi.butten.AddChild") }}</el-button
- >
+ >{{ $t("shuJuGuanLi.butten.AddChild") }}</el-button>
</el-form-item>
<el-form-item>
<el-button
@@ -83,8 +89,7 @@
type="danger"
icon="el-icon-delete"
size="small"
- >{{ $t("shuJuGuanLi.butten.Delete") }}</el-button
- >
+ >{{ $t("shuJuGuanLi.butten.Delete") }}</el-button>
</el-form-item>
<el-form-item>
<el-button
@@ -94,8 +99,7 @@
type="info"
icon="el-icon-top"
size="small"
- >{{ $t("shuJuGuanLi.butten.MoveUp") }}</el-button
- >
+ >{{ $t("shuJuGuanLi.butten.MoveUp") }}</el-button>
</el-form-item>
<el-form-item>
<el-button
@@ -105,8 +109,7 @@
type="info"
icon="el-icon-bottom"
size="small"
- >{{ $t("shuJuGuanLi.butten.MoveDown") }}</el-button
- >
+ >{{ $t("shuJuGuanLi.butten.MoveDown") }}</el-button>
</el-form-item>
</el-form>
</div>
@@ -115,18 +118,30 @@
</div>
<div class="dividing-line"></div>
-
- <el-form :model="itemdetail" ref="itemdetail" :rules="rules" style="position: relative; padding-top: 18px">
+ <el-form
+ :model="itemdetail"
+ ref="itemdetail"
+ :rules="rules"
+ style="position: relative; padding-top: 18px"
+ >
<el-form-item
prop="name"
:label="$t('dataManage.dataUpObj.directoryName')"
- :label-width="formLabelWidth">
- <el-input v-model="itemdetail.name" size="small" style=" max-width: 420px" :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')" clearable/>
-<!-- style="max-width: 400px"-->
+ :label-width="formLabelWidth"
+ >
+ <el-input
+ v-model="itemdetail.name"
+ size="small"
+ style=" max-width: 420px"
+ :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')"
+ clearable
+ />
+ <!-- style="max-width: 400px"-->
</el-form-item>
<el-form-item
:label="$t('dataManage.dataUpObj.catalogDescription')"
- :label-width="formLabelWidth" >
+ :label-width="formLabelWidth"
+ >
<el-input
v-model="itemdetail.descr"
type="textarea"
@@ -146,10 +161,10 @@
:placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')"
clearable
/>
-<!-- resize="none"-->
-<!-- style="height: 100%; overflow: auto; max-width: 400px"-->
+ <!-- resize="none"-->
+ <!-- style="height: 100%; overflow: auto; max-width: 400px"-->
</el-form-item>
-<!-- <el-form-item
+ <!-- <el-form-item
:label="$t('dataManage.dataUpObj.inspectionItems')"
:label-width="formLabelWidth"
>
@@ -173,7 +188,7 @@
autosize
/>
</el-form-item>
-<!-- <el-form-item
+ <!-- <el-form-item
:label="$t('dataManage.dataUpObj.catalogRemarks')"
:label-width="formLabelWidth"
>
@@ -184,7 +199,7 @@
style="max-width: 400px"
/>
</el-form-item>-->
-<!-- <div class="btnBox">
+ <!-- <div class="btnBox">
<el-button
v-if="menuStatus.update"
class="primary"
@@ -201,9 +216,22 @@
>
</div>-->
</el-form>
- <div slot="footer" class="dialog-footer" style="padding-left: 45% ;padding-top: 20px">
- <el-button v-if="menuStatus.update" type="primary" size="small" @click="updCata('itemdetail')">{{ $t("common.preservation") }}</el-button>
- <el-button v-if="menuStatus.update" size="small" @click="reset">{{ $t("common.cancel") }}</el-button>
+ <div
+ slot="footer"
+ class="dialog-footer"
+ style="padding-left: 45% ;padding-top: 20px"
+ >
+ <el-button
+ v-if="menuStatus.update"
+ type="primary"
+ size="small"
+ @click="updCata('itemdetail')"
+ >{{ $t("common.preservation") }}</el-button>
+ <el-button
+ v-if="menuStatus.update"
+ size="small"
+ @click="reset"
+ >{{ $t("common.cancel") }}</el-button>
</div>
</div>
</div>
@@ -226,19 +254,29 @@
:visible.sync="dialogFormVisible"
:before-close="handleClose"
>
- <el-form :model="ruleForm" ref="ruleForm" :rules="rules">
+ <el-form
+ :model="ruleForm"
+ ref="ruleForm"
+ :rules="rules"
+ >
<el-form-item
:label="$t('dataManage.dataUpObj.directoryName')"
prop="name"
:label-width="formLabelWidth"
>
- <el-input v-model="ruleForm.name" autocomplete="off"></el-input>
+ <el-input
+ v-model="ruleForm.name"
+ autocomplete="off"
+ ></el-input>
</el-form-item>
<el-form-item
:label="$t('dataManage.dataUpObj.catalogDescription')"
:label-width="formLabelWidth"
>
- <el-input v-model="ruleForm.descr" autocomplete="off"></el-input>
+ <el-input
+ v-model="ruleForm.descr"
+ autocomplete="off"
+ ></el-input>
</el-form-item>
<el-form-item
:label="$t('dataManage.dataUpObj.fileExtension')"
@@ -278,10 +316,16 @@
:label="$t('dataManage.dataUpObj.catalogRemarks')"
:label-width="formLabelWidth"
>
- <el-input v-model="ruleForm.bak" autocomplete="off"></el-input>
+ <el-input
+ v-model="ruleForm.bak"
+ autocomplete="off"
+ ></el-input>
</el-form-item>
</el-form>
- <div slot="footer" class="dialog-footer">
+ <div
+ slot="footer"
+ class="dialog-footer"
+ >
<el-button @click="resetForm('ruleForm')">{{
$t("common.cancel")
}}</el-button>
@@ -289,8 +333,7 @@
class="primary"
@click="submitForm('ruleForm')"
v-loading.fullscreen.lock="fullscreenLoading"
- >{{ $t("common.preservation") }}</el-button
- >
+ >{{ $t("common.preservation") }}</el-button>
</div>
</el-dialog>
</div>
@@ -513,7 +556,7 @@
.then((_) => {
this.resetForm();
})
- .catch((_) => {});
+ .catch((_) => { });
},
treeData(source) {
let cloneData = JSON.parse(JSON.stringify(source)); // 瀵规簮鏁版嵁娣卞害鍏嬮殕
@@ -975,12 +1018,11 @@
margin: 5px;
}
}
-
}
}
.btnBox {
position: absolute;
- bottom:0;
+ bottom: 0;
right: 0;
}
</style>
diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index 9eeecb3..30b80c3 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -1,42 +1,45 @@
<template>
<div
- class="subpage_Box"
- v-loading="loading"
- element-loading-background="rgba(0, 0, 0, 0.8)"
+ class="subpage_Box"
+ v-loading="loading"
+ element-loading-background="rgba(0, 0, 0, 0.8)"
>
<My-bread :list="[
`${$t('dataManage.dataManage')}`,
`${$t('dataManage.dataUpdata')}`,
]"></My-bread>
- <el-divider/>
+ <el-divider />
<el-tabs
- type="card"
- v-model="activeTabName"
- @tab-click="handleTabClick"
+ type="card"
+ v-model="activeTabName"
+ @tab-click="handleTabClick"
>
<!-- 涓婁紶鏁版嵁 -->
<el-tab-pane
- :label="$t('dataManage.dataUpObj.uploaddata')"
- name="first"
+ :label="$t('dataManage.dataUpObj.uploaddata')"
+ name="first"
>
- <div class="inquire subpage_Div" ref="container">
+ <div
+ class="inquire subpage_Div"
+ ref="container"
+ >
<el-form
- :inline="true"
- :model="formInline"
- class="demo-form-inline"
+ :inline="true"
+ :model="formInline"
+ class="demo-form-inline"
>
<!-- 鍏ュ簱绫诲瀷 -->
<el-form-item
- :label="$t('dataManage.dataUpObj.UploadType')"
- style="margin-right: 2%"
- size="small"
+ :label="$t('dataManage.dataUpObj.UploadType')"
+ style="margin-right: 2%"
+ size="small"
>
<el-select
- :disabled="tableData.length == 0 ? false : true"
- v-model="formInline.uploadType"
- @change="uploadTypeChange"
- :popper-append-to-body="false"
- placeholder="璇烽�夋嫨"
+ :disabled="tableData.length == 0 ? false : true"
+ v-model="formInline.uploadType"
+ @change="uploadTypeChange"
+ :popper-append-to-body="false"
+ placeholder="璇烽�夋嫨"
>
<!-- <el-option
v-for="item in uploadOption"
@@ -46,12 +49,12 @@
></el-option>-->
<el-option
- :label="$t('shuJuGuanLi.pselect.dFile')"
- value="v1"
+ :label="$t('shuJuGuanLi.pselect.dFile')"
+ value="v1"
/>
<el-option
- :label="$t('shuJuGuanLi.pselect.dFiles')"
- value="v2"
+ :label="$t('shuJuGuanLi.pselect.dFiles')"
+ value="v2"
/>
</el-select>
@@ -59,27 +62,27 @@
</el-form-item>
<!-- 瀛樺偍鐩綍 -->
<el-form-item
- style="margin-right: 2%"
- v-show="uploadFlag"
- :label="$t('dataManage.dataUpObj.storageDirectory')"
- size="small"
+ style="margin-right: 2%"
+ v-show="uploadFlag"
+ :label="$t('dataManage.dataUpObj.storageDirectory')"
+ size="small"
>
<el-select
- :popper-append-to-body="false"
- v-model="formInline.dirName"
- :disabled="tableData.length == 0 ? false : true"
+ :popper-append-to-body="false"
+ v-model="formInline.dirName"
+ :disabled="tableData.length == 0 ? false : true"
>
<el-option
- :value="formInline.dirid"
- :label="formInline.dirName"
- style=" height:auto"
+ :value="formInline.dirid"
+ :label="formInline.dirName"
+ style=" height:auto"
>
<el-tree
- ref="tree"
- :data="catalogOption"
- node-key="id"
- :props="cascader"
- @node-click="catalogChange"
+ ref="tree"
+ :data="catalogOption"
+ node-key="id"
+ :props="cascader"
+ @node-click="catalogChange"
/>
</el-option>
</el-select>
@@ -94,58 +97,58 @@
</el-form-item>
<!-- 椤圭洰鍚嶇О -->
<el-form-item
- style="margin-right: 2%"
- v-show="!uploadFlag"
- :label="$t('dataManage.dataUpObj.entryName')"
- size="small"
+ style="margin-right: 2%"
+ v-show="!uploadFlag"
+ :label="$t('dataManage.dataUpObj.entryName')"
+ size="small"
>
<el-select
- :popper-append-to-body="false"
- :disabled="tableData.length == 0 ? false : true"
- v-model="formInline.entryId"
- @change="entryNameChange"
- placeholder="璇烽�夋嫨"
+ :popper-append-to-body="false"
+ :disabled="tableData.length == 0 ? false : true"
+ v-model="formInline.entryId"
+ @change="entryNameChange"
+ placeholder="璇烽�夋嫨"
>
<el-option
- v-for="item in entryOption"
- :key="item.id"
- :label="item.name"
- :value="item.name"
+ v-for="item in entryOption"
+ :key="item.id"
+ :label="item.name"
+ :value="item.name"
></el-option>
</el-select>
</el-form-item>
<!-- 鏁版嵁鐗堟湰 -->
<el-form-item
- :label="$t('dataManage.dataUpObj.dataVersion')"
- style="margin-right: 2%"
- size="small"
+ :label="$t('dataManage.dataUpObj.dataVersion')"
+ style="margin-right: 2%"
+ size="small"
>
<el-select
- :popper-append-to-body="false"
- :disabled="tableData.length == 0 ? false : true"
- v-model="formInline.verid"
- :placeholder="$t('common.choose')"
+ :popper-append-to-body="false"
+ :disabled="tableData.length == 0 ? false : true"
+ v-model="formInline.verid"
+ :placeholder="$t('common.choose')"
>
<el-option
- v-for="item in verOption"
- :key="item.id"
- :label="item.name"
- :value="item.id"
+ v-for="item in verOption"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<!-- 鏁版嵁涓撲笟 -->
<el-form-item
- :label="$t('dataManage.dataUpObj.dataSpecialty')"
- style="margin-right: 2%"
- size="small"
+ :label="$t('dataManage.dataUpObj.dataSpecialty')"
+ style="margin-right: 2%"
+ size="small"
>
<el-select
- :popper-append-to-body="false"
- :disabled="tableData.length == 0 ? false : true"
- v-model="formInline.specialtyId"
- :placeholder="$t('common.choose')"
+ :popper-append-to-body="false"
+ :disabled="tableData.length == 0 ? false : true"
+ v-model="formInline.specialtyId"
+ :placeholder="$t('common.choose')"
>
<!-- <el-option
v-for="item in specialtyOption"
@@ -155,41 +158,41 @@
</el-option>-->
<el-option
- :label="$t('shuJuGuanLi.pselect.SurveyDiscipline')"
- value="娴嬮噺涓撲笟"
+ :label="$t('shuJuGuanLi.pselect.SurveyDiscipline')"
+ value="娴嬮噺涓撲笟"
/>
<el-option
- :label="$t('shuJuGuanLi.pselect.SurveysDiscipline')"
- value="鍕樺療涓撲笟"
+ :label="$t('shuJuGuanLi.pselect.SurveysDiscipline')"
+ value="鍕樺療涓撲笟"
/>
<el-option
- :label="$t('shuJuGuanLi.pselect.GeologicalDisasterSpecialty')"
- value="鍦扮伨涓撲笟"
+ :label="$t('shuJuGuanLi.pselect.GeologicalDisasterSpecialty')"
+ value="鍦扮伨涓撲笟"
/>
<el-option
- :label="$t('shuJuGuanLi.pselect.CavernSpecialty')"
- value="娲炲簱涓撲笟"
+ :label="$t('shuJuGuanLi.pselect.CavernSpecialty')"
+ value="娲炲簱涓撲笟"
/>
</el-select>
</el-form-item>
<!-- 鍧愭爣绯� -->
<el-form-item
- :label="$t('dataManage.dataUpObj.coordinateSystem')"
- style="margin-right: 3%"
- size="small"
+ :label="$t('dataManage.dataUpObj.coordinateSystem')"
+ style="margin-right: 3%"
+ size="small"
>
<el-select
- :popper-append-to-body="false"
- :disabled="tableData.length == 0 ? false : true"
- v-model="formInline.coordinateId"
- :placeholder="$t('common.choose')"
+ :popper-append-to-body="false"
+ :disabled="tableData.length == 0 ? false : true"
+ v-model="formInline.coordinateId"
+ :placeholder="$t('common.choose')"
>
<el-option
- v-for="item in coordinateOption"
- :key="item.epsgcode"
- :label="item.coordinate"
- :value="item.epsgcode"
+ v-for="item in coordinateOption"
+ :key="item.epsgcode"
+ :label="item.coordinate"
+ :value="item.epsgcode"
>
</el-option>
</el-select>
@@ -199,113 +202,116 @@
<!-- 閫夋嫨鏁版嵁 -->
<el-form-item size="small">
<el-link
- :disabled="tableData.length == 0 ? false : true"
- v-show="formInline.specialtyData == '璇烽�夋嫨鏁版嵁'"
- @click="setSelectFile"
- :underline="false"
- type="primary"
+ :disabled="tableData.length == 0 ? false : true"
+ v-show="formInline.specialtyData == '璇烽�夋嫨鏁版嵁'"
+ @click="setSelectFile"
+ :underline="false"
+ type="primary"
>{{ $t('dataManage.dataUpObj.selectData') }}
</el-link>
<el-link
- v-show="formInline.specialtyData != '璇烽�夋嫨鏁版嵁'"
- @click="restSelectFile"
- :underline="false"
- type="primary"
+ v-show="formInline.specialtyData != '璇烽�夋嫨鏁版嵁'"
+ @click="restSelectFile"
+ :underline="false"
+ type="primary"
>{{ $t('common.reset') }}
</el-link>
<input
- size="small"
- id="selectDataFile"
- type="file"
- name="file"
- multiple="multiple"
- :accept="formInline.selectFileType"
- @change="handleSelectFileChange"
- style="display: none"
+ size="small"
+ id="selectDataFile"
+ type="file"
+ name="file"
+ multiple="multiple"
+ :accept="formInline.selectFileType"
+ @change="handleSelectFileChange"
+ style="display: none"
></input>
</el-form-item>
<el-form-item size="small">
<el-input
- :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')"
- v-model="formInline.specialtyData"
- style="width:200px;"
- disabled
+ :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')"
+ v-model="formInline.specialtyData"
+ style="width:200px;"
+ disabled
>
</el-input>
</el-form-item>
<!-- 閫夋嫨鍏冩暟鎹� -->
- <el-form-item v-show="uploadFlag" style="padding-left: 16px">
+ <el-form-item
+ v-show="uploadFlag"
+ style="padding-left: 16px"
+ >
<el-link
- :disabled="tableData.length == 0 ? false : true"
- v-show="formInline.metaData == '璇烽�夋嫨鍏冩暟鎹�'"
- @click="setMetaFile"
- :underline="false"
- type="primary"
+ :disabled="tableData.length == 0 ? false : true"
+ v-show="formInline.metaData == '璇烽�夋嫨鍏冩暟鎹�'"
+ @click="setMetaFile"
+ :underline="false"
+ type="primary"
>{{ $t('dataManage.dataUpObj.selectMetadata') }}
</el-link>
<el-link
- v-show="formInline.metaData != '璇烽�夋嫨鍏冩暟鎹�'"
- @click="restMetaFile"
- :underline="false"
- type="primary"
+ v-show="formInline.metaData != '璇烽�夋嫨鍏冩暟鎹�'"
+ @click="restMetaFile"
+ :underline="false"
+ type="primary"
>{{ $t('common.reset') }}
</el-link>
<input
- id="metaDataFile"
- type="file"
- name="file"
- multiple="multiple"
- accept=".xls,.xlsx"
- style="display: none"
- @change="handleMetaFileChange"
+ id="metaDataFile"
+ type="file"
+ name="file"
+ multiple="multiple"
+ accept=".xls,.xlsx"
+ style="display: none"
+ @change="handleMetaFileChange"
></input>
</el-form-item>
<el-form-item
- v-show="uploadFlag"
- size="small"
+ v-show="uploadFlag"
+ size="small"
>
<el-input
- :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')"
- v-model="formInline.metaData"
- style="width:200px;"
- disabled
+ :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')"
+ v-model="formInline.metaData"
+ style="width:200px;"
+ disabled
>
</el-input>
</el-form-item>
<!-- 閫夋嫨WBS鏁版嵁 -->
<el-form-item v-show="!uploadFlag">
<el-link
- :disabled="tableData.length == 0 ? false : true"
- v-show="formInline.wbsData == '璇烽�夋嫨WBS鏁版嵁'"
- @click="setWBSFile"
- :underline="false"
- type="primary"
+ :disabled="tableData.length == 0 ? false : true"
+ v-show="formInline.wbsData == '璇烽�夋嫨WBS鏁版嵁'"
+ @click="setWBSFile"
+ :underline="false"
+ type="primary"
>{{ $t('dataManage.dataUpObj.selectWBSData') }}
</el-link>
<el-link
- :disabled="tableData.length == 0 ? false : true"
- v-show="formInline.wbsData != '璇烽�夋嫨WBS鏁版嵁'"
- @click="restWBSFile"
- :underline="false"
- type="primary"
+ :disabled="tableData.length == 0 ? false : true"
+ v-show="formInline.wbsData != '璇烽�夋嫨WBS鏁版嵁'"
+ @click="restWBSFile"
+ :underline="false"
+ type="primary"
>{{ $t('common.reset') }}
</el-link>
<input
- id="wbsDataFile"
- type="file"
- name="file"
- multiple="multiple"
- accept=".xls,.xlsx"
- style="display: none"
- @change="handleWBSFileChange"
+ id="wbsDataFile"
+ type="file"
+ name="file"
+ multiple="multiple"
+ accept=".xls,.xlsx"
+ style="display: none"
+ @change="handleWBSFileChange"
></input>
</el-form-item>
<el-form-item v-show="!uploadFlag">
<el-input
- placeholder="璇烽�夋嫨WBS鏁版嵁"
- v-model="formInline.wbsData"
- style="width:210px;"
- disabled
+ placeholder="璇烽�夋嫨WBS鏁版嵁"
+ v-model="formInline.wbsData"
+ style="width:210px;"
+ disabled
>
</el-input>
</el-form-item>
@@ -314,45 +320,45 @@
<el-form-item>
<!-- 涓婁紶 -->
<el-button
- v-if="menuStatus.upload"
- :disabled="tableData.length == 0 ? false : true"
- @click="setFileUpload"
- size="small"
- icon="el-icon-upload"
- type="success"
+ v-if="menuStatus.upload"
+ :disabled="tableData.length == 0 ? false : true"
+ @click="setFileUpload"
+ size="small"
+ icon="el-icon-upload"
+ type="success"
>{{
$t('common.upload')
}}
</el-button>
<!-- 鍒犻櫎 -->
<el-button
- v-if="menuStatus.delete"
- :disabled="multipleSelection.length == 0 ? true : false"
- icon="el-icon-delete"
- size="small"
- @click="setFileDelete"
- type="danger"
+ v-if="menuStatus.delete"
+ :disabled="multipleSelection.length == 0 ? true : false"
+ icon="el-icon-delete"
+ size="small"
+ @click="setFileDelete"
+ type="danger"
>{{ $t('common.delete') }}
</el-button>
<!-- 鍏ュ簱 -->
<el-button
- v-if="menuStatus.insert"
- @click="setFileWare"
- size="small"
- :disabled="tableData.length == 0 ? true: false"
- icon="el-icon-folder-add"
- type="warning"
+ v-if="menuStatus.insert"
+ @click="setFileWare"
+ size="small"
+ :disabled="tableData.length == 0 ? true: false"
+ icon="el-icon-folder-add"
+ type="warning"
>{{ $t('common.Warehousin') }}
</el-button>
<!-- 璐ㄦ -->
<el-button
- style="margin-right:-9px"
- v-if="menuStatus.insert"
- :disabled="multipleSelection.length == 0 ? true : false"
- type="info"
- size="small"
- icon="el-icon-folder-checked"
- @click="handleQuayTestClick()"
+ style="margin-right:-9px"
+ v-if="menuStatus.insert"
+ :disabled="multipleSelection.length == 0 ? true : false"
+ type="info"
+ size="small"
+ icon="el-icon-folder-checked"
+ @click="handleQuayTestClick()"
>{{ $t('common.quayTest') }}
</el-button>
@@ -360,64 +366,66 @@
</div>
</div>
-
</el-form>
</div>
<!-- 涓婁紶鏁版嵁鍒楄〃 -->
<div class="dividing-line"></div>
- <div class="table_box" :style="styleVar">
+ <div
+ class="table_box"
+ :style="styleVar"
+ >
<el-table
- style="width:100%"
- :data="tableData"
- @selection-change="handleSelectionChange"
- height="calc(100% - 57px)"
+ style="width:100%"
+ :data="tableData"
+ @selection-change="handleSelectionChange"
+ height="calc(100% - 57px)"
>
<el-table-column
- type="selection"
- width="55"
+ type="selection"
+ width="55"
/>
<el-table-column
- align="center"
- type="index"
- :label="$t('common.index')"
- width="70px"
+ align="center"
+ type="index"
+ :label="$t('common.index')"
+ width="70px"
/>
<el-table-column
- align="center"
- prop="name"
- :label="$t('common.name')"
+ align="center"
+ prop="name"
+ :label="$t('common.name')"
/>
<el-table-column
- align="center"
- prop="sizes"
- :label="$t('common.size')"
- :formatter="changeSizeFile"
+ align="center"
+ prop="sizes"
+ :label="$t('common.size')"
+ :formatter="changeSizeFile"
/>
<el-table-column
- align="center"
- prop="status"
- label="鐘舵��"
+ align="center"
+ prop="status"
+ label="鐘舵��"
/>
<el-table-column
- align="center"
- prop="code"
- label="鐘舵��"
- v-if="false"
+ align="center"
+ prop="code"
+ label="鐘舵��"
+ v-if="false"
/>
<el-table-column
- label="鎿嶄綔"
- width="120"
+ label="鎿嶄綔"
+ width="120"
>
<template slot-scope="scope">
<el-button
- v-if="menuStatus.download"
- v-show="scope.row.code != null"
- @click="handerLogClick(scope.row)"
- type="primary"
- size="mini"
- plain
+ v-if="menuStatus.download"
+ v-show="scope.row.code != null"
+ @click="handerLogClick(scope.row)"
+ type="primary"
+ size="mini"
+ plain
> 鏃ュ織
</el-button>
</template>
@@ -427,45 +435,56 @@
</el-tab-pane>
<!-- 鍏ュ簱鏁版嵁娓呭崟 -->
<el-tab-pane
- :label="$t('dataManage.dataUpObj.receiptdata')"
- name="second"
+ :label="$t('dataManage.dataUpObj.receiptdata')"
+ name="second"
>
- <div class="inquire subpage_Div" ref="container1">
+ <div
+ class="inquire subpage_Div"
+ ref="container1"
+ >
<el-form
- :inline="true"
- :model="formWarehousing"
- class="demo-form-inline"
+ :inline="true"
+ :model="formWarehousing"
+ class="demo-form-inline"
>
<div class="flex_box">
<div style="margin-right: auto">
- <el-form-item size="small" :label="$t('dataManage.dataUpObj.describe')">
+ <el-form-item
+ size="small"
+ :label="$t('dataManage.dataUpObj.describe')"
+ >
<el-input
- v-model="formWarehousing.name"
- :placeholder="$t('shuJuGuanLi.lable1')"
- style="width: 200px;"
- ><i slot="suffix" class="el-icon-search" @click="setWarehouseSearch" style="padding-right: 8px"></i></el-input>
+ v-model="formWarehousing.name"
+ :placeholder="$t('shuJuGuanLi.lable1')"
+ style="width: 200px;"
+ ><i
+ slot="suffix"
+ class="el-icon-search"
+ @click="setWarehouseSearch"
+ style="padding-right: 8px"
+ ></i></el-input>
</el-form-item>
</div>
<div>
<el-form-item>
<el-button
- v-if="menuStatus.upload"
- :disabled="multipleDelete.length == 0 ? true : false"
- @click="setEnclosure"
- icon="el-icon-folder-opened"
- type="success"
- size="small"
+ v-if="menuStatus.upload"
+ :disabled="multipleDelete.length == 0 ? true : false"
+ @click="setEnclosure"
+ icon="el-icon-folder-opened"
+ type="success"
+ size="small"
>{{ $t('common.enclosure') }}
</el-button>
<el-button
- v-if="menuStatus.delete"
- @click="setWarehouseDel"
- icon="el-icon-folder-delete"
- type="danger"
- size="small"
+ v-if="menuStatus.delete"
+ @click="setWarehouseDel"
+ icon="el-icon-folder-delete"
+ type="danger"
+ size="small"
>{{ $t('common.delete') }}
</el-button>
-<!-- <el-button
+ <!-- <el-button
@click="setWarehouseSearch"
icon="el-icon-upload"
size="small"
@@ -475,238 +494,253 @@
}}
</el-button>-->
<el-button
- @click="setWarehouseReset"
- icon="el-icon-folder-add"
- size="small"
- type="info"
+ @click="setWarehouseReset"
+ icon="el-icon-folder-add"
+ size="small"
+ type="info"
>{{ $t('common.reset') }}
</el-button>
</el-form-item>
</div>
</div>
-
</el-form>
</div>
<!-- 鍏ュ簱 -->
<div class="dividing-line"></div>
- <div class="table_box" :style="styleVar1">
+ <div
+ class="table_box"
+ :style="styleVar1"
+ >
<el-table
- ref="filterTable"
- :data="waretableData"
- style="width: 100%"
- height="calc(100% - 57px)"
- @selection-change="handleDelteChange"
+ ref="filterTable"
+ :data="waretableData"
+ style="width: 100%"
+ height="calc(100% - 57px)"
+ @selection-change="handleDelteChange"
>
<el-table-column
- type="selection"
- width="55"
+ type="selection"
+ width="55"
>
</el-table-column>
<el-table-column
- align="center"
- type="index"
- :label="$t('common.index')"
- width="70px"
+ align="center"
+ type="index"
+ :label="$t('common.index')"
+ width="70px"
></el-table-column>
<el-table-column
- align="center"
-
- :label="$t('common.name')"
-
- width="120"
+ align="center"
+ :label="$t('common.name')"
+ width="120"
>
<template slot-scope="scope">
- <span v-if="scope.row.ismeta > 0">
- <el-link style="color:#409eff" title="鍏冩暟鎹煡璇�" @click="setQueryMetaData(scope.row)"
- target="_blank">{{ scope.row.name }}</el-link>
-
- </span>
+ <span v-if="scope.row.ismeta > 0">
+ <el-link
+ style="color:#409eff"
+ title="婧愭暟鎹煡璇�"
+ @click="setQueryMetaData(scope.row)"
+ target="_blank"
+ >{{ scope.row.name }}</el-link>
+
+ </span>
+ <span v-else-if="scope.row.metaid > 0">
+ <el-link
+ style="color:#409eff"
+ title="鍏冩暟鎹煡璇�"
+ @click="setMetaDataQuery(scope.row)"
+ target="_blank"
+ >{{ scope.row.name }}</el-link>
+
+ </span>
<span v-else>{{ scope.row.name }}</span>
</template>
</el-table-column>
<el-table-column
- align="center"
- prop="dirName"
- :label="$t('dataManage.dataUpObj.catalogue')"
- width="300"
+ align="center"
+ prop="dirName"
+ :label="$t('dataManage.dataUpObj.catalogue')"
+ width="300"
/>
<el-table-column
- align="center"
- prop="depName"
- :label="$t('dataManage.dataUpObj.company')"
- width="200"
+ align="center"
+ prop="depName"
+ :label="$t('dataManage.dataUpObj.company')"
+ width="200"
/>
<el-table-column
- align="center"
- prop="verName"
- :label="$t('dataManage.dataUpObj.versionNo')"
+ align="center"
+ prop="verName"
+ :label="$t('dataManage.dataUpObj.versionNo')"
/>
<el-table-column
- align="center"
- prop="type"
- :label="$t('common.type')"
+ align="center"
+ prop="type"
+ :label="$t('common.type')"
/>
<el-table-column
- align="center"
- prop="sizes"
- :label="$t('common.size')"
- :formatter="changeSizeFile"
+ align="center"
+ prop="sizes"
+ :label="$t('common.size')"
+ :formatter="changeSizeFile"
/>
<el-table-column
- align="center"
- :label="$t('dataManage.dataUpObj.tableName')"
+ align="center"
+ :label="$t('dataManage.dataUpObj.tableName')"
>
<template slot-scope="scope">
<a
- class="scopeRowColor"
- @click="detail(scope.row)"
+ class="scopeRowColor"
+ @click="detail(scope.row)"
>{{ scope.row.tab }}</a>
</template>
</el-table-column>
<el-table-column
- align="center"
- prop="rows"
- :label="$t('common.lineNuber')"
+ align="center"
+ prop="rows"
+ :label="$t('common.lineNuber')"
/>
<el-table-column
- align="center"
- prop="desc"
- :label="$t('dataManage.dataUpObj.describe')"
+ align="center"
+ prop="desc"
+ :label="$t('dataManage.dataUpObj.describe')"
/>
<el-table-column
- align="center"
- prop="uname"
- :label="$t('dataManage.vmobj.createonuser')"
+ align="center"
+ prop="uname"
+ :label="$t('dataManage.vmobj.createonuser')"
/>
<el-table-column
- align="center"
- prop="createTime"
- :label="$t('dataManage.vmobj.createontime')"
- :formatter="changetimeFile"
- width="100"
+ align="center"
+ prop="createTime"
+ :label="$t('dataManage.vmobj.createontime')"
+ :formatter="changetimeFile"
+ width="100"
/>
</el-table>
- <div class="pagination_box" style="margin-top: 15px">
+ <div
+ class="pagination_box"
+ style="margin-top: 15px"
+ >
<el-pagination
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- :current-page="listData.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
- :page-size="listData.pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="count"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="listData.pageIndex"
+ :page-sizes="[10, 20, 50, 100]"
+ :page-size="listData.pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="count"
>
</el-pagination>
</div>
</div>
-
</el-tab-pane>
</el-tabs>
<!-- 璐ㄦ寮圭獥 -->
<el-dialog
- title="鏁版嵁璐ㄦ"
- :visible.sync="quayTestVisible"
- width="70%"
- :modal="false"
- :before-close="handleQuayTestCloseDown"
+ title="鏁版嵁璐ㄦ"
+ :visible.sync="quayTestVisible"
+ width="70%"
+ :modal="false"
+ :before-close="handleQuayTestCloseDown"
>
<div class="dialogDiv">
<el-form
- :inline="true"
- :model="quayTestForms "
- class="demo-form-inline"
+ :inline="true"
+ :model="quayTestForms "
+ class="demo-form-inline"
>
<el-form-item :label="$t('dataManage.dataUpObj.dataSpecialty')">
<el-input
- disabled
- v-model="quayTestForms.sjzy"
+ disabled
+ v-model="quayTestForms.sjzy"
></el-input>
</el-form-item>
<el-form-item :label="$t('dataManage.dataUpObj.storageDirectory')">
<el-input
- disabled
- style="width:400px"
- v-model="quayTestForms.names"
+ disabled
+ style="width:400px"
+ v-model="quayTestForms.names"
></el-input>
</el-form-item>
</el-form>
- <el-divider/>
+ <el-divider />
<div class="dialogContent">
<div
- class="ContBox"
- v-show="quayTestShow.checkAttrs"
+ class="ContBox"
+ v-show="quayTestShow.checkAttrs"
>
<el-checkbox
- checked
- disabled
+ checked
+ disabled
>灞炴�ф鏌ワ細(*dlg*.gdb+*鍦板舰鍥�**.dwg)
</el-checkbox>
</div>
<div
- class="ContBox"
- v-show="quayTestShow.checkMath"
+ class="ContBox"
+ v-show="quayTestShow.checkMath"
>
<el-checkbox
- checked
- disabled
+ checked
+ disabled
>鏁板鍩虹妫�鏌ワ細(.shp,.dlg)
</el-checkbox>
</div>
<div
- class="ContBox"
- v-show="quayTestShow.checkDecorate"
+ class="ContBox"
+ v-show="quayTestShow.checkDecorate"
>
<el-checkbox
- checked
- disabled
+ checked
+ disabled
>鍥鹃潰鏁撮グ妫�鏌ワ細(.dwg)
</el-checkbox>
</div>
<div
- class="ContBox"
- v-show="quayTestShow.checkXls"
+ class="ContBox"
+ v-show="quayTestShow.checkXls"
>
<el-checkbox
- checked
- disabled
+ checked
+ disabled
>琛ㄦ牸鏁版嵁妫�鏌ワ細(.xls/.xlsx)
</el-checkbox>
</div>
<div
- class="ContBox"
- v-show="quayTestShow.checkOrigin"
+ class="ContBox"
+ v-show="quayTestShow.checkOrigin"
>
<el-checkbox
- checked
- disabled
+ checked
+ disabled
>鍘熺偣妫�鏌ワ細(*鍓栭潰鍥�*.dwg)
</el-checkbox>
</div>
<div
- class="ContBox"
- v-show="quayTestShow.checkMeta"
+ class="ContBox"
+ v-show="quayTestShow.checkMeta"
>
<el-checkbox
- checked
- disabled
+ checked
+ disabled
>鍏冩暟鎹鏌ワ細(*鍏冩暟鎹�*.xls/.xlsx)
</el-checkbox>
</div>
<div
- class="ContBox"
- v-show="quayTestShow.checkTopology"
+ class="ContBox"
+ v-show="quayTestShow.checkTopology"
>
<el-form
- ref="quayForms"
- :model="quayTestForms"
- class="demo-form-inline"
+ ref="quayForms"
+ :model="quayTestForms"
+ class="demo-form-inline"
>
<el-form-item>
<el-checkbox
- checked
- disabled
+ checked
+ disabled
>鎷撴墤妫�鏌ワ細(*鍦板舰鍥�*.dwg)
</el-checkbox>
</el-form-item>
@@ -753,18 +787,18 @@
</el-form>
</div>
<div
- class="ContBox"
- v-show="quayTestShow.checkDom"
+ class="ContBox"
+ v-show="quayTestShow.checkDom"
>
<el-form
- ref="quayForms"
- :model="quayTestForms"
- class="demo-form-inline"
+ ref="quayForms"
+ :model="quayTestForms"
+ class="demo-form-inline"
>
<el-form-item>
<el-checkbox
- checked
- disabled
+ checked
+ disabled
>鏍呮牸妫�鏌ワ細(.tif/.img)
</el-checkbox>
</el-form-item>
@@ -787,18 +821,18 @@
</el-form>
</div>
<div
- class="ContBox"
- v-show="quayTestShow.checkDem"
+ class="ContBox"
+ v-show="quayTestShow.checkDem"
>
<el-form
- ref="quayForms"
- :model="quayTestForms"
- class="demo-form-inline"
+ ref="quayForms"
+ :model="quayTestForms"
+ class="demo-form-inline"
>
<el-form-item>
<el-checkbox
- checked
- disabled
+ checked
+ disabled
>楂樼▼妫�鏌ワ細(.tif/.img)
</el-checkbox>
</el-form-item>
@@ -821,18 +855,18 @@
</el-form>
</div>
<div
- class="ContBox"
- v-show="quayTestShow.checkLaz"
+ class="ContBox"
+ v-show="quayTestShow.checkLaz"
>
<el-form
- ref="quayForms"
- :model="quayTestForms"
- class="demo-form-inline"
+ ref="quayForms"
+ :model="quayTestForms"
+ class="demo-form-inline"
>
<el-form-item>
<el-checkbox
- checked
- disabled
+ checked
+ disabled
>鐐逛簯妫�鏌ワ細(.laz + *婵�鍏夌偣浜�*.xls/.xlsx)
</el-checkbox>
</el-form-item>
@@ -847,18 +881,18 @@
</el-form>
</div>
<div
- class="ContBox"
- v-show="quayTestShow.checkOsgb"
+ class="ContBox"
+ v-show="quayTestShow.checkOsgb"
>
<el-form
- ref="quayForms"
- :model="quayTestForms"
- class="demo-form-inline"
+ ref="quayForms"
+ :model="quayTestForms"
+ class="demo-form-inline"
>
<el-form-item>
<el-checkbox
- checked
- disabled
+ checked
+ disabled
>OSGB妫�鏌ワ細(.osgb + *鍊炬枩鎽勫奖*.xls/.xlsx)
</el-checkbox>
</el-form-item>
@@ -875,106 +909,106 @@
</div>
</div>
<span
- slot="footer"
- class="dialog-footer"
+ slot="footer"
+ class="dialog-footer"
>
<el-button
- class="elBotton"
- size="small"
- @click="quayTestVisible = false"
+ class="elBotton"
+ size="small"
+ @click="quayTestVisible = false"
>鍙� 娑�</el-button>
<el-button
- class="elBotton"
- size="small"
- @click="commonQuayTest"
+ class="elBotton"
+ size="small"
+ @click="commonQuayTest"
>纭� 瀹�</el-button>
</span>
</el-dialog>
<!-- 鏁翠綋鏂囦欢璐ㄦ寮圭獥 -->
<el-dialog
- title="鏁版嵁璐ㄦ"
- :visible.sync="testQuayVisible"
- :modal="false"
- :before-close="handleTestQuayCloseDown"
-
+ title="鏁版嵁璐ㄦ"
+ :visible.sync="testQuayVisible"
+ :modal="false"
+ :before-close="handleTestQuayCloseDown"
>
- <el-form :model="formCheckAll" label-position="top">
+ <el-form
+ :model="formCheckAll"
+ label-position="top"
+ >
<el-form-item label="椤圭洰鍚嶇О">
<el-input
- disabled
- v-model="formCheckAll.xmmc"
- style="width:85%"
+ disabled
+ v-model="formCheckAll.xmmc"
+ style="width:85%"
></el-input>
</el-form-item>
<el-form-item label="鎵�灞炰笓涓�">
-
<el-input
- disabled
- v-model="formCheckAll.sjzy"
- style="width:85%"
+ disabled
+ v-model="formCheckAll.sjzy"
+ style="width:85%"
></el-input>
</el-form-item>
<el-form-item
- v-show="formCheckAll.isDiZai"
- label="鎵�灞炰笓涓�"
+ v-show="formCheckAll.isDiZai"
+ label="鎵�灞炰笓涓�"
>
<el-select
- v-model="formCheckAll.diZaiType"
- placeholder="璇烽�夋嫨"
- style="width:85%"
+ v-model="formCheckAll.diZaiType"
+ placeholder="璇烽�夋嫨"
+ style="width:85%"
>
<el-option
- v-for="item in disOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
+ v-for="item in disOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
>
</el-option>
</el-select>
-
</el-form-item>
</el-form>
<span
- slot="footer"
- class="dialog-footer"
+ slot="footer"
+ class="dialog-footer"
>
<el-button
- class="elBotton"
- size="small"
- @click="testQuayVisible = false"
+ class="elBotton"
+ size="small"
+ @click="testQuayVisible = false"
>鍙� 娑�</el-button>
<el-button
- class="elBotton"
- size="small"
- @click="commonTestQuay"
+ class="elBotton"
+ size="small"
+ @click="commonTestQuay"
>纭� 瀹�</el-button>
</span>
</el-dialog>
<!-- ifream涓嬭浇鏂囦欢鍦板潃 -->
<iframe
- id="downFrame"
- src=""
- style="display: none; border: 0; padding: 0; height: 0; width: 0"
+ id="downFrame"
+ src=""
+ style="display: none; border: 0; padding: 0; height: 0; width: 0"
></iframe>
<!-- 鏁版嵁鍖归厤 -->
<el-dialog
- :title="$t('dataManage.datawarehousing')"
- :visible.sync="dialogWarehousing"
- width="70%"
+ :title="$t('dataManage.datawarehousing')"
+ :visible.sync="dialogWarehousing"
+ width="70%"
>
<div class="dialogBox">
<div class="transFarBox subpage_Div">
<ul>
<li
- @click="singleElection(item)"
- v-for="(item, i) in tableWareOne"
- :class="{ active: activeName == item.eventid }"
+ @click="singleElection(item)"
+ v-for="(item, i) in tableWareOne"
+ :class="{ active: activeName == item.eventid }"
>{{ item.tab }} ({{ item.type }})
</li>
</ul>
@@ -990,9 +1024,9 @@
<div class="transFarBox subpage_Div">
<ul>
<li
- @click="singleElection2(item)"
- v-for="(item, i) in tableWareTwo"
- :class="{ active: activeName2 == item.entity }"
+ @click="singleElection2(item)"
+ v-for="(item, i) in tableWareTwo"
+ :class="{ active: activeName2 == item.entity }"
>{{ item.tabDesc }} ( {{ item.ns }}.{{ item.tab }})
</li>
</ul>
@@ -1002,86 +1036,86 @@
<div style="padding:2%">
<el-link @click="setWareTableChangeLeft"><i class="el-icon-d-arrow-left"></i></el-link>
</div>
- <br/>
+ <br />
<div style="padding:2%">
<el-link><i
@click="setWareTableChangeRight"
class="el-icon-d-arrow-right"
- ></i></el-link>
+ ></i></el-link>
</div>
</div>
</div>
<div class="transFarBox subpage_Div">
<ul>
<li
- @click="singleElection3(i)"
- v-for="(item, i) in tableWareThree"
- :class="{ active: activeName3 ==( item.tab+i)}"
+ @click="singleElection3(i)"
+ v-for="(item, i) in tableWareThree"
+ :class="{ active: activeName3 ==( item.tab+i)}"
>{{ item.tab }} ( {{ item.tabDesc }} {{ item.ns }}.{{ item.tabs }} )
</li>
</ul>
</div>
</div>
<span
- slot="footer"
- class="dialog-footer"
+ slot="footer"
+ class="dialog-footer"
>
<el-button
- size="small"
- @click="autoMatchWare"
- type="primary"
+ size="small"
+ @click="autoMatchWare"
+ type="primary"
>鑷姩鍖归厤</el-button>
<el-button
- size="small"
- type="info"
- @click="setInsrtWareTableClose "
+ size="small"
+ type="info"
+ @click="setInsrtWareTableClose "
>鍙� 娑�</el-button>
<el-button
- size="small"
- type="primary"
- @click="setInsrtWareTable"
+ size="small"
+ type="primary"
+ @click="setInsrtWareTable"
>纭� 瀹�</el-button>
</span>
</el-dialog>
<el-dialog
- :title="$t('common.details')"
- :visible.sync="dialogVisible"
- width="70%"
+ :title="$t('common.details')"
+ :visible.sync="dialogVisible"
+ width="70%"
>
<div style="height: 500px; overflow: auto">
<el-table
- ref="filterTable"
- :data="dbTableData"
- height="90%"
- border
- style="width: 100%"
+ ref="filterTable"
+ :data="dbTableData"
+ height="90%"
+ border
+ style="width: 100%"
>
<el-table-column
- width="60"
- type="index"
- :label="$t('common.index')"
+ width="60"
+ type="index"
+ :label="$t('common.index')"
/>
<el-table-column
- v-for="(item, index) in attributeData"
- :key="index"
- :label="item.alias"
- :prop="item.field"
- show-overflow-tooltip
- align="center"
+ v-for="(item, index) in attributeData"
+ :key="index"
+ :label="item.alias"
+ :prop="item.field"
+ show-overflow-tooltip
+ align="center"
></el-table-column>
</el-table>
<div
- style="margin-top: 15px"
- class="pagination_box"
+ style="margin-top: 15px"
+ class="pagination_box"
>
<el-pagination
- @size-change="handleLoaderSizeChange"
- @current-change="handleLoaderCurrentChange"
- :current-page="listLoader.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
- :page-size="listLoader.pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="count1"
+ @size-change="handleLoaderSizeChange"
+ @current-change="handleLoaderCurrentChange"
+ :current-page="listLoader.pageIndex"
+ :page-sizes="[10, 20, 50, 100]"
+ :page-size="listLoader.pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="count1"
>
</el-pagination>
</div>
@@ -1089,10 +1123,10 @@
</el-dialog>
<el-dialog
- :close-on-click-modal="false"
- title="涓婁紶杩涘害"
- :visible.sync="jindudialogVisible"
- width="30%"
+ :close-on-click-modal="false"
+ title="涓婁紶杩涘害"
+ :visible.sync="jindudialogVisible"
+ width="30%"
>
<div>
<div>
@@ -1100,152 +1134,245 @@
</div>
<div>
<el-progress
- :percentage="jindutiao"
- :format="format"
+ :percentage="jindutiao"
+ :format="format"
></el-progress>
</div>
</div>
</el-dialog>
<el-dialog
- :title="$t('common.details')"
- :visible.sync="enclosureVisible"
- :show-close="false"
+ :title="$t('common.details')"
+ :visible.sync="enclosureVisible"
+ :show-close="false"
>
<span
- style="font-size:20px"
- class="scopeRowColor"
+ style="font-size:20px"
+ class="scopeRowColor"
>{{ enclosureTitle }}涓嶈兘涓婁紶闄勪欢鏄惁缁х画</span>
<span
- slot="footer"
- class="dialog-footer"
+ slot="footer"
+ class="dialog-footer"
>
<el-button @click="enclosureVisible = false">鍙� 娑�</el-button>
<el-button
- type="primary"
- @click="uploadAnFiles"
+ type="primary"
+ @click="uploadAnFiles"
>缁х画</el-button>
</span>
</el-dialog>
<el-dialog
- :title="fromQueryMeta.title"
- :visible.sync="queryMetaFlag"
- width="70%"
+ :title="fromQueryMeta.title"
+ :visible.sync="queryMetaFlag"
+ width="70%"
>
<div style="height: 500px; overflow: auto;width:100%; ">
- <el-form :inline="true" :model="fromQueryMeta" class="demo-form-inline">
+ <el-form
+ :inline="true"
+ :model="fromQueryMeta"
+ class="demo-form-inline"
+ >
<el-form-item>
- <el-input size="small" v-model="fromQueryMeta.name" :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')"
- suffix-icon="el-icon-edit"></el-input>
+ <el-input
+ size="small"
+ v-model="fromQueryMeta.name"
+ :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')"
+ suffix-icon="el-icon-edit"
+ ></el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" size="small" @click="setSearchMetaData()">鏌ヨ</el-button>
- <el-button type="info" size="small" @click="setRestMetaData()">閲嶇疆</el-button>
+ <el-button
+ type="primary"
+ size="small"
+ @click="setSearchMetaData()"
+ >鏌ヨ</el-button>
+ <el-button
+ type="info"
+ size="small"
+ @click="setRestMetaData()"
+ >閲嶇疆</el-button>
</el-form-item>
</el-form>
<el-table
- ref="filterTable"
- :data="metaDataTable"
- style="width: 100%"
- height="calc(100% - 130px)"
-
+ ref="filterTable"
+ :data="metaDataTable"
+ style="width: 100%"
+ height="calc(100% - 130px)"
>
<el-table-column
- align="center"
- type="index"
- :label="$t('common.index')"
- width="70px"
+ align="center"
+ type="index"
+ :label="$t('common.index')"
+ width="70px"
></el-table-column>
<el-table-column
- align="center"
- prop="name"
- :label="$t('common.name')"
-
- width="120"
+ align="center"
+ prop="name"
+ :label="$t('common.name')"
+ width="120"
>
-
</el-table-column>
<el-table-column
- align="center"
- prop="dirName"
- :label="$t('dataManage.dataUpObj.catalogue')"
- width="300"
+ align="center"
+ prop="dirName"
+ :label="$t('dataManage.dataUpObj.catalogue')"
+ width="300"
/>
<el-table-column
- align="center"
- prop="depName"
- :label="$t('dataManage.dataUpObj.company')"
- width="200"
+ align="center"
+ prop="depName"
+ :label="$t('dataManage.dataUpObj.company')"
+ width="200"
/>
<el-table-column
- align="center"
- prop="verName"
- :label="$t('dataManage.dataUpObj.versionNo')"
+ align="center"
+ prop="verName"
+ :label="$t('dataManage.dataUpObj.versionNo')"
/>
<el-table-column
- align="center"
- prop="type"
- :label="$t('common.type')"
+ align="center"
+ prop="type"
+ :label="$t('common.type')"
/>
<el-table-column
- align="center"
- prop="sizes"
- :label="$t('common.size')"
- :formatter="changeSizeFile"
+ align="center"
+ prop="sizes"
+ :label="$t('common.size')"
+ :formatter="changeSizeFile"
/>
<el-table-column
- align="center"
- :label="$t('dataManage.dataUpObj.tableName')"
+ align="center"
+ :label="$t('dataManage.dataUpObj.tableName')"
>
<template slot-scope="scope">
<a
- class="scopeRowColor"
- @click="detail(scope.row)"
+ class="scopeRowColor"
+ @click="detail(scope.row)"
>{{ scope.row.tab }}</a>
</template>
</el-table-column>
<el-table-column
- align="center"
- prop="rows"
- :label="$t('common.lineNuber')"
+ align="center"
+ prop="rows"
+ :label="$t('common.lineNuber')"
/>
<el-table-column
- align="center"
- prop="desc"
- :label="$t('dataManage.dataUpObj.describe')"
+ align="center"
+ prop="desc"
+ :label="$t('dataManage.dataUpObj.describe')"
/>
-
</el-table>
<div
- style="margin-top: 15px"
- class="pagination_box"
+ style="margin-top: 15px"
+ class="pagination_box"
>
<el-pagination
- @size-change="handleMetaSizeChange"
- @current-change="handMetaCurrentChange"
- :current-page="listMetaData.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
- :page-size="listMetaData.pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="listMetaData.count"
+ @size-change="handleMetaSizeChange"
+ @current-change="handMetaCurrentChange"
+ :current-page="listMetaData.pageIndex"
+ :page-sizes="[10, 20, 50, 100]"
+ :page-size="listMetaData.pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="listMetaData.count"
>
</el-pagination>
</div>
</div>
</el-dialog>
+ <el-dialog
+ :title="fromQueryMeta.title"
+ :visible.sync="queryMetaFlag1"
+ width="70%"
+ >
+ <div style="height: 65vh; width: 100%">
+
+ <el-table
+ ref="filterTable"
+ :data="metaDataTable1"
+ style="width: 100%"
+ height="100%"
+ >
+ <el-table-column
+ align="center"
+ type="index"
+ :label="$t('common.index')"
+ width="70px"
+ ></el-table-column>
+ <el-table-column
+ align="center"
+ prop="name"
+ :label="$t('common.name')"
+ width="120"
+ >
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="dirName"
+ :label="$t('dataManage.dataUpObj.catalogue')"
+ width="300"
+ />
+ <el-table-column
+ align="center"
+ prop="depName"
+ :label="$t('dataManage.dataUpObj.company')"
+ width="200"
+ />
+ <el-table-column
+ align="center"
+ prop="verName"
+ :label="$t('dataManage.dataUpObj.versionNo')"
+ />
+ <el-table-column
+ align="center"
+ prop="type"
+ :label="$t('common.type')"
+ />
+ <el-table-column
+ align="center"
+ prop="sizes"
+ :label="$t('common.size')"
+ :formatter="changeSizeFile"
+ />
+ <el-table-column
+ align="center"
+ :label="$t('dataManage.dataUpObj.tableName')"
+ >
+ <template slot-scope="scope">
+ <a
+ class="scopeRowColor"
+ @click="detail(scope.row)"
+ >{{
+ scope.row.tab
+ }}</a>
+ </template>
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="rows"
+ :label="$t('common.lineNuber')"
+ />
+ <el-table-column
+ align="center"
+ prop="desc"
+ :label="$t('dataManage.dataUpObj.describe')"
+ />
+ </el-table>
+
+ </div>
+ </el-dialog>
<input
- name="file1"
- :accept="'.zip'"
- type="file"
- id="editimageFile"
- multiple="multiple"
- style="display: none"
- @change="uploadAnFilesChange"
+ name="file1"
+ :accept="'.zip'"
+ type="file"
+ id="editimageFile"
+ multiple="multiple"
+ style="display: none"
+ @change="uploadAnFilesChange"
/>
</div>
</template>
@@ -1253,7 +1380,7 @@
<script>
import $ from "jquery";
import MyBread from "../../components/MyBread.vue";
-import {getToken} from "@/utils/auth";
+import { getToken } from "@/utils/auth";
import {
dataUpload_deleteMetas,
dataUpload_insertFiles,
@@ -1271,6 +1398,7 @@
dataUploadSelectFiles,
dataUploadSelectPath,
dataUploadSelectVerByDirid,
+ dataUpload_selectMetaById,
selectdirTab,
} from "../../api/api";
@@ -1358,7 +1486,7 @@
name: null,
},
count: 0,
- formWarehousing: {name: ""},
+ formWarehousing: { name: "" },
multipleSelection: [],
tableData: [],
entryOption: [],
@@ -1473,6 +1601,8 @@
name: "",
},
metaDataTable: [],
+ queryMetaFlag1: false,
+ metaDataTable1: [],
};
},
@@ -1522,6 +1652,22 @@
this.listMetaData.pageIndex = val;
this.startQueryMetaData();
},
+
+ //鍏冩暟鎹煡璇�
+ async setMetaDataQuery(row) {
+ this.fromQueryMeta.title = row.name;
+ this.listMetaData = {
+ id: row.metaid,
+ };
+ const data = await dataUpload_selectMetaById(this.listMetaData);
+ if (data.code != 200) {
+ return;
+ }
+ this.queryMetaFlag1 = true;
+ this.metaDataTable1 = [data.result];
+ },
+
+
//鍏冩暟鎹煡璇�
setQueryMetaData(row) {
this.fromQueryMeta.title = row.name;
@@ -1586,47 +1732,47 @@
that.$set(this, "jindutiao", 0);
this.loading = true;
$.ajax(
- BASE_URL +
- "/dataUpload/uploadXlsAnnex?token=" +
- getToken() +
- "&path=" +
- this.formInline.path,
- {
- type: "post",
- data: formData,
- async: true,
- cache: false,
- processData: false,
- contentType: false,
- success: (rs) => {
- this.loading = false;
- if (rs.code != 200) {
- return this.$message.error("闄勪欢涓婁紶澶辫触");
- }
+ BASE_URL +
+ "/dataUpload/uploadXlsAnnex?token=" +
+ getToken() +
+ "&path=" +
+ this.formInline.path,
+ {
+ type: "post",
+ data: formData,
+ async: true,
+ cache: false,
+ processData: false,
+ contentType: false,
+ success: (rs) => {
+ this.loading = false;
+ if (rs.code != 200) {
+ return this.$message.error("闄勪欢涓婁紶澶辫触");
+ }
- this.$set(this, "jindutiao", 100);
- this.$message({
- message: "闄勪欢涓婁紶鎴愬姛",
- type: "success",
- });
- },
- error: (rs) => {
- this.loading = false;
- this.$message.error("闄勪欢涓婁紶澶辫触");
- },
- xhr: function () {
- var myXhr = $.ajaxSettings.xhr();
- if (myXhr.upload) {
- //妫�鏌pload灞炴�ф槸鍚﹀瓨鍦�
- myXhr.upload.addEventListener(
- "progress",
- that.progressHandlingFunction,
- false
- ); //缁戝畾progress浜嬩欢鐨勫洖璋冨嚱鏁�
- }
- return myXhr; //xhr瀵硅薄杩斿洖缁檍Query浣跨敤
- },
- }
+ this.$set(this, "jindutiao", 100);
+ this.$message({
+ message: "闄勪欢涓婁紶鎴愬姛",
+ type: "success",
+ });
+ },
+ error: (rs) => {
+ this.loading = false;
+ this.$message.error("闄勪欢涓婁紶澶辫触");
+ },
+ xhr: function () {
+ var myXhr = $.ajaxSettings.xhr();
+ if (myXhr.upload) {
+ //妫�鏌pload灞炴�ф槸鍚﹀瓨鍦�
+ myXhr.upload.addEventListener(
+ "progress",
+ that.progressHandlingFunction,
+ false
+ ); //缁戝畾progress浜嬩欢鐨勫洖璋冨嚱鏁�
+ }
+ return myXhr; //xhr瀵硅薄杩斿洖缁檍Query浣跨敤
+ },
+ }
);
},
//閫夋嫨涓婁紶闄勪欢鐨勬枃浠�
@@ -1797,7 +1943,7 @@
this.loading = true;
const res = await dataUpload_insertFiles(
- JSON.stringify(this.insertWareList)
+ JSON.stringify(this.insertWareList)
);
this.loading = false;
if (res.code != 200) {
@@ -1830,7 +1976,7 @@
}
std.forEach((item) => {
this.tableWareOne = this.tableWareOne.filter(
- (items) => items.tab !== item
+ (items) => items.tab !== item
);
});
},
@@ -1865,7 +2011,7 @@
this.wareSelectOne.entity = this.wareSelectTwo.entity;
this.wareSelectOne.tabDesc = this.wareSelectTwo.tabDesc;
this.wareSelectOne.tabs =
- this.wareSelectTwo.ns + "." + this.wareSelectTwo.tab;
+ this.wareSelectTwo.ns + "." + this.wareSelectTwo.tab;
if (this.tableWareThree.indexOf(this.wareSelectOne) != -1) {
} else {
this.tableWareThree.push(this.wareSelectOne);
@@ -1924,7 +2070,7 @@
}
if (std.length != 0) {
return this.$message.error(
- std.toString() + ",鏈川妫�鎴栬川妫�澶辫触,涓嶈兘鍏ュ簱"
+ std.toString() + ",鏈川妫�鎴栬川妫�澶辫触,涓嶈兘鍏ュ簱"
);
}
} else if (this.formInline.uploadType == "v2") {
@@ -1941,7 +2087,7 @@
}
if (std.length != 0) {
return this.$message.error(
- std.toString() + ",鏈川妫�鎴栬川妫�澶辫触,涓嶈兘鍏ュ簱"
+ std.toString() + ",鏈川妫�鎴栬川妫�澶辫触,涓嶈兘鍏ュ簱"
);
}
}
@@ -1977,11 +2123,11 @@
handerLogClick(res) {
for (var i in res.code) {
var url =
- BASE_URL +
- "/dataUpload/downloadResult?token=" +
- getToken() +
- "&id=" +
- res.code[i];
+ BASE_URL +
+ "/dataUpload/downloadResult?token=" +
+ getToken() +
+ "&id=" +
+ res.code[i];
$("#downFrame").attr("src", url).click();
}
},
@@ -1997,8 +2143,8 @@
//鏁翠綋鏂囦欢澶氭潯鏁版嵁璐ㄦ
async getStartTestQuayTaskStatus() {
if (
- this.multipleSelection == 0 ||
- this.taskStatus == this.multipleSelection.length
+ this.multipleSelection == 0 ||
+ this.taskStatus == this.multipleSelection.length
) {
this.loading = false;
return;
@@ -2038,8 +2184,8 @@
//鍗曟枃浠跺鏉℃暟鎹川妫�
async getStartTaskStatus() {
if (
- this.multipleSelection == 0 ||
- this.taskStatus == this.multipleSelection.length
+ this.multipleSelection == 0 ||
+ this.taskStatus == this.multipleSelection.length
) {
this.loading = false;
return;
@@ -2055,7 +2201,7 @@
this.quayTestForms.xmmc = bak[this.taskStatus];
this.quayTestForms.sjzy = this.formInline.specialtyId;
this.quayTestForms.zipPath =
- this.multipleSelection[this.taskStatus].path;
+ this.multipleSelection[this.taskStatus].path;
const data = await dataUpload_uploadChecks(this.quayTestForms);
if (data.code != 200) {
this.$message.error("鏁版嵁璐ㄦ鎻愪氦澶辫触");
@@ -2073,7 +2219,7 @@
async getselectTaskStatus(res) {
var std = 0;
for (var i = 0; i < res.length; i++) {
- const data = await dataUpload_selectTaskStatus({id: res[i]});
+ const data = await dataUpload_selectTaskStatus({ id: res[i] });
std += data.progress;
@@ -2083,8 +2229,8 @@
//璐ㄦ鎴愬姛
for (var i in this.tableData) {
if (
- this.tableData[i].path ==
- this.multipleSelection[this.taskStatus].path
+ this.tableData[i].path ==
+ this.multipleSelection[this.taskStatus].path
) {
this.tableData[i].status = "璐ㄦ鎴愬姛";
}
@@ -2099,8 +2245,8 @@
//浠诲姟澶辫触
for (var i in this.tableData) {
if (
- this.tableData[i].path ==
- this.multipleSelection[this.taskStatus].path
+ this.tableData[i].path ==
+ this.multipleSelection[this.taskStatus].path
) {
this.tableData[i].status = "璐ㄦ澶辫触";
}
@@ -2122,7 +2268,7 @@
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].path == this.multipleSelection[this.taskStatus].path
) {
this.tableData[i].status = parseInt(this.progress * 100) + "%";
}
@@ -2131,7 +2277,7 @@
async sendTaskStatus(res) {
var std = 0;
for (var i = 0; i < res.length; i++) {
- const data = await dataUpload_selectTaskStatus({id: res[i]});
+ const data = await dataUpload_selectTaskStatus({ id: res[i] });
std += data.progress;
if (data.status == 5) {
@@ -2292,15 +2438,15 @@
}
for (var i = 0, c = fs1.files.length; i < c; i++) {
formData.append(fs1.files[i].name, fs1.files[i]);
- this.fileType.push({name: fs1.files[i].name, type: "selectData"});
+ this.fileType.push({ name: fs1.files[i].name, type: "selectData" });
}
if (fs2 != null) {
for (var i = 0, c = fs2.files.length; i < c; i++) {
formData.append(fs2.files[i].name, fs2.files[i]);
if (this.formInline.uploadType == "v1") {
- this.fileType.push({name: fs2.files[i].name, type: "metaData"});
+ this.fileType.push({ name: fs2.files[i].name, type: "metaData" });
} else if (this.formInline.uploadType == "v2") {
- this.fileType.push({name: fs2.files[i].name, type: "wbsData"});
+ this.fileType.push({ name: fs2.files[i].name, type: "wbsData" });
}
}
}
@@ -2316,49 +2462,49 @@
that.$set(this, "jindutiao", 0);
this.loading = true;
$.ajax(
- BASE_URL +
- "/dataUpload/uploadFiles?token=" +
- token +
- "&path=" +
- this.formInline.path,
- {
- type: "post",
- data: formData,
- async: true,
- cache: false,
- processData: false,
- contentType: false,
- success: (rs) => {
- this.loading = false;
- if (rs.code != 200) {
- return this.$message.error("鏁版嵁涓婁紶澶辫触");
- }
- this.getFileLength();
- this.$set(this, "jindutiao", 100);
- this.$message({
- message: "涓婁紶鎴愬姛",
- type: "success",
- });
- this.clearFileSelect();
- },
- error: (rs) => {
- this.loading = false;
- this.$message.error("鏁版嵁涓婁紶澶辫触");
- },
- xhr: function () {
- var myXhr = $.ajaxSettings.xhr();
+ BASE_URL +
+ "/dataUpload/uploadFiles?token=" +
+ token +
+ "&path=" +
+ this.formInline.path,
+ {
+ type: "post",
+ data: formData,
+ async: true,
+ cache: false,
+ processData: false,
+ contentType: false,
+ success: (rs) => {
+ this.loading = false;
+ if (rs.code != 200) {
+ return this.$message.error("鏁版嵁涓婁紶澶辫触");
+ }
+ this.getFileLength();
+ this.$set(this, "jindutiao", 100);
+ this.$message({
+ message: "涓婁紶鎴愬姛",
+ type: "success",
+ });
+ this.clearFileSelect();
+ },
+ error: (rs) => {
+ this.loading = false;
+ this.$message.error("鏁版嵁涓婁紶澶辫触");
+ },
+ xhr: function () {
+ var myXhr = $.ajaxSettings.xhr();
- if (myXhr.upload) {
- //妫�鏌pload灞炴�ф槸鍚﹀瓨鍦�
- myXhr.upload.addEventListener(
- "progress",
- that.progressHandlingFunction,
- false
- ); //缁戝畾progress浜嬩欢鐨勫洖璋冨嚱鏁�
- }
- return myXhr; //xhr瀵硅薄杩斿洖缁檍Query浣跨敤
- },
- }
+ if (myXhr.upload) {
+ //妫�鏌pload灞炴�ф槸鍚﹀瓨鍦�
+ myXhr.upload.addEventListener(
+ "progress",
+ that.progressHandlingFunction,
+ false
+ ); //缁戝畾progress浜嬩欢鐨勫洖璋冨嚱鏁�
+ }
+ return myXhr; //xhr瀵硅薄杩斿洖缁檍Query浣跨敤
+ },
+ }
);
},
progressHandlingFunction(event) {
@@ -2436,11 +2582,11 @@
//鏁版嵁璐ㄦ寮圭獥鍏抽棴--椤圭洰鏁翠綋
handleTestQuayCloseDown() {
this.$confirm("纭鍏抽棴锛�")
- .then((_) => {
- this.closeTestQuayCloseDialog();
- })
- .catch((_) => {
- });
+ .then((_) => {
+ this.closeTestQuayCloseDialog();
+ })
+ .catch((_) => {
+ });
},
closeTestQuayCloseDialog() {
this.testQuayVisible = false;
@@ -2448,11 +2594,11 @@
//鏁版嵁璐ㄦ寮圭獥鍏抽棴--鍗曟枃浠�
handleQuayTestCloseDown() {
this.$confirm("纭鍏抽棴锛�")
- .then((_) => {
- this.closeQuayTestCloseDialog();
- })
- .catch((_) => {
- });
+ .then((_) => {
+ this.closeQuayTestCloseDialog();
+ })
+ .catch((_) => {
+ });
},
closeQuayTestCloseDialog() {
this.quayTestVisible = false;
@@ -2517,7 +2663,7 @@
std.push(this.multipleDelete[i].id);
}
- const res = await dataUpload_deleteMetas({ids: std.toString()});
+ const res = await dataUpload_deleteMetas({ ids: std.toString() });
this.loading = false;
if (res.code != 200) {
this.$message.error("鍒犻櫎澶辫触");
@@ -2558,17 +2704,17 @@
var mm = time.getMinutes();
var s = time.getSeconds();
return (
- y +
- "-" +
- this.add0(m) +
- "-" +
- this.add0(d) +
- " " +
- h +
- ":" +
- mm +
- ":" +
- s
+ y +
+ "-" +
+ this.add0(m) +
+ "-" +
+ this.add0(d) +
+ " " +
+ h +
+ ":" +
+ mm +
+ ":" +
+ s
);
},
//鏍煎紡鍖栨椂闂�
@@ -2741,20 +2887,20 @@
lazDensity: "1",
imgResolution: "0.2",
}),
- (this.quayTestShow = {
- checkOsgb: false,
- checkXls: false,
- checkLaz: false,
- checkDem: false,
- checkAttrs: false,
- checkTopology: false,
- checkDecorate: false,
- checkOrigin: false,
- checkDom: false,
- checkMath: false,
- checkMeta: false,
- checkMain: false,
- });
+ (this.quayTestShow = {
+ checkOsgb: false,
+ checkXls: false,
+ checkLaz: false,
+ checkDem: false,
+ checkAttrs: false,
+ checkTopology: false,
+ checkDecorate: false,
+ checkOrigin: false,
+ checkDom: false,
+ checkMath: false,
+ checkMeta: false,
+ checkMain: false,
+ });
},
//鐩綍鍒囨崲
catalogChange(data, node, nodeData) {
diff --git a/src/views/datamanage/metadataManage.vue b/src/views/datamanage/metadataManage.vue
index 58a50cc..a60b31f 100644
--- a/src/views/datamanage/metadataManage.vue
+++ b/src/views/datamanage/metadataManage.vue
@@ -1,32 +1,37 @@
<template>
<div class="authorityManagement_box">
- <My-bread
- :list="[
+ <My-bread :list="[
`${$t('dataManage.dataManage')}`,
`${$t('dataManage.metadataManage')}`,
- ]"
- ></My-bread>
- <el-divider/>
- <div class="inquire subpage_Div" ref="container">
- <el-form ref="queryForm" :model="queryForm" :inline="true">
+ ]"></My-bread>
+ <el-divider />
+ <div
+ class="inquire subpage_Div"
+ ref="container"
+ >
+ <el-form
+ ref="queryForm"
+ :model="queryForm"
+ :inline="true"
+ >
<div class="flex_box">
<div style="margin-right: auto">
<el-form-item size="small">
<el-select
- :popper-append-to-body="false"
- v-model="queryForm.depName"
+ :popper-append-to-body="false"
+ v-model="queryForm.depName"
>
<el-option
- :value="queryForm.depid"
- :label="queryForm.depName"
- style="height: auto"
+ :value="queryForm.depid"
+ :label="queryForm.depName"
+ style="height: auto"
>
<el-tree
- ref="tree"
- :data="companyOption1"
- node-key="id"
- :props="cascader"
- @node-click="handleChange1"
+ ref="tree"
+ :data="companyOption1"
+ node-key="id"
+ :props="cascader"
+ @node-click="handleChange1"
/>
</el-option>
</el-select>
@@ -46,20 +51,20 @@
</el-form-item>
<el-form-item size="small">
<el-select
- :popper-append-to-body="false"
- v-model="queryForm.dirName"
+ :popper-append-to-body="false"
+ v-model="queryForm.dirName"
>
<el-option
- :value="queryForm.dirid"
- :label="queryForm.dirName"
- style="height: auto"
+ :value="queryForm.dirid"
+ :label="queryForm.dirName"
+ style="height: auto"
>
<el-tree
- ref="tree"
- :data="companyOption"
- node-key="id"
- :props="cascader"
- @node-click="handleChange"
+ ref="tree"
+ :data="companyOption"
+ node-key="id"
+ :props="cascader"
+ @node-click="handleChange"
/>
</el-option>
</el-select>
@@ -79,32 +84,40 @@
</el-form-item>
<el-form-item size="small">
<el-select
- :popper-append-to-body="false"
- v-model="queryForm.verid"
- placeholder="璇烽�夋嫨"
- @change="verHandleChange($event)"
+ :popper-append-to-body="false"
+ v-model="queryForm.verid"
+ placeholder="璇烽�夋嫨"
+ @change="verHandleChange($event)"
>
<el-option
- v-for="item in verOptions"
- :key="item.id"
- :label="item.name"
- :value="item.id"
+ v-for="item in verOptions"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
>
</el-option>
</el-select>
</el-form-item>
- <el-form-item prop="name" size="small">
-<!-- suffix-icon="el-icon-edit" :placeholder="$t('common.pleaseInput')"-->
+ <el-form-item
+ prop="name"
+ size="small"
+ >
+ <!-- suffix-icon="el-icon-edit" :placeholder="$t('common.pleaseInput')"-->
<el-input
- v-model="queryForm.name"
- :placeholder="$t('shuJuGuanLi.lable2')"
- style="width: 200px"
- ><i slot="suffix" class="el-icon-search" @click="queryInfo()" style="padding-right: 8px"></i></el-input>
+ v-model="queryForm.name"
+ :placeholder="$t('shuJuGuanLi.lable2')"
+ style="width: 200px"
+ ><i
+ slot="suffix"
+ class="el-icon-search"
+ @click="queryInfo()"
+ style="padding-right: 8px"
+ ></i></el-input>
</el-form-item>
</div>
<div>
-<!-- <el-form-item>
+ <!-- <el-form-item>
<el-button
@click="queryInfo()"
icon="el-icon-search"
@@ -116,34 +129,31 @@
</el-form-item>-->
<el-form-item v-if="btnStatus.delete">
<el-button
- type="danger"
- size="small"
- @click="deleteMetaInfo"
- icon="el-icon-delete"
+ type="danger"
+ size="small"
+ @click="deleteMetaInfo"
+ icon="el-icon-delete"
>{{ $t("common.delete") }}
- </el-button
- >
+ </el-button>
</el-form-item>
<el-form-item v-if="btnStatus.download">
<el-button
- @click="downFormData"
- icon="el-icon-download"
- type="success"
- size="small"
+ @click="downFormData"
+ icon="el-icon-download"
+ type="success"
+ size="small"
>{{ $t("common.download") }}
- </el-button
- >
+ </el-button>
</el-form-item>
<el-form-item>
<el-button
- @click="resetInfo('queryForm')"
- icon="el-icon-refresh"
- type="info"
- size="small"
+ @click="resetInfo('queryForm')"
+ icon="el-icon-refresh"
+ type="info"
+ size="small"
>{{ $t("common.reset") }}
- </el-button
- >
+ </el-button>
</el-form-item>
</div>
@@ -194,57 +204,76 @@
</el-form>
</div>
<div class="dividing-line"></div>
- <div class="table_box subpage_Div" :style="styleVar">
+ <div
+ class="table_box subpage_Div"
+ :style="styleVar"
+ >
<el-table
- :data="tableData"
- style="width: 100%"
- @selection-change="handleSelectionChange"
- height="calc(100% - 57px)"
+ :data="tableData"
+ style="width: 100%"
+ @selection-change="handleSelectionChange"
+ height="calc(100% - 57px)"
>
- <el-table-column type="selection" width="55"/>
<el-table-column
- :label="$t('dataManage.dictionaryManageObj.number')"
- type="index"
- width="50"
+ type="selection"
+ width="55"
+ />
+ <el-table-column
+ :label="$t('dataManage.dictionaryManageObj.number')"
+ type="index"
+ width="50"
>
</el-table-column>
<el-table-column :label="$t('dataManage.vmobj.name')">
<template slot-scope="scope">
<span v-if="scope.row.ismeta > 0">
<el-link
- style="color: #409eff"
- title="婧愭暟鎹煡璇�"
- @click="setQueryMetaData(scope.row)"
- target="_blank"
- >{{ scope.row.name }}</el-link
- >
+ style="color: #409eff"
+ title="婧愭暟鎹煡璇�"
+ @click="setQueryMetaData(scope.row)"
+ target="_blank"
+ >{{ scope.row.name }}</el-link>
</span>
+ <span v-else-if="scope.row.metaid > 0"> <el-link
+ style="color: #409eff"
+ title="鍏冩暟鎹煡璇�"
+ @click="setMetaDataQuery(scope.row)"
+ target="_blank"
+ >{{ scope.row.name }}</el-link></span>
<span v-else>{{ scope.row.name }}</span>
</template>
</el-table-column>
- <el-table-column prop="type" :label="$t('dataManage.vmobj.format')"/>
<el-table-column
- prop="sizes"
- :label="$t('dataManage.vmobj.size')"
- :formatter="stateFormatSizes"
+ prop="type"
+ :label="$t('dataManage.vmobj.format')"
/>
<el-table-column
- prop="depName"
- :label="$t('dataManage.vmobj.depName')"
+ prop="sizes"
+ :label="$t('dataManage.vmobj.size')"
+ :formatter="stateFormatSizes"
/>
<el-table-column
- prop="dirName"
- :label="$t('dataManage.vmobj.dirName')"
- width="200"
+ prop="depName"
+ :label="$t('dataManage.vmobj.depName')"
/>
<el-table-column
- prop="verName"
- :label="$t('dataManage.vmobj.versionNumber')"
+ prop="dirName"
+ :label="$t('dataManage.vmobj.dirName')"
+ width="200"
+ />
+ <el-table-column
+ prop="verName"
+ :label="$t('dataManage.vmobj.versionNumber')"
/>
<el-table-column :label="$t('dataManage.dataUpObj.tableName')">
<template slot-scope="scope">
- <a @click="detail(scope.row)">{{ scope.row.tab }}</a>
+ <!-- <span ></span> -->
+ <el-link></el-link>
+ <el-link
+ :underline="false"
+ @click="detail(scope.row)"
+ >{{ scope.row.tab }}</el-link>
</template>
</el-table-column>
@@ -253,62 +282,81 @@
:label="$t('dataManage.vmobj.tab')"
:formatter="formatData"
/> -->
- <el-table-column prop="rows" :label="$t('dataManage.vmobj.row')"/>
<el-table-column
- prop="uname"
- :label="$t('dataManage.vmobj.createonuser')"
+ prop="rows"
+ :label="$t('dataManage.vmobj.row')"
/>
<el-table-column
- prop="createTime"
- :label="$t('dataManage.vmobj.createontime')"
- :formatter="formatData"
+ prop="uname"
+ :label="$t('dataManage.vmobj.createonuser')"
/>
- <el-table-column min-width="180" :label="$t('common.operate')">
+ <el-table-column
+ prop="createTime"
+ :label="$t('dataManage.vmobj.createontime')"
+ :formatter="formatData"
+ />
+ <el-table-column
+ min-width="180"
+ :label="$t('common.operate')"
+ >
<template slot-scope="scope">
<el-button
- @click="showDetail(scope.row)"
- type="primary"
- plain
- size="small"
+ @click="showDetail(scope.row)"
+ type="primary"
+ plain
+ size="small"
>{{ $t("common.details") }}
- </el-button
- >
+ </el-button>
<el-button
- type="warning"
- plain
- size="small"
- v-if="btnStatus.update"
- @click="editInfo(scope.row)"
- style="margin-left: 10px"
+ type="warning"
+ plain
+ size="small"
+ v-if="btnStatus.update"
+ @click="editInfo(scope.row)"
+ style="margin-left: 10px"
>{{ $t("common.edit") }}
- </el-button
- >
+ </el-button>
</template>
</el-table-column>
</el-table>
- <div class="pagination_box" style="margin-top: 15px">
+ <div
+ class="pagination_box"
+ style="margin-top: 15px"
+ >
<el-pagination
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- :current-page="listData.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
- :page-size="listData.pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="count"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="listData.pageIndex"
+ :page-sizes="[10, 20, 50, 100]"
+ :page-size="listData.pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="count"
>
</el-pagination>
</div>
</div>
- <div class="infoBox_box" v-show="showinfoBox">
+ <div
+ class="infoBox_box"
+ v-show="showinfoBox"
+ >
<div class="infoBox box_div">
- <div slot="header" class="clearfix">
+ <div
+ slot="header"
+ class="clearfix"
+ >
<span>{{ $t("common.details") }}</span>
- <div style="float: right; cursor: pointer" @click="closeDetial">
+ <div
+ style="float: right; cursor: pointer"
+ @click="closeDetial"
+ >
<i class="el-icon-close"></i>
</div>
</div>
<el-divider></el-divider>
- <div class="contentBox" style="padding: 1%">
+ <div
+ class="contentBox"
+ style="padding: 1%"
+ >
<p>{{ $t("dataManage.vmobj.name") }}锛歿{ itemdetail.name }}</p>
<el-divider></el-divider>
<p>{{ $t("dataManage.vmobj.format") }}锛歿{ itemdetail.type }}</p>
@@ -353,55 +401,67 @@
</div>
<el-dialog
- width="80vh"
- top="5vh"
- :title="
+ width="80vh"
+ top="5vh"
+ :title="
behavior == '鏂板鐢ㄦ埛'
? `${$t('common.append')}`
: `${$t('common.update')}`
"
- :visible.sync="dialogFormVisible"
- :before-close="handleClose"
+ :visible.sync="dialogFormVisible"
+ :before-close="handleClose"
>
- <el-form :model="editForm" ref="editForm">
+ <el-form
+ :model="editForm"
+ ref="editForm"
+ >
<el-form-item
- :label="$t('dataManage.vmobj.name')"
- :label-width="formLabelWidth"
+ :label="$t('dataManage.vmobj.name')"
+ :label-width="formLabelWidth"
>
- <el-input v-model="editForm.name" autocomplete="off"></el-input>
+ <el-input
+ v-model="editForm.name"
+ autocomplete="off"
+ ></el-input>
</el-form-item>
<el-form-item
- :label="$t('dataManage.vmobj.format')"
- :label-width="formLabelWidth"
+ :label="$t('dataManage.vmobj.format')"
+ :label-width="formLabelWidth"
>
- <el-input v-model="editForm.type" autocomplete="off"></el-input>
+ <el-input
+ v-model="editForm.type"
+ autocomplete="off"
+ ></el-input>
</el-form-item>
<el-form-item
- :label="$t('dataManage.vmobj.size')"
- :label-width="formLabelWidth"
+ :label="$t('dataManage.vmobj.size')"
+ :label-width="formLabelWidth"
>
- <el-input v-model="editForm.sizes" autocomplete="off"></el-input>
+ <el-input
+ v-model="editForm.sizes"
+ autocomplete="off"
+ ></el-input>
</el-form-item>
<el-form-item
- :label="$t('dataManage.vmobj.depName')"
- :label-width="formLabelWidth"
+ :label="$t('dataManage.vmobj.depName')"
+ :label-width="formLabelWidth"
>
<el-select
- style="width: 100%"
- :popper-append-to-body="false"
- v-model="editForm.depName"
+ style="width: 100%"
+ :popper-append-to-body="false"
+ v-model="editForm.depName"
>
<el-option
- :value="editForm.depid"
- :label="editForm.depName"
- style="height: auto"
+ :value="editForm.depid"
+ :label="editForm.depName"
+ style="height: auto"
>
<el-tree
- ref="tree"
- :data="companyOption1"
- node-key="id"
- :props="cascader"
- @node-click="handleChange2"
+ ref="tree"
+ :data="companyOption1"
+ node-key="id"
+ :props="cascader"
+ @node-click="handleChange2"
/>
</el-option>
</el-select>
@@ -413,25 +473,25 @@
></el-cascader> -->
</el-form-item>
<el-form-item
- :label="$t('dataManage.vmobj.dirName')"
- :label-width="formLabelWidth"
+ :label="$t('dataManage.vmobj.dirName')"
+ :label-width="formLabelWidth"
>
<el-select
- style="width: 100%"
- :popper-append-to-body="false"
- v-model="editForm.dirName"
+ style="width: 100%"
+ :popper-append-to-body="false"
+ v-model="editForm.dirName"
>
<el-option
- :value="editForm.dirid"
- :label="editForm.dirName"
- style="height: auto"
+ :value="editForm.dirid"
+ :label="editForm.dirName"
+ style="height: auto"
>
<el-tree
- ref="tree"
- :data="dirComPanyOption"
- node-key="id"
- :props="cascader"
- @node-click="handleChange3"
+ ref="tree"
+ :data="dirComPanyOption"
+ node-key="id"
+ :props="cascader"
+ @node-click="handleChange3"
/>
</el-option>
</el-select>
@@ -443,10 +503,13 @@
></el-cascader> -->
</el-form-item>
<el-form-item
- :label="$t('dataManage.vmobj.describe')"
- :label-width="formLabelWidth"
+ :label="$t('dataManage.vmobj.describe')"
+ :label-width="formLabelWidth"
>
- <el-input v-model="editForm.describe" autocomplete="off"></el-input>
+ <el-input
+ v-model="editForm.describe"
+ autocomplete="off"
+ ></el-input>
</el-form-item>
<!-- <el-form-item
:label="$t('dataManage.vmobj.gather')"
@@ -455,109 +518,136 @@
<el-input v-model="editForm.gather" autocomplete="off"></el-input>
</el-form-item> -->
</el-form>
- <div v-if="behavior == '淇敼淇℃伅'" slot="footer" class="dialog-footer">
- <el-button size="small" @click="cancelEdit()">{{
+ <div
+ v-if="behavior == '淇敼淇℃伅'"
+ slot="footer"
+ class="dialog-footer"
+ >
+ <el-button
+ size="small"
+ @click="cancelEdit()"
+ >{{
$t("common.reset")
}}
</el-button>
<el-button
- size="small"
- type="primary"
- @click="sendEdit('editForm')"
- v-loading.fullscreen.lock="fullscreenLoading"
+ size="small"
+ type="primary"
+ @click="sendEdit('editForm')"
+ v-loading.fullscreen.lock="fullscreenLoading"
>{{ $t("common.submit") }}
- </el-button
- >
+ </el-button>
</div>
- <div v-else slot="footer" class="dialog-footer">
- <el-button size="small" @click="cancelAdd('editForm')">{{
+ <div
+ v-else
+ slot="footer"
+ class="dialog-footer"
+ >
+ <el-button
+ size="small"
+ @click="cancelAdd('editForm')"
+ >{{
$t("common.reset")
}}
</el-button>
<el-button
- size="small"
- type="primary"
- @click="sendAdd('editForm')"
- v-loading.fullscreen.lock="fullscreenLoading"
+ size="small"
+ type="primary"
+ @click="sendAdd('editForm')"
+ v-loading.fullscreen.lock="fullscreenLoading"
>{{ $t("common.submit") }}
- </el-button
- >
+ </el-button>
</div>
</el-dialog>
<el-dialog
- :title="$t('common.details')"
- :visible.sync="dialogVisible"
- width="70%"
+ :title="$t('common.details')"
+ :visible.sync="dialogVisible"
+ width="70%"
>
<div style="height: 600px">
<el-table
- ref="filterTable"
- :data="dbTableData"
- height="90%"
- border
- style="width: 100%"
+ ref="filterTable"
+ :data="dbTableData"
+ height="90%"
+ border
+ style="width: 100%"
>
<el-table-column
- width="60"
- align="center"
- type="index"
- :label="$t('common.index')"
+ width="60"
+ align="center"
+ type="index"
+ :label="$t('common.index')"
/>
<el-table-column
- v-for="(item, index) in attributeData"
- :key="index"
- :label="item.alias"
- :prop="item.field"
- show-overflow-tooltip
- align="center"
+ v-for="(item, index) in attributeData"
+ :key="index"
+ :label="item.alias"
+ :prop="item.field"
+ show-overflow-tooltip
+ align="center"
></el-table-column>
</el-table>
- <div style="margin-top: 10px" class="pagination_box" >
+ <div
+ style="margin-top: 10px"
+ class="pagination_box"
+ >
<el-pagination
- @size-change="handleLoaderSizeChange"
- @current-change="handleLoaderCurrentChange"
- :current-page="listLoader.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
- :page-size="listLoader.pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="count1"
+ @size-change="handleLoaderSizeChange"
+ @current-change="handleLoaderCurrentChange"
+ :current-page="listLoader.pageIndex"
+ :page-sizes="[10, 20, 50, 100]"
+ :page-size="listLoader.pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="count1"
>
</el-pagination>
</div>
</div>
</el-dialog>
- <div class="downloadBox box_div subpage_Div" v-if="showCodeBox">
+ <div
+ class="downloadBox box_div subpage_Div"
+ v-if="showCodeBox"
+ >
<h4 style="padding: 20px">{{ $t("common.passworld") }}</h4>
<el-form
- :model="codeForm"
- :rules="rules"
- ref="codeForm"
- label-width="100px"
- class="codeForm"
+ :model="codeForm"
+ :rules="rules"
+ ref="codeForm"
+ label-width="100px"
+ class="codeForm"
>
- <el-form-item :label="$t('common.passworld')" prop="password">
+ <el-form-item
+ :label="$t('common.passworld')"
+ prop="password"
+ >
<el-input
- type="password"
- v-model="codeForm.password"
- show-password
+ type="password"
+ v-model="codeForm.password"
+ show-password
></el-input>
</el-form-item>
- <el-form-item :label="$t('common.SPassword')" prop="repassword">
+ <el-form-item
+ :label="$t('common.SPassword')"
+ prop="repassword"
+ >
<el-input
- type="password"
- v-model="codeForm.repassword"
- show-password
+ type="password"
+ v-model="codeForm.repassword"
+ show-password
></el-input>
</el-form-item>
<el-form-item>
<el-button
- class="primary"
- size="small"
- @click="download('codeForm')"
+ class="primary"
+ size="small"
+ @click="download('codeForm')"
>{{ $t("common.confirm") }}
- </el-button
- >
- <el-button type="info" size="small" @click="closeDown('codeForm')">{{
+ </el-button>
+ <el-button
+ type="info"
+ size="small"
+ @click="closeDown('codeForm')"
+ >{{
$t("common.cancel")
}}
</el-button>
@@ -565,120 +655,218 @@
</el-form>
</div>
<el-dialog
- :title="fromQueryMeta.title"
- :visible.sync="queryMetaFlag"
- width="70%"
+ :title="fromQueryMeta.title"
+ :visible.sync="queryMetaFlag"
+ width="70%"
>
<div style="height: 65vh; width: 100%">
- <el-form :inline="true" :model="fromQueryMeta" class="demo-form-inline">
+ <el-form
+ :inline="true"
+ :model="fromQueryMeta"
+ class="demo-form-inline"
+ >
<el-form-item>
- <el-input size="small" v-model="fromQueryMeta.name"></el-input>
+ <el-input
+ size="small"
+ v-model="fromQueryMeta.name"
+ ></el-input>
</el-form-item>
<el-form-item>
- <el-button type="primary" size="small" @click="setSearchMetaData()"
+ <el-button
+ type="primary"
+ size="small"
+ @click="setSearchMetaData()"
>鏌ヨ
- </el-button
- >
- <el-button type="info" size="small" @click="setRestMetaData()"
+ </el-button>
+ <el-button
+ type="info"
+ size="small"
+ @click="setRestMetaData()"
>閲嶇疆
- </el-button
- >
+ </el-button>
</el-form-item>
</el-form>
<el-table
- ref="filterTable"
- :data="metaDataTable"
- style="width: 100%"
- height="calc(100% - 100px)"
+ ref="filterTable"
+ :data="metaDataTable"
+ style="width: 100%"
+ height="calc(100% - 100px)"
>
<el-table-column
- align="center"
- type="index"
- :label="$t('common.index')"
- width="70px"
+ align="center"
+ type="index"
+ :label="$t('common.index')"
+ width="70px"
></el-table-column>
<el-table-column
- align="center"
- prop="name"
- :label="$t('common.name')"
- width="120"
+ align="center"
+ prop="name"
+ :label="$t('common.name')"
+ width="120"
>
</el-table-column>
<el-table-column
- align="center"
- prop="dirName"
- :label="$t('dataManage.dataUpObj.catalogue')"
- width="300"
+ align="center"
+ prop="dirName"
+ :label="$t('dataManage.dataUpObj.catalogue')"
+ width="300"
/>
<el-table-column
- align="center"
- prop="depName"
- :label="$t('dataManage.dataUpObj.company')"
- width="200"
+ align="center"
+ prop="depName"
+ :label="$t('dataManage.dataUpObj.company')"
+ width="200"
/>
<el-table-column
- align="center"
- prop="verName"
- :label="$t('dataManage.dataUpObj.versionNo')"
+ align="center"
+ prop="verName"
+ :label="$t('dataManage.dataUpObj.versionNo')"
/>
<el-table-column
- align="center"
- prop="type"
- :label="$t('common.type')"
+ align="center"
+ prop="type"
+ :label="$t('common.type')"
/>
<el-table-column
- align="center"
- prop="sizes"
- :label="$t('common.size')"
- :formatter="changeSizeFile"
+ align="center"
+ prop="sizes"
+ :label="$t('common.size')"
+ :formatter="changeSizeFile"
/>
<el-table-column
- align="center"
- :label="$t('dataManage.dataUpObj.tableName')"
+ align="center"
+ :label="$t('dataManage.dataUpObj.tableName')"
>
<template slot-scope="scope">
- <a class="scopeRowColor" @click="detail(scope.row)">{{
+ <a
+ class="scopeRowColor"
+ @click="detail(scope.row)"
+ >{{
scope.row.tab
}}</a>
</template>
</el-table-column>
<el-table-column
- align="center"
- prop="rows"
- :label="$t('common.lineNuber')"
+ align="center"
+ prop="rows"
+ :label="$t('common.lineNuber')"
/>
<el-table-column
- align="center"
- prop="desc"
- :label="$t('dataManage.dataUpObj.describe')"
+ align="center"
+ prop="desc"
+ :label="$t('dataManage.dataUpObj.describe')"
/>
</el-table>
- <div class="pagination_box" style="margin-top: 15px">
+ <div
+ class="pagination_box"
+ style="margin-top: 15px"
+ >
<el-pagination
- @size-change="handleMetaSizeChange"
- @current-change="handMetaCurrentChange"
- :current-page="listMetaData.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
- :page-size="listMetaData.pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="listMetaData.count"
+ @size-change="handleMetaSizeChange"
+ @current-change="handMetaCurrentChange"
+ :current-page="listMetaData.pageIndex"
+ :page-sizes="[10, 20, 50, 100]"
+ :page-size="listMetaData.pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="listMetaData.count"
>
</el-pagination>
</div>
</div>
</el-dialog>
+ <el-dialog
+ :title="fromQueryMeta.title"
+ :visible.sync="queryMetaFlag1"
+ width="70%"
+ >
+ <div style="height: 65vh; width: 100%">
+
+ <el-table
+ ref="filterTable"
+ :data="metaDataTable1"
+ style="width: 100%"
+ height="100%"
+ >
+ <el-table-column
+ align="center"
+ type="index"
+ :label="$t('common.index')"
+ width="70px"
+ ></el-table-column>
+ <el-table-column
+ align="center"
+ prop="name"
+ :label="$t('common.name')"
+ width="120"
+ >
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="dirName"
+ :label="$t('dataManage.dataUpObj.catalogue')"
+ width="300"
+ />
+ <el-table-column
+ align="center"
+ prop="depName"
+ :label="$t('dataManage.dataUpObj.company')"
+ width="200"
+ />
+ <el-table-column
+ align="center"
+ prop="verName"
+ :label="$t('dataManage.dataUpObj.versionNo')"
+ />
+ <el-table-column
+ align="center"
+ prop="type"
+ :label="$t('common.type')"
+ />
+ <el-table-column
+ align="center"
+ prop="sizes"
+ :label="$t('common.size')"
+ :formatter="changeSizeFile"
+ />
+ <el-table-column
+ align="center"
+ :label="$t('dataManage.dataUpObj.tableName')"
+ >
+ <template slot-scope="scope">
+ <a
+ class="scopeRowColor"
+ @click="detail(scope.row)"
+ >{{
+ scope.row.tab
+ }}</a>
+ </template>
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="rows"
+ :label="$t('common.lineNuber')"
+ />
+ <el-table-column
+ align="center"
+ prop="desc"
+ :label="$t('dataManage.dataUpObj.describe')"
+ />
+ </el-table>
+
+ </div>
+ </el-dialog>
<iframe
- id="downFrame"
- src=""
- style="display: none; border: 0; padding: 0; height: 0; width: 0"
+ id="downFrame"
+ src=""
+ style="display: none; border: 0; padding: 0; height: 0; width: 0"
></iframe>
</div>
</template>
<script>
import $ from "jquery";
-import {getToken} from "@/utils/auth";
+import { getToken } from "@/utils/auth";
import {
deleteMeta,
insertMeta,
@@ -693,13 +881,14 @@
selectdirTab,
sign_getPublicKey,
updateMeta,
+ meta_selectById
} from "../../api/api";
import MyBread from "../../components/MyBread.vue";
export default {
name: "metadataManage",
- components: {MyBread},
+ components: { MyBread },
data() {
var repasswordValidator = (rule, value, callback) => {
if (value === "") {
@@ -712,7 +901,7 @@
};
var passwordValidator = (rule, value, callback) => {
var passwordreg =
- /^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\W!@#$%^&*`~()\\-_+=,.?;<>]+$)(?![a-z0-9]+$)(?![a-z\W!@#$%^&*`~()\\-_+=,.?;<>]+$)(?![0-9\W!@#$%^&*`~()\\-_+=,.?;<>]+$)[a-zA-Z0-9\W!@#$%^&*`~()\\-_+=,.?;<>]{12,20}$/;
+ /^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\W!@#$%^&*`~()\\-_+=,.?;<>]+$)(?![a-z0-9]+$)(?![a-z\W!@#$%^&*`~()\\-_+=,.?;<>]+$)(?![0-9\W!@#$%^&*`~()\\-_+=,.?;<>]+$)[a-zA-Z0-9\W!@#$%^&*`~()\\-_+=,.?;<>]{12,20}$/;
if (!passwordreg.test(value)) {
callback(new Error("瀵嗙爜蹇呴』鐢辨暟瀛椼�佸瓧姣嶃�佺壒娈婂瓧绗︾粍鍚�,璇疯緭鍏�13-20浣�"));
} else {
@@ -753,12 +942,12 @@
},
rules: {
password: [
- {required: true, message: "璇疯緭鍏ュ瘑鐮�", trigger: "blur"},
- {validator: passwordValidator, trigger: "blur"},
+ { required: true, message: "璇疯緭鍏ュ瘑鐮�", trigger: "blur" },
+ { validator: passwordValidator, trigger: "blur" },
],
repassword: [
- {required: true, message: "璇疯緭鍏ョ‘璁ゅ瘑鐮�", trigger: "blur"},
- {validator: repasswordValidator, trigger: "blur"},
+ { required: true, message: "璇疯緭鍏ョ‘璁ゅ瘑鐮�", trigger: "blur" },
+ { validator: repasswordValidator, trigger: "blur" },
],
},
tableData: [],
@@ -815,6 +1004,8 @@
name: "",
},
metaDataTable: [],
+ queryMetaFlag1: false,
+ metaDataTable1: [],
};
},
created() {
@@ -866,6 +1057,26 @@
handMetaCurrentChange(val) {
this.listMetaData.pageIndex = val;
this.startQueryMetaData();
+ },
+ //鍏冩暟鎹煡璇�
+ async setMetaDataQuery(row) {
+
+ this.fromQueryMeta.title = row.name;
+ this.listMetaData = {
+ id: row.metaid,
+ // name: "",
+ // pageIndex: 1,
+ // pageSize: 10,
+ // count: 0,
+ };
+ const data = await meta_selectById(this.listMetaData);
+ if (data.code != 200) {
+ return;
+ }
+
+ this.queryMetaFlag1 = true;
+ this.metaDataTable1 = [data.result];
+ // this.listMetaData.count = data.count;
},
//婧愭暟鎹煡璇�
setQueryMetaData(row) {
@@ -994,7 +1205,7 @@
},
async getQueryVerList() {
- const data = await meta_selectVerByDirid({dirid: this.queryForm.dirid});
+ const data = await meta_selectVerByDirid({ dirid: this.queryForm.dirid });
if (data.code != 200) {
this.$message.error("鐗堟湰鍒楄〃鑾峰彇澶辫触");
return;
@@ -1066,17 +1277,17 @@
var mm = time.getMinutes();
var s = time.getSeconds();
return (
- y +
- "-" +
- this.add0(m) +
- "-" +
- this.add0(d) +
- " " +
- h +
- ":" +
- mm +
- ":" +
- s
+ y +
+ "-" +
+ this.add0(m) +
+ "-" +
+ this.add0(d) +
+ " " +
+ h +
+ ":" +
+ mm +
+ ":" +
+ s
);
},
//鏍煎紡鍖栨椂闂�
@@ -1116,8 +1327,8 @@
let currentPerms = this.$store.state.currentPerms;
let permsEntity = this.$store.state.permsEntity;
permsEntity
- .filter((item) => item.perms == currentPerms)
- .map((item) => (this.btnStatus[item.tag.substr(1)] = true));
+ .filter((item) => item.perms == currentPerms)
+ .map((item) => (this.btnStatus[item.tag.substr(1)] = true));
},
// ShowWindowFly(res) {
// console.log(res);
@@ -1201,26 +1412,26 @@
if (valid) {
this.fullscreenLoading = true;
insertMeta(this.editForm)
- .then((res) => {
- setTimeout(() => {
- this.fullscreenLoading = false;
- if (res.code == 200) {
- this.listData.pageSize = 10;
- this.listData.pageIndex = 1;
- this.getMetaData();
- this.$message({
- message: "娣诲姞鎴愬姛",
- type: "success",
- });
- this.editForm = {};
- this.dialogFormVisible = false;
- }
- }, 500);
- })
- .catch((res) => {
- alert("淇敼澶辫触锛岃閲嶈瘯锛�");
+ .then((res) => {
+ setTimeout(() => {
this.fullscreenLoading = false;
- });
+ if (res.code == 200) {
+ this.listData.pageSize = 10;
+ this.listData.pageIndex = 1;
+ this.getMetaData();
+ this.$message({
+ message: "娣诲姞鎴愬姛",
+ type: "success",
+ });
+ this.editForm = {};
+ this.dialogFormVisible = false;
+ }
+ }, 500);
+ })
+ .catch((res) => {
+ alert("淇敼澶辫触锛岃閲嶈瘯锛�");
+ this.fullscreenLoading = false;
+ });
} else {
console.log("error submit!!");
return false;
@@ -1238,30 +1449,30 @@
cancelButtonText: "鍙栨秷",
type: "warning",
})
- .then(() => {
- var std = [];
- for (var i in this.multipleSelection) {
- std.push(this.multipleSelection[i].id);
+ .then(() => {
+ var std = [];
+ for (var i in this.multipleSelection) {
+ std.push(this.multipleSelection[i].id);
+ }
+ deleteMeta({ ids: std.toString() }).then((res) => {
+ if (res.code == 200) {
+ this.$message({
+ type: "success",
+ message: "鍒犻櫎鎴愬姛!",
+ });
+ this.multipleSelection = [];
+ this.listData.pageSize = 10;
+ this.listData.pageIndex = 1;
+ this.getMetaData();
+ } else {
+ this.$message.error("鍒犻櫎澶辫触");
+ this.multipleSelection = [];
}
- deleteMeta({ids: std.toString()}).then((res) => {
- if (res.code == 200) {
- this.$message({
- type: "success",
- message: "鍒犻櫎鎴愬姛!",
- });
- this.multipleSelection = [];
- this.listData.pageSize = 10;
- this.listData.pageIndex = 1;
- this.getMetaData();
- } else {
- this.$message.error("鍒犻櫎澶辫触");
- this.multipleSelection = [];
- }
- });
- })
- .catch(() => {
- this.$message("宸插彇娑堝垹闄�");
});
+ })
+ .catch(() => {
+ this.$message("宸插彇娑堝垹闄�");
+ });
},
// 鏌ョ湅鐣岄潰
@@ -1290,12 +1501,12 @@
},
handleClose(done) {
this.$confirm("纭鍏抽棴锛�")
- .then((_) => {
- this.editForm = {};
- done();
- })
- .catch((_) => {
- });
+ .then((_) => {
+ this.editForm = {};
+ done();
+ })
+ .catch((_) => {
+ });
},
// 鎻愪氦淇敼
@@ -1305,29 +1516,29 @@
cancelButtonText: "鍙栨秷",
type: "warning",
})
- .then(() => {
- this.dialogFormVisible = false;
- updateMeta(this.editForm).then((res) => {
- setTimeout(() => {
- this.fullscreenLoading = false;
- if (res.code == 200) {
- this.listData.pageSize = 10;
- this.listData.pageIndex = 1;
- this.getMetaData();
- this.$message({
- message: "淇敼鎴愬姛",
- type: "success",
- });
- this.editForm = {};
- this.dialogFormVisible = false;
- }
- }, 500);
- });
- })
- .catch(() => {
- alert("淇敼澶辫触锛岃閲嶈瘯锛�");
- this.fullscreenLoading = false;
+ .then(() => {
+ this.dialogFormVisible = false;
+ updateMeta(this.editForm).then((res) => {
+ setTimeout(() => {
+ this.fullscreenLoading = false;
+ if (res.code == 200) {
+ this.listData.pageSize = 10;
+ this.listData.pageIndex = 1;
+ this.getMetaData();
+ this.$message({
+ message: "淇敼鎴愬姛",
+ type: "success",
+ });
+ this.editForm = {};
+ this.dialogFormVisible = false;
+ }
+ }, 500);
});
+ })
+ .catch(() => {
+ alert("淇敼澶辫触锛岃閲嶈瘯锛�");
+ this.fullscreenLoading = false;
+ });
},
cancelEdit() {
this.$nextTick(() => {
@@ -1362,13 +1573,13 @@
}
var token = getToken();
var url =
- BASE_URL +
- "/meta/downloadFile?token=" +
- token +
- "&guid=" +
- res.result +
- "&pwd=" +
- encodeURIComponent(encrypt.encrypt(this.codeForm.repassword));
+ BASE_URL +
+ "/meta/downloadFile?token=" +
+ token +
+ "&guid=" +
+ res.result +
+ "&pwd=" +
+ encodeURIComponent(encrypt.encrypt(this.codeForm.repassword));
$("#downFrame").attr("src", url).click();
this.closeDown();
diff --git a/src/views/datamanage/projectManage.vue b/src/views/datamanage/projectManage.vue
index bcbf91c..dccfd60 100644
--- a/src/views/datamanage/projectManage.vue
+++ b/src/views/datamanage/projectManage.vue
@@ -1,14 +1,30 @@
<template>
<div class="verSionBox">
- <My-bread
- :list="[
+ <My-bread :list="[
`${$t('dataManage.dataManage')}`,
`${$t('dataManage.projectManage')}`,
- ]"
- ></My-bread>
+ ]"></My-bread>
<el-divider />
<div class="verSionContent">
- <div class="verSion_leftTree subpage_Div" style="border: 1px solid #dcdfe6;">
+ <div
+ class="verSion_leftTree subpage_Div"
+ style="border: 1px solid #dcdfe6;"
+ >
+ <el-form
+ :inline="true"
+ class="demo-form-inline"
+ >
+ <el-form-item style="padding-bottom: 14px">
+ <el-button
+ v-if="btnStatus.insert"
+ icon="el-icon-plus"
+ @click="insertProject"
+ :disabled="count1 != 0 ? true : false"
+ type="success"
+ size="small"
+ >{{ $t("common.append") }}</el-button>
+ </el-form-item>
+ </el-form>
<el-tree
ref="tree"
:props="defaultProps"
@@ -22,22 +38,13 @@
</el-tree>
</div>
<div class="verSion_rightContent subpage_Div">
- <el-form :inline="true" class="demo-form-inline">
- <el-form-item style="padding-bottom: 14px">
- <el-button
- v-if="btnStatus.insert"
- icon="el-icon-plus"
- @click="insertProject"
- :disabled="count1 != 0 ? true : false"
- type="success"
- size="small"
- >{{ $t("common.append") }}</el-button
- >
- </el-form-item>
- </el-form>
+ <!--
<!-- <el-divider class="eldivider" /> -->
- <div class="dividing-line"></div>
- <div class="table_box" style="height: calc(100% - 89px)">
+ <!-- <div class="dividing-line"></div> -->
+ <div
+ class="table_box"
+ style="height:100%"
+ >
<el-table
ref="filterTable"
:data="dbTableData"
@@ -63,7 +70,7 @@
/>
<el-table-column
- min-width="120"
+ min-width="120"
prop="corpname"
:label="$t('dataManage.projectObj.corpname')"
/>
@@ -99,7 +106,10 @@
prop="remarks"
:label="$t('dataManage.projectObj.remarks')"
/>
- <el-table-column label="鎿嶄綔" width="200">
+ <el-table-column
+ label="鎿嶄綔"
+ width="200"
+ >
<template slot-scope="scope">
<el-button
v-if="btnStatus.delete"
@@ -107,16 +117,14 @@
size="small"
plain
type="danger"
- >{{ $t("common.delete") }}</el-button
- >
+ >{{ $t("common.delete") }}</el-button>
<el-button
v-if="btnStatus.update"
@click="EditProject(scope.row)"
type="warning"
plain
size="small"
- >{{ $t("common.update") }}</el-button
- >
+ >{{ $t("common.update") }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -153,10 +161,16 @@
label-position="top"
>
<el-form-item :label="$t('dataManage.projectObj.projname')">
- <el-input v-model="editFrom.projname" style="width: 85%"></el-input>
+ <el-input
+ v-model="editFrom.projname"
+ style="width: 85%"
+ ></el-input>
</el-form-item>
<el-form-item :label="$t('dataManage.projectObj.projtype')">
- <el-input v-model="editFrom.projtype" style="width: 85%"></el-input>
+ <el-input
+ v-model="editFrom.projtype"
+ style="width: 85%"
+ ></el-input>
</el-form-item>
<el-form-item :label="$t('dataManage.projectObj.location')">
<div class="BoxFlex">
@@ -181,16 +195,28 @@
</el-form-item>
<el-form-item :label="$t('dataManage.projectObj.country')">
- <el-input v-model="editFrom.country" style="width: 85%"></el-input>
+ <el-input
+ v-model="editFrom.country"
+ style="width: 85%"
+ ></el-input>
</el-form-item>
<el-form-item :label="$t('dataManage.projectObj.province')">
- <el-input v-model="editFrom.province" style="width: 85%"></el-input>
+ <el-input
+ v-model="editFrom.province"
+ style="width: 85%"
+ ></el-input>
</el-form-item>
<el-form-item :label="$t('dataManage.projectObj.county')">
- <el-input v-model="editFrom.location" style="width: 85%"></el-input>
+ <el-input
+ v-model="editFrom.location"
+ style="width: 85%"
+ ></el-input>
</el-form-item>
<el-form-item :label="$t('dataManage.projectObj.corpname')">
- <el-input v-model="editFrom.corpname" style="width: 85%"></el-input>
+ <el-input
+ v-model="editFrom.corpname"
+ style="width: 85%"
+ ></el-input>
</el-form-item>
<el-form-item :label="$t('dataManage.projectObj.department')">
<el-input
@@ -205,7 +231,10 @@
></el-input>
</el-form-item>
<el-form-item :label="$t('dataManage.projectObj.contents')">
- <el-input v-model="editFrom.contents" style="width: 85%"></el-input>
+ <el-input
+ v-model="editFrom.contents"
+ style="width: 85%"
+ ></el-input>
</el-form-item>
<el-form-item :label="$t('dataManage.projectObj.projstate')">
<el-input
@@ -214,19 +243,28 @@
></el-input>
</el-form-item>
<el-form-item :label="$t('dataManage.projectObj.remarks')">
- <el-input v-model="editFrom.remarks" style="width: 85%"></el-input>
+ <el-input
+ v-model="editFrom.remarks"
+ style="width: 85%"
+ ></el-input>
</el-form-item>
</el-form>
</div>
- <div slot="footer" class="dialog-footer">
+ <div
+ slot="footer"
+ class="dialog-footer"
+ >
<el-button
type="info"
size="small"
:disabled="behavior != '鏂板椤圭洰' ? true : false"
@click="setRestEditFrom"
- >{{ $t("common.reset") }}</el-button
- >
- <el-button size="small" type="primary" @click="insertEditFrom">{{
+ >{{ $t("common.reset") }}</el-button>
+ <el-button
+ size="small"
+ type="primary"
+ @click="insertEditFrom"
+ >{{
$t("common.confirm")
}}</el-button>
</div>
@@ -308,7 +346,7 @@
this.getSelectProject();
done();
})
- .catch((_) => {});
+ .catch((_) => { });
},
async innerClose() {
this.showMap = false;
--
Gitblit v1.9.3