From 8651d299aaf1ff75353ff6a6112c8ab9260d6b8c Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期四, 24 十一月 2022 15:06:20 +0800
Subject: [PATCH] 用户管理，数据检索，元数据管理页面修改
---
src/views/datamanage/metadataManage.vue | 66 ++++++++++++++++++++++++++++----
src/api/api.js | 4 +-
src/assets/lang/zh.js | 2
src/assets/lang/en.js | 2
src/views/datamanage/domainManage.vue | 29 ++++++++++----
src/views/datamanage/SpatialData.vue | 1
6 files changed, 83 insertions(+), 21 deletions(-)
diff --git a/src/api/api.js b/src/api/api.js
index 3c3f750..3cb5fab 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -269,7 +269,7 @@
// 璇锋眰鐢ㄦ埛绠＄悊鏁版嵁
export function queryPageUser(params) {
- return request.get('/user/selectByPageForRole', { params: params });
+ return request.get('user/selectbypage', { params: params });
}
// 鏂板鐢ㄦ埛绠＄悊鏁版嵁
export function insertUser(params) {
@@ -664,7 +664,7 @@
}
// 鏌ヨ鍊煎煙琛ㄧ粨鏋勬爲
export function getDomainTabs() {
- return request.get('domain/selectTabs');
+ return request.get('domain/selectDomainTabs');
}
//鍒嗛〉鏌ヨ
export function getSingleTab(params) {
diff --git a/src/assets/lang/en.js b/src/assets/lang/en.js
index b791346..586eaf5 100644
--- a/src/assets/lang/en.js
+++ b/src/assets/lang/en.js
@@ -88,7 +88,7 @@
resolpower: 'resolpower',
name: 'Name',
-
+ dirName: 'Catalogue',
format: 'Format',
size: 'Size',
gather: 'Acquisition time',
diff --git a/src/assets/lang/zh.js b/src/assets/lang/zh.js
index 3030cc5..5940865 100644
--- a/src/assets/lang/zh.js
+++ b/src/assets/lang/zh.js
@@ -88,7 +88,7 @@
resolpower: '鍒嗚鲸鐜�',
name: '鍚嶇О',
-
+ dirName: '鐩綍',
format: '鏍煎紡',
size: '澶у皬',
gather: '閲囬泦鏃堕棿',
diff --git a/src/views/datamanage/SpatialData.vue b/src/views/datamanage/SpatialData.vue
index ff5d28f..88580b6 100644
--- a/src/views/datamanage/SpatialData.vue
+++ b/src/views/datamanage/SpatialData.vue
@@ -393,6 +393,7 @@
this.listData.name = data.entity; //瑕佹煡璇㈣〃鏍肩被鍨嬶紱
this.getClickTable = data;
this.filedsLayer = this.getCollapseDomFiled(); //鑾峰彇姣忎釜琛ㄥ瓧娈靛悕绉板強闃堝��
+
//鑾峰彇table淇℃伅
this.getCollapseTable(this.filedsLayer);
},
diff --git a/src/views/datamanage/domainManage.vue b/src/views/datamanage/domainManage.vue
index 7244b1c..952cb94 100644
--- a/src/views/datamanage/domainManage.vue
+++ b/src/views/datamanage/domainManage.vue
@@ -95,11 +95,11 @@
prop="codeDesc"
:label="$t('dataManage.domainManage.codeDesc')"
/>
- <el-table-column
+ <!-- <el-table-column
align="center"
prop="bsm"
:label="$t('dataManage.domainManage.bsm')"
- />
+ /> -->
<el-table-column
align="center"
prop="level"
@@ -333,17 +333,17 @@
},
domainData: [
{
- tabDesc: '鍩虹鏁版嵁',
+ val: '鍩虹鏁版嵁',
children: [],
},
{
- tabDesc: '涓氬姟鏁版嵁',
+ val: '涓氬姟鏁版嵁',
children: [],
},
],
defaultProps: {
children: 'children',
- label: 'tabDesc',
+ label: 'val',
},
};
},
@@ -361,11 +361,18 @@
this.fullscreenLoading = true;
this.listData.ns = data.ns;
this.listData.tab = data.tab;
+
getSingleTab(this.listData).then((res) => {
setTimeout(() => {
- this.tableData = res.result;
- this.count = res.count;
- this.fullscreenLoading = false;
+ if (res.code == 200) {
+ this.tableData = res.result;
+ this.count = res.count;
+ this.fullscreenLoading = false;
+ } else {
+ this.tableData = [];
+ this.count = 0;
+ this.fullscreenLoading = false;
+ }
}, 500);
});
},
@@ -380,6 +387,12 @@
getDomainTabs().then((res) => {
let bdres = res.result.filter((item) => item.ns == 'bd');
let bsres = res.result.filter((item) => item.ns == 'bs');
+ for (var i in bdres) {
+ bdres[i].val = bdres[i].tabDesc + '(' + bdres[i].tab + ')';
+ }
+ for (var i in bsres) {
+ bsres[i].val = bsres[i].tabDesc + '(' + bsres[i].tab + ')';
+ }
this.domainData[0].children = bdres;
this.domainData[1].children = bsres;
});
diff --git a/src/views/datamanage/metadataManage.vue b/src/views/datamanage/metadataManage.vue
index f39c90a..9c9ff8b 100644
--- a/src/views/datamanage/metadataManage.vue
+++ b/src/views/datamanage/metadataManage.vue
@@ -65,7 +65,22 @@
</div>
<div class="bottom">
<div class="leftTree">
- <ul>
+ <el-tree
+ ref="tree"
+ :props="defaultProps"
+ node-key="id"
+ :data="optionCount"
+ :default-expanded-keys="[1]"
+ :current-node-key="1"
+ :expand-on-click-node="false"
+ :default-expand-all="false"
+ draggable
+ @node-click="handleNodeClick"
+ >
+
+ </span>
+ </el-tree>
+ <!-- <ul>
<li
@click="getTableDesc(item)"
v-for="item in optionCount"
@@ -73,7 +88,7 @@
>
{{ item.tabDesc }}({{ item.tab }})
</li>
- </ul>
+ </ul> -->
</div>
<div class="rightTable">
<div class="table_box">
@@ -97,6 +112,10 @@
<el-table-column
prop="depName"
:label="$t('dataManage.vmobj.depName')"
+ />
+ <el-table-column
+ prop="dirName"
+ :label="$t('dataManage.vmobj.dirName')"
/>
<el-table-column
prop="gather"
@@ -234,8 +253,20 @@
<el-cascader
v-model="editForm.depid"
:options="companyOption"
- @change="companyChange"
:props="cascader"
+ style="width:350px"
+ ></el-cascader>
+ </el-form-item>
+ <el-form-item
+ :label="$t('dataManage.vmobj.dirName')"
+ :label-width="formLabelWidth"
+ >
+ <!-- <el-input v-model="editForm.depName" autocomplete="off"></el-input> -->
+ <el-cascader
+ v-model="editForm.dirid"
+ :options="dirComPanyOption"
+ :props="cascader"
+ style="width:350px"
></el-cascader>
</el-form-item>
<el-form-item
@@ -312,7 +343,9 @@
deleteMeta,
insertMeta,
selectDictTab,
+ selectdirTab,
queryDepTree,
+
} from '../../api/api';
import MyBread from '../../components/MyBread.vue';
export default {
@@ -329,6 +362,11 @@
}
};
return {
+ defaultProps: {
+ children: 'children',
+ label: 'name',
+ },
+dirComPanyOption:[],
companyOption: [],
activeName: '',
optionCount: [],
@@ -374,6 +412,7 @@
pageSize: 10,
pageIndex: 1,
name: null,
+ dirid:null,
},
cascader: {
label: 'name',
@@ -385,7 +424,7 @@
};
},
created() {
- this.getMetaData();
+
this.getSelectDictTab();
this.showPermsBtn();
this.getQueryDepTree();
@@ -461,12 +500,20 @@
},
//鐩綍鏍戣幏鍙�
async getSelectDictTab() {
- const data = await selectDictTab();
- if (data.code != 200) {
- this.$message.error('涓嬫媺璋冪敤澶辫触');
+ const res = await selectdirTab();
+ if (res.code != 200) {
+ this.$message.error('鍒楄〃璋冪敤澶辫触');
}
- this.optionCount = data.result;
- this.activeName = data.result[0].tab;
+ this.optionCount =this.treeData(res.result);
+ this.dirComPanyOption= this.treeData(res.result);
+ this.listData.dirid=this.optionCount[0].id;
+ this.getMetaData();
+ },
+ handleNodeClick(data) {
+ this.listData.pageSize=10;
+ this.listData.pageIndex = 1;
+ this.listData.dirid = data.id;
+ this.getMetaData();
},
getTableDesc(res) {
this.activeName = res.tab;
@@ -514,6 +561,7 @@
// 璇锋眰鏁版嵁鍐呭
getMetaData() {
select_meta_ByPageAndCount(this.listData).then((res) => {
+ debugger
this.tableData = res.result;
this.count = res.count;
});
--
Gitblit v1.9.3