From 938493192a9a112e5eef0d98b46a30569ce98a59 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期二, 06 十二月 2022 16:04:56 +0800
Subject: [PATCH] 1
---
src/views/datamanage/metadataManage.vue | 103 ++++++++++++++++++++
src/api/api.js | 12 ++
src/views/Synthesis/index.vue | 1
public/config/config.js | 2
src/views/datamanage/projectManage.vue | 147 +++++++++++++++++++++++------
src/views/Synthesis/LeftMenu.vue | 6 +
src/views/datamanage/dataLoader.vue | 1
src/components/navMenu.vue | 2
src/views/datamanage/styleManage.vue | 6 +
src/views/datamanage/SpatialData.vue | 13 +-
10 files changed, 248 insertions(+), 45 deletions(-)
diff --git a/public/config/config.js b/public/config/config.js
index 3893467..847be17 100644
--- a/public/config/config.js
+++ b/public/config/config.js
@@ -7,6 +7,8 @@
var wnsUrl = 'http://192.168.20.39:9055/gisserver/wnsserver/beijingdaohang_wns';
//gisserver
var gisServerUrl = 'http://192.168.20.39:9055/gisserver';
+//婕父=>缂栬緫鐗堟湰涓簍rue,鎵撳寘鐗堟湰涓篺alse,
+var analyFlag = true;
//缁煎悎灞曠ず
window.sceneConfig = {
// sdk璁稿彲
diff --git a/src/api/api.js b/src/api/api.js
index 1a461d8..d1d2f49 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -440,6 +440,14 @@
return request.get('meta/selectDownloadFile', { params: params });
}
+//鏁版嵁鍏ュ簱=>鏌ヨ瀛楁淇℃伅
+export function meta_selectFields(params) {
+ return request.get('/meta/selectFields', { params: params });
+}
+//鏁版嵁鍏ュ簱=>鏌ヨ琛ㄤ腑鏁版嵁
+export function meta_selectByPageForUpload(params) {
+ return request.get('/meta/selectDbData', { params: params });
+}
//缁煎悎灞曠ず鑾峰彇
export function select_Comprehensive_ByPageAndCount(params) {
return request.get('/locate/selectAddrByPage', { params: params });
@@ -720,11 +728,11 @@
//椤圭洰绠＄悊鏌ヨ鐩綍
export function project_selectDirAll(params) {
- return request.get('/project/selectDirAll', { params: params });
+ return request.get('/project/selectDirRoot', { params: params });
}
//椤圭洰绠＄悊=銆嬫牴鎹洰褰旾D鏌ヨ
export function project_selectByDirid(params) {
- return request.get('/project/selectByDirid', { params: params });
+ return request.get('/project/selectByPageAndCount', { params: params });
}
//椤圭洰绠＄悊=銆嬫柊澧�
export function project_insert(params) {
diff --git a/src/components/navMenu.vue b/src/components/navMenu.vue
index c9c21bc..ee9de80 100644
--- a/src/components/navMenu.vue
+++ b/src/components/navMenu.vue
@@ -160,7 +160,7 @@
this.$router.push(item.url);
if (this.showFlag != null) {
this.setShowFalseDiv(false);
- this.changeliSelect = '鍛靛懙';
+ this.changeliSelect = '%%';
this.showFlag = null;
}
} else {
diff --git a/src/views/Synthesis/LeftMenu.vue b/src/views/Synthesis/LeftMenu.vue
index 8812b0e..f6993be 100644
--- a/src/views/Synthesis/LeftMenu.vue
+++ b/src/views/Synthesis/LeftMenu.vue
@@ -689,6 +689,10 @@
window.sgworld.Analysis.setPointFly();
break;
case 'c2':
+ var test = '';
+ if (analyFlag == false) {
+ test = '/web';
+ }
window.sgworld.Command.execute(2, 3, '', (data) => {
data.showPoint = false;
data.showLine = true;
@@ -704,7 +708,7 @@
area: ['352px', '690px'],
offset: 'r',
skin: 'other-class',
- content: '/SmartEarthSDK/Workers/path/Path.html',
+ content: test + '/SmartEarthSDK/Workers/path/Path.html',
end: function () {
PathAnimationData.fly && PathAnimationData.fly.exit();
},
diff --git a/src/views/Synthesis/index.vue b/src/views/Synthesis/index.vue
index 60f9ecb..2c22989 100644
--- a/src/views/Synthesis/index.vue
+++ b/src/views/Synthesis/index.vue
@@ -160,7 +160,6 @@
this.$store.state.mapMenuBoxFlag = null;
this.$store.state.mapPopBoolean = false;
this.$store.state.mapPopBoxFlag = null;
- this.initMap();
},
//鍒濆鍖栬彍鍗曟巿鏉�
created() {
diff --git a/src/views/datamanage/SpatialData.vue b/src/views/datamanage/SpatialData.vue
index 88580b6..71af9bf 100644
--- a/src/views/datamanage/SpatialData.vue
+++ b/src/views/datamanage/SpatialData.vue
@@ -38,13 +38,13 @@
>{{$t('common.reset')}}</el-button
>
- <el-button
+ <!-- <el-button
v-if="btnStatus.download"
icon="el-icon-position"
type="success"
size="small"
>{{$t('common.download')}}</el-button
- >
+ > -->
</el-form-item>
</el-form>
<el-divider class="eldivider" />
@@ -208,13 +208,13 @@
tree: [
{
tabDesc: '鍩虹鏁版嵁',
- tab: '鍩虹鏁版嵁',
+ label: '鍩虹鏁版嵁',
value: 'BD',
children: [],
},
{
tabDesc: '涓氬姟鏁版嵁',
- tab: '涓氬姟鏁版嵁',
+ label: '涓氬姟鏁版嵁',
value: 'BS',
children: [],
},
@@ -222,7 +222,7 @@
tableAttach: [],
defaultProps: {
children: 'children',
- label: 'tab',
+ label: 'label',
},
btnStatus: {
select: false,
@@ -368,6 +368,7 @@
for (var i in option) {
var val_Data = option[i];
val_Data.id = '1' + i;
+ val_Data.label= val_Data.tabDesc+"("+val_Data.tab+")"
if (option[i].ns == 'bd') {
this.tree[0].children.push(val_Data);
} else {
@@ -754,7 +755,7 @@
border-radius: 5px;
padding: 1%;
max-height: 670px;
- overflow-y: auto;
+ overflow : auto;
}
.spatial_rightContent {
width: 80%;
diff --git a/src/views/datamanage/dataLoader.vue b/src/views/datamanage/dataLoader.vue
index 69a293f..d07e9a6 100644
--- a/src/views/datamanage/dataLoader.vue
+++ b/src/views/datamanage/dataLoader.vue
@@ -494,6 +494,7 @@
return
}
this.dbTableData =data1.result;
+ this.count1 = data1.count;
},
handleLoaderSizeChange(val){
this.listLoader.pageIndex= 1;
diff --git a/src/views/datamanage/metadataManage.vue b/src/views/datamanage/metadataManage.vue
index e151641..ab2116c 100644
--- a/src/views/datamanage/metadataManage.vue
+++ b/src/views/datamanage/metadataManage.vue
@@ -117,7 +117,18 @@
prop="dirName"
:label="$t('dataManage.vmobj.dirName')"
/>
+
+
<el-table-column
+ :label="$t('dataManage.dataUpObj.tableName')">
+ <template slot-scope="scope">
+ <a @click="detail(scope.row)" >{{
+ scope.row.tab
+ }}</a>
+ </template>
+ </el-table-column>
+
+ <el-table-column
prop="gather"
:label="$t('dataManage.vmobj.gather')"
:formatter="formatData"
@@ -135,7 +146,6 @@
:label="$t('dataManage.vmobj.createontime')"
:formatter="formatData"
/>
-
<el-table-column min-width="100" :label="$t('common.operate')">
<template slot-scope="scope">
<el-link style="color: white" @click="showDetail(scope.row)">{{
@@ -307,6 +317,44 @@
>
</div>
</el-dialog>
+ <el-dialog
+ :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%"
+ >
+ <el-table-column 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"
+ ></el-table-column>
+ </el-table>
+ <div style="margin-top: 10px" class="pagination_box">
+ <el-pagination
+ @size-change="handleLoaderSizeChange"
+ @current-change="handleLoaderCurrentChange"
+ :current-page="listLoader.pageIndex"
+ :page-sizes="[10, 20, 30, 40]"
+ :page-size="listLoader.pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="count1"
+ >
+ </el-pagination>
+ </div>
+ </div>
+
+</el-dialog>
<div class="downloadBox" v-if="showCodeBox">
<h4 style="padding: 20px">{{$t('common.passworld')}}</h4>
<el-form
@@ -350,7 +398,9 @@
queryDepTree,
meta_downloadReq,
sign_getPublicKey,
- meta_selectDownloadFile
+ meta_selectDownloadFile,
+ meta_selectFields,
+ meta_selectByPageForUpload
} from '../../api/api';
import MyBread from '../../components/MyBread.vue';
@@ -413,6 +463,7 @@
],
},
tableData: [],
+ dbTableData:[],
count: 0,
currentPage: 1,
pageSize: 10,
@@ -438,6 +489,14 @@
checkStrictly: true,
emitPath: false,
},
+ dialogVisible:false,
+ listLoader:{
+ id:null,
+ pageSize:1,
+ pageSize:10,
+ },
+ count1:0,
+ attributeData:[],
};
},
created() {
@@ -449,6 +508,46 @@
},
methods: {
+ async detail(res){
+ var val = res.tab.split(".");
+ const data = await meta_selectFields({
+ ns:val[0],
+ tab:val[1]
+ })
+ if(data.code != 200){
+ this.$message.error('瀛楁鍒楄〃璋冪敤澶辫触');
+ return
+ }
+ this.dialogVisible = true;
+ this.attributeData =data.result;
+
+ this.listLoader={
+ id:res.id,
+ pageIndex:1,
+ pageSize:10,
+ }
+ this.getDataLoaderSelectDbData();
+ },
+
+ async getDataLoaderSelectDbData (){
+ const data1 = await meta_selectByPageForUpload(this.listLoader);
+ if(data1.code != 200){
+ this.$message.error('瀛楁鍒楄〃璋冪敤澶辫触');
+ return
+ }
+ this.dbTableData =data1.result;
+ this.count1 = data1.count;
+ },
+ handleLoaderSizeChange(val){
+ this.listLoader.pageIndex= 1;
+ this.listLoader.pageSize =val;
+ this.getDataLoaderSelectDbData();
+ },
+handleLoaderCurrentChange(val){
+ this.listLoader.pageIndex= val;
+ this.getDataLoaderSelectDbData();
+},
+
async signGetPublicKey(){
const res = await sign_getPublicKey();
if (res && res.code == 200) {
diff --git a/src/views/datamanage/projectManage.vue b/src/views/datamanage/projectManage.vue
index 03202b0..3a72c25 100644
--- a/src/views/datamanage/projectManage.vue
+++ b/src/views/datamanage/projectManage.vue
@@ -28,31 +28,104 @@
v-if="btnStatus.insert"
icon="el-icon-plus"
@click="insertProject"
- :disabled="count != null ? true : false"
+ :disabled="count1 != 0 ? true : false"
type="success"
>{{ $t('common.append') }}</el-button
- >
- <el-button
- v-if="btnStatus.delete"
- @click="deleteProject"
- icon="el-icon-delete"
- :disabled="count != null ? false : true"
- type="danger"
- >{{ $t('common.delete') }}</el-button
- >
- <el-button
- v-if="btnStatus.update"
- @click="EditProject"
- icon="el-icon-edit"
- :disabled="count != null ? false : true"
- type="info"
- >{{ $t('common.update') }}</el-button
>
</el-form-item>
</el-form>
<el-divider class="eldivider" />
<div style="height: 82%; padding: 1%; overflow: auto">
- <el-form
+ <el-table
+ ref="filterTable"
+ :data="dbTableData"
+ height="90%"
+ border
+ style="width: 100%"
+ >
+ <el-table-column
+ width="60"
+ type="index"
+ :label="$t('common.index')"
+ />
+ <el-table-column
+ prop="projname"
+ :label="$t('dataManage.projectObj.projname')"
+ />
+ <el-table-column
+ prop="projtype"
+ :label="$t('dataManage.projectObj.projtype')"
+ />
+ <el-table-column
+ prop="location"
+ :label="$t('dataManage.projectObj.location')"
+ />
+ <el-table-column
+ prop="province"
+ :label="$t('dataManage.projectObj.province')"
+ />
+ <el-table-column
+ prop="country"
+ :label="$t('dataManage.projectObj.country')"
+ />
+ <el-table-column
+ prop="corpname"
+ :label="$t('dataManage.projectObj.corpname')"
+ />
+ <el-table-column
+ prop="department"
+ :label="$t('dataManage.projectObj.department')"
+ />
+ <el-table-column
+ prop="conperiod"
+ :label="$t('dataManage.projectObj.conperiod')"
+ />
+ <el-table-column
+ prop="contents"
+ :label="$t('dataManage.projectObj.contents')"
+ />
+ <el-table-column
+ prop="projstate"
+ :label="$t('dataManage.projectObj.projstate')"
+ />
+ <el-table-column
+ prop="remarks"
+ :label="$t('dataManage.projectObj.remarks')"
+ />
+ <el-table-column label="鎿嶄綔" width="200">
+ <template slot-scope="scope">
+ <el-button
+ v-if="btnStatus.delete"
+ @click="deleteProject(scope.row)"
+ icon="el-icon-delete"
+ size="mini"
+ type="danger"
+ >{{ $t('common.delete') }}</el-button
+ >
+ <el-button
+ v-if="btnStatus.update"
+ @click="EditProject(scope.row)"
+ icon="el-icon-edit"
+ type="info"
+ size="mini"
+ >{{ $t('common.update') }}</el-button
+ >
+ </template>
+ </el-table-column>
+ </el-table>
+ <div style="margin-top: 10px" class="pagination_box">
+ <el-pagination
+ @size-change="handleLoaderSizeChange"
+ @current-change="handleLoaderCurrentChange"
+ :current-page="listLoader.pageIndex"
+ :page-sizes="[10, 20, 30, 40]"
+ :page-size="listLoader.pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="count1"
+ >
+ </el-pagination>
+ </div>
+ <!-- <el-form
class="projFrom"
ref="form"
:model="projectFrom"
@@ -124,7 +197,7 @@
v-model="projectFrom.remarks"
></el-input>
</el-form-item>
- </el-form>
+ </el-form> -->
</div>
</div>
</div>
@@ -242,6 +315,7 @@
children: 'children',
label: 'name',
},
+ dbTableData: [],
btnStatus: {
select: false,
delete: false,
@@ -250,6 +324,12 @@
insert: false,
update: false,
},
+ listLoader: {
+ dirid: null,
+ pageIndex: 1,
+ pageSize: 10,
+ },
+ count1: 0,
};
},
created() {
@@ -311,8 +391,9 @@
},
//鍒犻櫎椤圭洰
- async deleteProject() {
- const data = await project_delete({ gid: this.projectFrom.gid });
+ async deleteProject(row) {
+ debugger;
+ const data = await project_delete({ gid: row.gid });
if (data.code != 200) {
this.$message.error('椤圭洰鍒犻櫎澶辫触');
return;
@@ -320,11 +401,11 @@
this.getSelectProject();
},
//淇敼椤圭洰
- EditProject() {
+ EditProject(row) {
this.behavior = '淇敼椤圭洰';
this.outerVisible = true;
- this.editFrom = this.projectFrom;
- this.$store.state.projeOl = this.projectFrom.location;
+ this.editFrom = row;
+ this.$store.state.projeOl = row.location;
},
//鏂板椤圭洰
insertProject() {
@@ -344,18 +425,20 @@
//鍒楄〃鏁版嵁鑾峰彇
async getSelectProject() {
- const data = await project_selectByDirid({ dirid: this.dirId });
+ this.listLoader.dirid = this.dirId;
+ const data = await project_selectByDirid(this.listLoader);
if (data.code != 200) {
this.$message.error('鍒楄〃鑾峰彇澶辫触');
return;
}
- this.count = data.result;
-
- if (this.count == null) {
- this.projectFrom = {};
- } else {
- this.projectFrom = data.result;
- }
+ // this.count = data.result;
+ this.count1 = data.count;
+ this.dbTableData = data.result;
+ // if (this.count == null) {
+ // this.projectFrom = {};
+ // } else {
+ // this.projectFrom = data.result;
+ // }
},
//鐩綍鍒楄〃鑾峰彇
async getSelectdirTab() {
diff --git a/src/views/datamanage/styleManage.vue b/src/views/datamanage/styleManage.vue
index 2c4b615..2795335 100644
--- a/src/views/datamanage/styleManage.vue
+++ b/src/views/datamanage/styleManage.vue
@@ -1500,6 +1500,12 @@
border: #409eff;
color: white;
}
+ .el-icon-plus{
+ color: white;
+ }
+ .el-icon-upload2{
+ color: white;
+ }
}
</style>
--
Gitblit v1.9.3