From a7199e5a4f3e34b14d395e319a552c5c3b8b3a4d Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期四, 24 十一月 2022 09:41:25 +0800
Subject: [PATCH] 数据上传，数据入库页面修改
---
src/views/datamanage/metadataManage.vue | 341 ++++++++++++----
src/api/api.js | 8
src/assets/lang/zh.js | 22
src/views/datamanage/versionManage.vue | 21
src/assets/lang/en.js | 16
src/views/datamanage/dataLoader.vue | 264 ++++++++++++-
src/views/datamanage/dataUpdata.vue | 367 ++++++++++++++---
src/views/datamanage/styleManage.vue | 113 +++++
8 files changed, 937 insertions(+), 215 deletions(-)
diff --git a/src/api/api.js b/src/api/api.js
index a4c2319..3c3f750 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -512,6 +512,10 @@
export function dataUploadInsertFiles(params) {
return request.post('/dataUpload/insertFiles', params);
}
+//鏁版嵁涓婁紶=鍒嗛〉鏌ヨ涓婁紶鏁版嵁骞惰繑鍥炶褰曟暟
+export function dataUpload_selectByPageForUpload(params) {
+ return request.get('/dataUpload/selectByPageForUpload', { params: params });
+}
//鏁版嵁鍏ュ簱=>鑾峰彇鐩綍鏍�
export function dataLoader_selectDirAll(params) {
@@ -541,6 +545,10 @@
export function dataLoader_SelectTabs(params) {
return request.get('/dataLoader/selectTabs', { params: params });
}
+//鏁版嵁鍏ュ簱=>鏌ヨ鎵�鏈夎〃
+export function dataLoader_selectByPageForUpload(params) {
+ return request.get('/dataLoader/selectByPageForUpload', { params: params });
+}
// //鏁版嵁鍏ュ簱=>鏌ヨ鏂囦欢
// export function dataLoader_selectDirAll(params) {
diff --git a/src/assets/lang/en.js b/src/assets/lang/en.js
index 4a60ab0..b791346 100644
--- a/src/assets/lang/en.js
+++ b/src/assets/lang/en.js
@@ -39,7 +39,11 @@
size: 'size',
versionName: 'version Name',
type: 'type',
+ quayTest: 'Auality testing',
+ md5: 'MD5 Code',
+ lineNuber: 'line Nuber',
},
+
dataManage: {
dataManage: 'Data Manage',
catalogueManage: 'catalogueManage',
@@ -57,6 +61,9 @@
catalogRemarks: 'Catalog Remarks',
newDirectory: 'New Directory',
versionNo: 'Version No',
+ tableName: 'table Name',
+ uploaddata: 'Upload data',
+ receiptdata: 'Receipt data',
},
metadataManage: 'metadataManage',
@@ -67,7 +74,7 @@
keyword: 'Keyword',
describe: 'Describe',
index: 'Index',
- name: 'Name',
+
catalogue: 'Catalogue',
createontime: 'Creation Time',
createonuser: 'Creation Personne',
@@ -79,6 +86,13 @@
coordSystem: 'Coordinate system',
scale: 'Scale',
resolpower: 'resolpower',
+
+ name: 'Name',
+
+ format: 'Format',
+ size: 'Size',
+ gather: 'Acquisition time',
+ depName: 'Company',
},
dictionaryManage: 'dictionaryManage',
dictionaryManageObj: {
diff --git a/src/assets/lang/zh.js b/src/assets/lang/zh.js
index 30fac01..3030cc5 100644
--- a/src/assets/lang/zh.js
+++ b/src/assets/lang/zh.js
@@ -32,15 +32,16 @@
file: '鏂囦欢',
details: '璇︽儏',
enclosure: '闄勪欢',
-
attachinform: '闄勪欢淇℃伅',
filePath: '鏂囦欢璺緞',
fileNme: '鏂囦欢鍚嶇О',
-
format: '鏍煎紡',
size: '澶у皬',
versionName: '鐗堟湰鍚嶇О',
type: '绫诲瀷',
+ quayTest: '璐ㄦ',
+ md5: 'MD5鐮�',
+ lineNuber: '琛屾暟',
},
dataManage: {
dataManage: '鏁版嵁绠＄悊',
@@ -57,11 +58,13 @@
describe: '鎻忚堪',
directoryName: '鐩綍鍚嶇О',
catalogDescription: '鐩綍璇存槑',
-
+ uploaddata: '涓婁紶鏁版嵁',
catalogRemarks: '鐩綍澶囨敞',
newDirectory: '鏂板鐩綍',
versionNo: '鐗堟湰鍙�',
+ tableName: '琛ㄥ悕',
+ receiptdata: '鍏ュ簱鏁版嵁',
},
metadataManage: '鍏冩暟鎹鐞�',
dataLoading: '鏁版嵁鍏ュ簱',
@@ -69,9 +72,9 @@
versionManage: '鐗堟湰绠＄悊',
vmobj: {
keyword: '鍏抽敭瀛�',
- describe: '鎻忚堪',
+
index: '搴忓彿',
- name: '鍚嶇О',
+
catalogue: '鐩綍',
createontime: '鍒涘缓鏃堕棿',
createonuser: '鍒涘缓浜哄憳',
@@ -82,8 +85,15 @@
type: '绫诲瀷',
coordSystem: '鍧愭爣绯荤粺',
scale: '姣斾緥灏�',
-
resolpower: '鍒嗚鲸鐜�',
+
+ name: '鍚嶇О',
+
+ format: '鏍煎紡',
+ size: '澶у皬',
+ gather: '閲囬泦鏃堕棿',
+ depName: '鍗曚綅',
+ describe: '鎻忚堪',
},
dictionaryManage: '瀛楀吀绠＄悊',
dictionaryManageObj: {
diff --git a/src/views/datamanage/dataLoader.vue b/src/views/datamanage/dataLoader.vue
index 026ee29..bd6e1d7 100644
--- a/src/views/datamanage/dataLoader.vue
+++ b/src/views/datamanage/dataLoader.vue
@@ -10,7 +10,10 @@
></My-bread>
<el-divider />
<div class="updateContent">
- <div class="contentIquery">
+ <el-tabs v-model="activeTabName" @tab-click="handleTabClick">
+ <el-tab-pane :label="$t('dataManage.dataUpObj.uploaddata')" name="first">
+
+ <div class="contentIquery">
<el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item :label="$t('dataManage.dataUpObj.catalogue')">
<el-cascader
@@ -79,6 +82,12 @@
:disabled="tableData.length == 0 ? true : false"
>{{ $t('common.delete') }}</el-button
>
+ <el-button
+ icon="el-icon-data-line"
+ type="info"
+ disabled
+ >{{ $t('common.quayTest') }}</el-button
+ >
<el-button
icon="el-icon-folder-add"
type="warning"
@@ -92,7 +101,6 @@
<div class="contentTable">
<el-table
:data="tableData"
- border
style="width: 100%"
height="99%"
@selection-change="handleSelectionChange">
@@ -110,9 +118,114 @@
:label="$t('common.name')"
fixed
/>
-
</el-table>
- <!-- <div style="margin-top: 10px" class="pagination_box">
+ </div>
+ </el-tab-pane>
+ <el-tab-pane :label="$t('dataManage.dataUpObj.receiptdata')" name="second">
+<div class="contentIquery" style="padding-bottom: 0% !important;">
+ <el-form :inline="true" :model="formWarehousing" class="demo-form-inline">
+ <el-form-item :label="$t('dataManage.dataUpObj.describe')">
+<el-input v-model="formWarehousing.name" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button icon="el-icon-upload" @click="setWarehouseSearch"
+ class="primary">{{
+ $t('common.iquery')
+ }}</el-button>
+ <el-button @click="setWarehouseReset"
+ icon="el-icon-folder-add"
+ type="info"
+ >{{ $t('common.reset') }}</el-button
+ >
+ </el-form-item>
+ </el-form>
+ </div>
+ <div class="contentTable" style="height:500px">
+ <el-table
+ :data="waretableData"
+
+ style="width:99%"
+ height="92%"
+ >
+ <el-table-column
+ align="center"
+ type="index"
+ :label="$t('common.index')"
+ width="70px"
+ fixed
+ />
+ <el-table-column
+ align="center"
+ prop="name"
+ :label="$t('common.name')"
+ fixed
+ />
+ <el-table-column
+ align="center"
+ prop="dirName"
+ :label="$t('dataManage.dataUpObj.catalogue')"
+ fixed
+
+ />
+ <el-table-column
+ align="center"
+ prop="depName"
+ :label="$t('dataManage.dataUpObj.company')"
+ fixed
+ />
+ <el-table-column
+ align="center"
+ prop="verName"
+ :label="$t('dataManage.dataUpObj.versionNo')"
+ fixed
+ />
+ <el-table-column
+ align="center"
+ prop="type"
+ :label="$t('common.type')"
+ fixed
+ />
+ <el-table-column
+ align="center"
+ prop="sizes"
+ :label="$t('common.size')"
+ fixed
+ :formatter="changeSizeFile"
+ />
+ <el-table-column
+ align="center"
+ prop="tab"
+ :label="$t('dataManage.dataUpObj.tableName')"
+ fixed
+ />
+ <el-table-column
+ align="center"
+ prop="rows"
+ :label="$t('common.lineNuber')"
+ fixed
+ />
+ <el-table-column
+ align="center"
+ prop="desc"
+ :label="$t('dataManage.dataUpObj.describe')"
+ fixed
+ />
+ <el-table-column
+ align="center"
+ prop="uname"
+ :label="$t('dataManage.vmobj.createonuser')"
+ fixed
+ />
+ <el-table-column
+ align="center"
+ prop="createTime"
+ :label="$t('dataManage.vmobj.createontime')"
+ fixed
+ :formatter="changetimeFile"
+ />
+ </el-table>
+
+ <div style="margin-top: 10px" class="pagination_box">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -123,8 +236,12 @@
:total="count"
>
</el-pagination>
- </div> -->
</div>
+ </div>
+ </el-tab-pane>
+
+ </el-tabs>
+
</div>
<!-- -->
@@ -162,7 +279,7 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button class="primary" @click="autoMatchWare">鑷姩鍖归厤</el-button>
- <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
+ <el-button @click="setInsrtWareTableClose ">鍙� 娑�</el-button>
<el-button class="primary" @click="setInsrtWareTable">纭� 瀹�</el-button>
</span>
</el-dialog>
@@ -182,7 +299,8 @@
dataUploadDeleteFiles,
dataUploadInsertFiles,
dataLoader_selectMappers,
- dataLoader_SelectTabs
+ dataLoader_SelectTabs,
+ dataLoader_selectByPageForUpload
} from '../../api/api';
export default {
name: 'dataUpdata',
@@ -191,6 +309,11 @@
},
data() {
return {
+ formWarehousing: {
+ name:''
+ },
+waretableData:[],
+ activeTabName:'first',
wareStatus: false,
dialogWarehousing: false,
btnStatus: 0,
@@ -211,6 +334,7 @@
listData: {
pageIndex: 1,
pageSize: 10,
+ name:''
},
pickerOptions: {
disabledDate(time) {
@@ -274,18 +398,103 @@
},
methods: {
+ changetimeFile(res){
+
+//shijianchuo鏄暣鏁帮紝鍚﹀垯瑕乸arseInt杞崲
+ var time = new Date(res.createTime);
+ var y = time.getFullYear();
+ var m = time.getMonth() + 1;
+ var d = time.getDate();
+ var h = time.getHours();
+ var mm = time.getMinutes();
+ var s = time.getSeconds();
+ return (
+ y +
+ '-' +
+ this.add0(m) +
+ '-' +
+ this.add0(d) +
+ ' ' +
+ h +
+ ':' +
+ mm +
+ ':' +
+ s
+ );
+ },
+ //鏍煎紡鍖栨椂闂�
+ add0(m) {
+ return m < 10 ? '0' + m : m;
+ },
+ setWarehouseSearch(){
+
+ this.listData={
+ pageIndex:1,
+ pageSize:10,
+ name:this.formWarehousing.name,
+ }
+ this.getAllWareTable();
+ },
+ setWarehouseReset(){
+ this.formWarehousing.name='';
+ this.listData={
+ pageIndex:1,
+ pageSize:10,
+ name:null,
+ }
+ this.getAllWareTable();
+ },
+ handleTabClick(tab, event) {
+ if(this.activeTabName =='second'){
+ this.setWarehouseReset();
+ }
+ },
+ handleSizeChange(val){
+ this.listData.pageIndex= 1;
+ this.listData.pageSize =val;
+ this.getAllWareTable();
+ },
+handleCurrentChange(val){
+ this.listData.pageIndex= val;
+ this.getAllWareTable();
+},
+ //鑾峰彇鍏ュ簱鏁版嵁鍒楄〃
+ async getAllWareTable(){
+
+ const res = await dataLoader_selectByPageForUpload(this.listData);
+ if (res.code != 200) {
+ this.$message.error('鍒楄〃鏁版嵁鑾峰彇澶辫触');
+ return;
+ }
+
+ this.count = res.count;
+ this.waretableData =res.result;
+ },
+ //澶у皬鍊兼敼璁�
+ changeSizeFile(row, column, cellValue, index) {
+
+ if (cellValue >= 1024) {
+ return parseFloat(cellValue / 1204).toFixed(3) + "GB"
+ } else {
+ return cellValue + "MB"
+ }
+ },
+ setInsrtWareTableClose(){
+ this.dialogWarehousing = false;
+ this.setClearAttartch();
+ },
async setInsrtWareTable(){
var obj = {
metaEntity: this.formInline,
fileEntities: this.tableWareThree
};
- debugger
+
const res = await dataUploadInsertFiles(JSON.stringify(obj));
if (res.code != 200) {
this.$message.error('鏁版嵁鍏ュ簱澶辫触');
return;
}else{
- debugger
+
this.$message({
message: '鏁版嵁鍏ュ簱鎴愬姛',
type: 'success'
@@ -406,7 +615,7 @@
this.$message.error('鏁版嵁璇锋眰澶辫触');
return;
}
- debugger
+
this.tableWareOne = data.result;
},
//鏁版嵁鍒犻櫎
@@ -416,13 +625,14 @@
const res = await dataUploadDeleteFiles(data);
if (res.code != 200) {
this.$message.error('鍒犻櫎澶辫触');
+ this.handlerLoading(false);
return;
}
this.getFileLength();
+ this.handlerLoading(false);
- this.handlerLoading(false);
},
//鏁版嵁鍏ュ簱
async setFileWare() {
@@ -526,16 +736,16 @@
},
- //鍒嗛〉鎺у埗
- handleSizeChange(res) {
- this.listData.pageIndex = 1;
- this.listData.pageSize = res;
- this.setViewTable();
- },
- handleCurrentChange(res) {
- this.listData.pageIndex = res;
- this.setViewTable();
- },
+ // //鍒嗛〉鎺у埗
+ // handleSizeChange(res) {
+ // this.listData.pageIndex = 1;
+ // this.listData.pageSize = res;
+ // this.setViewTable();
+ // },
+ // handleCurrentChange(res) {
+ // this.listData.pageIndex = res;
+ // this.setViewTable();
+ // },
//琛ㄦ牸閫変腑浜嬩欢
handleSelectionChange(res) {
this.multipleSelection = res;
@@ -606,7 +816,7 @@
async getselectVerByDirid() {
this.verOption = [];
this.formInline.verid = "";
- const res = await dataLoader_selectVerByDirid(this.formInline.dirid);
+ const res = await dataLoader_selectVerByDirid({dirid:this.formInline.dirid});
if (res.code != 200) {
this.$message.error('鐗堟湰鍒楄〃鑾峰彇澶辫触');
@@ -662,8 +872,8 @@
border-radius: 5px;
}
.contentTable {
- width: 98%;
- height: 72%;
+ width: 97%;
+ height: 400px;
border: 1px solid white;
padding: 1%;
border-radius: 5px;
@@ -915,5 +1125,11 @@
background-color: #216fe6;
}
}
+ /deep/.el-tabs__active-bar {
+ background: #409eff;
+ }
+ /deep/ .el-tabs__item {
+ color: #409eff;
+ }
}
</style>
diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index cd7eed9..57c8755 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -10,7 +10,9 @@
></My-bread>
<el-divider />
<div class="updateContent">
- <div class="contentIquery">
+ <el-tabs v-model="activeTabName" @tab-click="handleTabClick">
+ <el-tab-pane :label="$t('dataManage.dataUpObj.uploaddata')" name="first">
+ <div class="contentIquery">
<el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item :label="$t('dataManage.dataUpObj.catalogue')">
<el-cascader
@@ -80,6 +82,12 @@
:disabled="tableData.length == 0 ? true : false"
>{{ $t('common.delete') }}</el-button
>
+ <el-button
+ icon="el-icon-data-line"
+ type="info"
+ disabled
+ >{{ $t('common.quayTest') }}</el-button
+ >
<el-button
icon="el-icon-folder-add"
type="warning"
@@ -91,10 +99,10 @@
</el-form>
</div>
<div class="contentTable">
- <el-table
- :data="tableData"
- border
- style="width: 100%"
+
+ <el-table
+ :data="tableData"
+ style="width: width:99%"
height="99%"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
@@ -105,15 +113,134 @@
width="70px"
fixed
/>
-
- <el-table-column
+ <el-table-column
align="center"
prop="name"
:label="$t('common.name')"
fixed
/>
+ <el-table-column
+ align="center"
+ prop="sizes"
+ :label="$t('common.size')"
+ fixed
+ :formatter="changeSizeFile"
+ />
+ <el-table-column
+ align="center"
+ prop="guid"
+ :label="$t('common.md5')"
+ fixed
+ />
</el-table>
- <!-- <div style="margin-top: 10px" class="pagination_box">
+ </div>
+
+ </el-tab-pane>
+ <el-tab-pane :label="$t('dataManage.dataUpObj.receiptdata')" name="second">
+<div class="contentIquery" style="padding-bottom: 0% !important;">
+ <el-form :inline="true" :model="formWarehousing" class="demo-form-inline">
+ <el-form-item :label="$t('dataManage.dataUpObj.describe')">
+<el-input v-model="formWarehousing.name" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button icon="el-icon-upload" @click="setWarehouseSearch"
+ class="primary">{{
+ $t('common.iquery')
+ }}</el-button>
+ <el-button @click="setWarehouseReset"
+ icon="el-icon-folder-add"
+ type="info"
+ >{{ $t('common.reset') }}</el-button
+ >
+ </el-form-item>
+ </el-form>
+ </div>
+ <div class="contentTable" style="height:500px">
+ <el-table
+ :data="waretableData"
+
+ style="width:99%"
+ height="92%"
+ >
+ <el-table-column
+ align="center"
+ type="index"
+ :label="$t('common.index')"
+ width="70px"
+ fixed
+ />
+ <el-table-column
+ align="center"
+ prop="name"
+ :label="$t('common.name')"
+ fixed
+ />
+ <el-table-column
+ align="center"
+ prop="dirName"
+ :label="$t('dataManage.dataUpObj.catalogue')"
+ fixed
+
+ />
+ <el-table-column
+ align="center"
+ prop="depName"
+ :label="$t('dataManage.dataUpObj.company')"
+ fixed
+ />
+ <el-table-column
+ align="center"
+ prop="verName"
+ :label="$t('dataManage.dataUpObj.versionNo')"
+ fixed
+ />
+ <el-table-column
+ align="center"
+ prop="type"
+ :label="$t('common.type')"
+ fixed
+ />
+ <el-table-column
+ align="center"
+ prop="sizes"
+ :label="$t('common.size')"
+ fixed
+ :formatter="changeSizeFile"
+ />
+ <el-table-column
+ align="center"
+ prop="tab"
+ :label="$t('dataManage.dataUpObj.tableName')"
+ fixed
+ />
+ <el-table-column
+ align="center"
+ prop="rows"
+ :label="$t('common.lineNuber')"
+ fixed
+ />
+ <el-table-column
+ align="center"
+ prop="desc"
+ :label="$t('dataManage.dataUpObj.describe')"
+ fixed
+ />
+ <el-table-column
+ align="center"
+ prop="uname"
+ :label="$t('dataManage.vmobj.createonuser')"
+ fixed
+ />
+ <el-table-column
+ align="center"
+ prop="createTime"
+ :label="$t('dataManage.vmobj.createontime')"
+ fixed
+ :formatter="changetimeFile"
+ />
+ </el-table>
+
+ <div style="margin-top: 10px" class="pagination_box">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -124,8 +251,11 @@
:total="count"
>
</el-pagination>
- </div> -->
</div>
+ </div>
+ </el-tab-pane>
+
+ </el-tabs>
</div>
</div>
@@ -135,7 +265,8 @@
import $ from 'jquery';
import MyBread from '../../components/MyBread.vue';
import { getToken } from '@/utils/auth';
-import { selectdirTab, queryDepTree,dataUploadSelectVerByDirid,dataUploadSelectPath,dataUploadSelectFiles,dataUploadDeleteFiles,dataUploadInsertFiles} from '../../api/api';
+import { selectdirTab, queryDepTree, dataUploadSelectVerByDirid, dataUploadSelectPath, dataUploadSelectFiles, dataUploadDeleteFiles, dataUploadInsertFiles,
+dataUpload_selectByPageForUpload} from '../../api/api';
export default {
name: 'dataUpdata',
components: {
@@ -143,21 +274,27 @@
},
data() {
return {
+ activeTabName: 'first',
btnStatus: 0,
count: 0,
formInline: {
- verid:'',
+ verid: '',
gather: '',
+ },
+ formWarehousing: {
+ name:''
},
catalogOption: [],
companyOption: [],
tableData: [],
+ waretableData:[],
listTable: [],
multipleSelection: [],
fullscreenLoading: false,
listData: {
pageIndex: 1,
pageSize: 10,
+ name: null,
},
pickerOptions: {
disabledDate(time) {
@@ -214,39 +351,120 @@
},
methods: {
+ changetimeFile(res){
- //鏁版嵁鍒犻櫎
- async setFileDelete() {
- this.handlerLoading(true);
- var data = JSON.stringify(this.multipleSelection);
- const res = await dataUploadDeleteFiles(data);
- if (res.code != 200) {
- this.$message.error('鍒犻櫎澶辫触');
+//shijianchuo鏄暣鏁帮紝鍚﹀垯瑕乸arseInt杞崲
+ var time = new Date(res.createTime);
+ var y = time.getFullYear();
+ var m = time.getMonth() + 1;
+ var d = time.getDate();
+ var h = time.getHours();
+ var mm = time.getMinutes();
+ var s = time.getSeconds();
+ return (
+ y +
+ '-' +
+ this.add0(m) +
+ '-' +
+ this.add0(d) +
+ ' ' +
+ h +
+ ':' +
+ mm +
+ ':' +
+ s
+ );
+ },
+ //鏍煎紡鍖栨椂闂�
+ add0(m) {
+ return m < 10 ? '0' + m : m;
+ },
+ setWarehouseSearch(){
+
+ this.listData={
+ pageIndex:1,
+ pageSize:10,
+ name:this.formWarehousing.name,
+ }
+ this.getAllWareTable();
+ },
+ setWarehouseReset(){
+ this.formWarehousing.name='';
+ this.listData={
+ pageIndex:1,
+ pageSize:10,
+ name:null,
+ }
+ this.getAllWareTable();
+ },
+ handleTabClick(tab, event) {
+ if(this.activeTabName =='second'){
+ this.setWarehouseReset();
+ }
+ },
+ handleSizeChange(val){
+ this.listData.pageIndex= 1;
+ this.listData.pageSize =val;
+ this.getAllWareTable();
+ },
+handleCurrentChange(val){
+ this.listData.pageIndex= val;
+ this.getAllWareTable();
+},
+ //鑾峰彇鍏ュ簱鏁版嵁鍒楄〃
+ async getAllWareTable(){
+
+ const res = await dataUpload_selectByPageForUpload(this.listData);
+ if (res.code != 200) {
+ this.$message.error('鍒楄〃鏁版嵁鑾峰彇澶辫触');
return;
}
- this.getFileLength();
+ debugger
+ this.count = res.count;
+ this.waretableData =res.result;
+ },
+ //澶у皬鍊兼敼璁�
+ changeSizeFile(row, column, cellValue, index) {
+
+ if (cellValue >= 1024) {
+ return parseFloat(cellValue / 1204).toFixed(3) + "GB"
+ } else {
+ return cellValue + "MB"
+ }
+ },
+ //鏁版嵁鍒犻櫎
+ async setFileDelete() {
+ this.handlerLoading(true);
+ var data = JSON.stringify(this.multipleSelection);
+ const res = await dataUploadDeleteFiles(data);
+ if (res.code != 200) {
+ this.$message.error('鍒犻櫎澶辫触');
+ return;
+ }
+ this.getFileLength();
this.handlerLoading(false);
},
//鏁版嵁鍏ュ簱
- async setFileWare() {
- if(this.multipleSelection.length==0){
- this.$message.error('璇烽�夋嫨瑕佸叆搴撶殑鏁版嵁');
+ async setFileWare() {
+ if (this.multipleSelection.length == 0) {
+ this.$message.error('璇烽�夋嫨瑕佸叆搴撶殑鏁版嵁');
return
}
- var obj = {
- metaEntity: this.formInline,
- fileEntities: this.multipleSelection
- };
- const res = await dataUploadInsertFiles(JSON.stringify(obj));
- if (res.code != 200) {
+ var obj = {
+ metaEntity: this.formInline,
+ fileEntities: this.multipleSelection
+ };
+
+ const res = await dataUploadInsertFiles(JSON.stringify(obj));
+ if (res.code != 200) {
this.$message.error('鏂囦欢涓婁紶鏁版嵁鑾峰彇澶辫触');
return;
}
- this.getFileLength();
+ this.getFileLength();
},
@@ -265,73 +483,73 @@
},
//鏂囦欢涓婁紶
setFileUpload() {
- this.handlerLoading(true);
+ this.handlerLoading(true);
var token = getToken();
- var formData = new FormData();
-
+ var formData = new FormData();
var fs = document.getElementById("uploadfile");
+ if (fs.files.length == 0) {
+ this.handlerLoading(false);
+ return this.$message.error('璇烽�夋嫨闇�瑕佷笂浼犵殑鏂囦欢');
+ }
for (var i = 0, c = fs.files.length; i < c; i++) {
formData.append(fs.files[i].name, fs.files[i]); // fs.files[i].name,file
}
- $.ajax(BASE_URL+"/dataUpload/uploadFiles?token="+token + "&path=" + this.formInline.path, {
+ $.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.getFileLength();
+ success: (rs) => {
+ this.getFileLength();
- alert("code = " + rs.code + ", msg = " + rs.msg + ", result = " + rs.result);
+ this.$message({
+ message: '涓婁紶鎴愬姛',
+ type: 'success'
+ });
},
- error:(rs)=> {
+ error: (rs) => {
alert("涓婁紶鏂囦欢澶辫触锛�");
}
});
-
- this.handlerLoading(false);
+ document.getElementById("uploadfile").value = "";
+ this.handlerLoading(false);
},
//鑾峰彇鏂囦欢涓婁紶鏁版嵁
- async getFileLength() {
+ async getFileLength() {
const res = await dataUploadSelectFiles(this.formInline.path);
if (res.code != 200) {
this.$message.error('鏂囦欢涓婁紶鏁版嵁鑾峰彇澶辫触');
return;
}
- if(res.result == null){
- this.count =0;
+
+ if (res.result == null) {
+ this.count = 0;
this.setClearTableData();
- }else{
+ } else {
this.count = res.result.length;
this.tableData = res.result;
}
-
-
- // this.listData.pageIndex = 1;
- // this.listData.pageSize = 10;
- // this.setViewTable();
},
//娓呴櫎琛ㄦ牸淇℃伅
setClearTableData() {
this.tableData = [];
this.listTable = [];
},
-
-
- //鍒嗛〉鎺у埗
- handleSizeChange(res) {
- this.listData.pageIndex = 1;
- this.listData.pageSize = res;
- this.setViewTable();
- },
- handleCurrentChange(res) {
- this.listData.pageIndex = res;
- this.setViewTable();
- },
+ // //鍒嗛〉鎺у埗
+ // handleSizeChange(res) {
+ // this.listData.pageIndex = 1;
+ // this.listData.pageSize = res;
+ // this.setViewTable();
+ // },
+ // handleCurrentChange(res) {
+ // this.listData.pageIndex = res;
+ // this.setViewTable();
+ // },
//琛ㄦ牸閫変腑浜嬩欢
handleSelectionChange(res) {
this.multipleSelection = res;
@@ -341,7 +559,7 @@
$("#uploadfile").click();
},
handleFileChange() {
- var fs = document.getElementById("uploadfile");
+ var fs = document.getElementById("uploadfile");
},
//褰撳墠鏃堕棿鑾峰彇
@@ -379,10 +597,10 @@
companyChange(value) {
this.formInline.depid = value;
},
- //鑾峰彇鏂囦欢涓婁紶璺緞
- async getFilePath() {
+ //鑾峰彇鏂囦欢涓婁紶璺緞
+ async getFilePath() {
const res = await dataUploadSelectPath();
- if (res.code != 200) {
+ if (res.code != 200) {
this.$message.error('鍗曚綅鍒楄〃鑾峰彇澶辫触');
return;
}
@@ -400,10 +618,9 @@
},
//鐗堟湰鍙疯幏鍙�
async getselectVerByDirid() {
- this.verOption=[];
- this.formInline.verid ="";
- const res = await dataUploadSelectVerByDirid(this.formInline.dirid);
-
+ this.verOption = [];
+ this.formInline.verid = "";
+ const res = await dataUploadSelectVerByDirid({ dirid: this.formInline.dirid });
if (res.code != 200) {
this.$message.error('鐗堟湰鍒楄〃鑾峰彇澶辫触');
return;
@@ -411,8 +628,6 @@
this.verOption = res.result;
this.formInline.verid = res.result[0].id;
},
-
-
//鐩綍鍒楄〃鑾峰彇
async getSelectdirTab() {
const res = await selectdirTab();
@@ -451,15 +666,15 @@
position: relative;
.contentIquery {
- width: 98%;
+ width: 97%;
height: 16%;
border: 1px solid white;
padding: 1%;
border-radius: 5px;
}
.contentTable {
- width: 98%;
- height: 72%;
+ width: 97%;
+ height: 400px;
border: 1px solid white;
padding: 1%;
border-radius: 5px;
@@ -596,5 +811,11 @@
/deep/.el-loading-spinner i {
color: #1890ff !important;
}
+ /deep/.el-tabs__active-bar {
+ background: #409eff;
+ }
+ /deep/ .el-tabs__item {
+ color: #409eff;
+ }
}
</style>
diff --git a/src/views/datamanage/metadataManage.vue b/src/views/datamanage/metadataManage.vue
index 1b58ada..f39c90a 100644
--- a/src/views/datamanage/metadataManage.vue
+++ b/src/views/datamanage/metadataManage.vue
@@ -64,6 +64,17 @@
</el-form>
</div>
<div class="bottom">
+ <div class="leftTree">
+ <ul>
+ <li
+ @click="getTableDesc(item)"
+ v-for="item in optionCount"
+ :class="{ active: activeName == item.tab }"
+ >
+ {{ item.tabDesc }}({{ item.tab }})
+ </li>
+ </ul>
+ </div>
<div class="rightTable">
<div class="table_box">
<el-table
@@ -73,34 +84,39 @@
height="99%"
>
<el-table-column type="selection" width="55" />
- <el-table-column prop="name" :label="$t('common.name')" />
- <el-table-column prop="format" :label="$t('common.format')" />
- <el-table-column prop="sizes" :label="$t('common.size')" />
+ <el-table-column prop="name" :label="$t('dataManage.vmobj.name')" />
<el-table-column
- prop="createUser"
+ prop="type"
+ :label="$t('dataManage.vmobj.format')"
+ />
+ <el-table-column
+ prop="sizes"
+ :label="$t('dataManage.vmobj.size')"
+ :formatter="stateFormatSizes"
+ />
+ <el-table-column
+ prop="depName"
+ :label="$t('dataManage.vmobj.depName')"
+ />
+ <el-table-column
+ prop="gather"
+ :label="$t('dataManage.vmobj.gather')"
+ :formatter="formatData"
+ />
+ <el-table-column
+ prop="describe"
+ :label="$t('dataManage.vmobj.describe')"
+ />
+ <el-table-column
+ prop="uname"
:label="$t('dataManage.vmobj.createonuser')"
/>
<el-table-column
prop="createTime"
:label="$t('dataManage.vmobj.createontime')"
- />
- <el-table-column
- prop="cs"
- :label="$t('dataManage.vmobj.coordSystem')"
- />
- <el-table-column
- prop="scale"
- :label="$t('dataManage.vmobj.scale')"
- />
- <el-table-column
- prop="resolution"
- :label="$t('dataManage.vmobj.resolpower')"
+ :formatter="formatData"
/>
- <el-table-column
- prop="descr"
- :label="$t('dataManage.vmobj.describe')"
- />
<el-table-column min-width="100" :label="$t('common.operate')">
<template slot-scope="scope">
<el-link style="color: white" @click="showDetail(scope.row)">{{
@@ -119,9 +135,9 @@
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
- :current-page="currentPage"
+ :current-page="listData.pageIndex"
:page-sizes="[10, 20, 50, 100]"
- :page-size="10"
+ :page-size="listData.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="count"
>
@@ -140,25 +156,29 @@
<div class="contentBox">
<p>{{ $t('dataManage.vmobj.name') }}锛歿{ itemdetail.name }}</p>
<el-divider></el-divider>
- <p>{{ $t('dataManage.vmobj.type') }}锛歿{ itemdetail.type }}</p>
+ <p>{{ $t('dataManage.vmobj.format') }}锛歿{ itemdetail.type }}</p>
<el-divider></el-divider>
- <p>{{ $t('common.format') }}锛歿{ itemdetail.format }}</p>
+ <p>{{ $t('common.size') }}锛歿{ setInfoBoxSize(itemdetail.sizes) }}</p>
+ <el-divider></el-divider>
+ <p>{{ $t('dataManage.vmobj.depName') }}锛歿{ itemdetail.depName }}</p>
+ <el-divider></el-divider>
+ <p>
+ {{ $t('dataManage.vmobj.gather') }}锛歿{
+ setInfoBoxTime(itemdetail.gather)
+ }}
+ </p>
+ <el-divider></el-divider>
+ <p>
+ {{ $t('dataManage.vmobj.describe') }}锛歿{ itemdetail.describe }}
+ </p>
+ <el-divider></el-divider>
+ <p>
+ {{ $t('dataManage.vmobj.createonuser') }}锛歿{ itemdetail.uname }}
+ </p>
<el-divider></el-divider>
<p>
{{ $t('dataManage.vmobj.createontime') }}锛歿{
- itemdetail.createTime
- }}
- </p>
- <el-divider></el-divider>
- <p>
- {{ $t('dataManage.vmobj.createonuser') }}锛歿{
- itemdetail.createUser
- }}
- </p>
- <el-divider></el-divider>
- <p>
- {{ $t('dataManage.vmobj.updateontime') }}锛歿{
- itemdetail.updateTime
+ setInfoBoxTime(itemdetail.createTime)
}}
</p>
<el-divider></el-divider>
@@ -168,15 +188,11 @@
}}
</p>
<el-divider></el-divider>
- <p>{{ $t('dataManage.vmobj.coordSystem') }}锛歿{ itemdetail.cs }}</p>
- <el-divider></el-divider>
- <p>{{ $t('dataManage.vmobj.scale') }}锛歿{ itemdetail.scale }}</p>
- <el-divider></el-divider>
<p>
- {{ $t('dataManage.vmobj.resolpower') }}锛歿{ itemdetail.resolution }}
+ {{ $t('dataManage.vmobj.updateontime') }}锛歿{
+ setInfoBoxTime(itemdetail.updateTime)
+ }}
</p>
- <el-divider></el-divider>
- <p>{{ $t('dataManage.vmobj.describe') }}锛歿{ itemdetail.descr }}</p>
</div>
</el-card>
</div>
@@ -199,41 +215,41 @@
<el-input v-model="editForm.name" autocomplete="off"></el-input>
</el-form-item>
<el-form-item
- :label="$t('dataManage.vmobj.type')"
+ :label="$t('dataManage.vmobj.format')"
:label-width="formLabelWidth"
>
<el-input v-model="editForm.type" autocomplete="off"></el-input>
</el-form-item>
<el-form-item
- :label="$t('common.format')"
+ :label="$t('dataManage.vmobj.size')"
:label-width="formLabelWidth"
>
- <el-input v-model="editForm.format" autocomplete="off"></el-input>
+ <el-input v-model="editForm.sizes" autocomplete="off"></el-input>
</el-form-item>
<el-form-item
- :label="$t('dataManage.vmobj.coordSystem')"
+ :label="$t('dataManage.vmobj.depName')"
:label-width="formLabelWidth"
>
- <el-input v-model="editForm.cs" autocomplete="off"></el-input>
- </el-form-item>
- <el-form-item
- :label="$t('dataManage.vmobj.scale')"
- :label-width="formLabelWidth"
- >
- <el-input v-model="editForm.scale" autocomplete="off"></el-input>
- </el-form-item>
- <el-form-item
- :label="$t('dataManage.vmobj.resolpower')"
- :label-width="formLabelWidth"
- >
- <el-input v-model="editForm.resolution" autocomplete="off"></el-input>
+ <!-- <el-input v-model="editForm.depName" autocomplete="off"></el-input> -->
+ <el-cascader
+ v-model="editForm.depid"
+ :options="companyOption"
+ @change="companyChange"
+ :props="cascader"
+ ></el-cascader>
</el-form-item>
<el-form-item
:label="$t('dataManage.vmobj.describe')"
:label-width="formLabelWidth"
>
- <el-input v-model="editForm.descr" 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')"
+ :label-width="formLabelWidth"
+ >
+ <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="medium" @click="cancelEdit()">{{
@@ -295,6 +311,8 @@
updateMeta,
deleteMeta,
insertMeta,
+ selectDictTab,
+ queryDepTree,
} from '../../api/api';
import MyBread from '../../components/MyBread.vue';
export default {
@@ -311,6 +329,9 @@
}
};
return {
+ companyOption: [],
+ activeName: '',
+ optionCount: [],
showCodeBox: false,
value: true,
multipleSelection: [],
@@ -349,16 +370,107 @@
insert: false,
update: false,
},
+ listData: {
+ pageSize: 10,
+ pageIndex: 1,
+ name: null,
+ },
+ cascader: {
+ label: 'name',
+ value: 'id',
+ children: 'children',
+ checkStrictly: true,
+ emitPath: false,
+ },
};
},
created() {
- this.getMetaData({
- pageIndex: 1,
- pageSize: 10,
- });
+ this.getMetaData();
+ this.getSelectDictTab();
this.showPermsBtn();
+ this.getQueryDepTree();
},
methods: {
+ //鍗曚綅鍒楄〃鑾峰彇
+ async getQueryDepTree() {
+ const res = await queryDepTree();
+ if (res.code != 200) {
+ this.$message.error('鍗曚綅鍒楄〃鑾峰彇澶辫触');
+ return;
+ }
+ // this.formInline.depid = 1;
+ this.companyOption = this.treeData(res.result);
+ },
+ //鏍煎紡鍖栧垪琛�
+ formatData(row, column) {
+ let data = row[column.property];
+ if (data == null) {
+ return data;
+ }
+ return this.format(data);
+ },
+ setInfoBoxTime(res) {
+ if (res == null) {
+ return res;
+ }
+ return this.format(res);
+ },
+ setInfoBoxSize(res) {
+ if (res >= 1024) {
+ return parseFloat(res / 1024).toFixed(3) + ' GB';
+ } else {
+ return res + ' MB';
+ }
+ },
+ //鏍煎紡鍖栨椂闂�
+ format(shijianchuo) {
+ //shijianchuo鏄暣鏁帮紝鍚﹀垯瑕乸arseInt杞崲
+ var time = new Date(shijianchuo);
+ var y = time.getFullYear();
+ var m = time.getMonth() + 1;
+ var d = time.getDate();
+ var h = time.getHours();
+ var mm = time.getMinutes();
+ var s = time.getSeconds();
+ return (
+ y +
+ '-' +
+ this.add0(m) +
+ '-' +
+ this.add0(d) +
+ ' ' +
+ h +
+ ':' +
+ mm +
+ ':' +
+ s
+ );
+ },
+ //鏍煎紡鍖栨椂闂�
+ add0(m) {
+ return m < 10 ? '0' + m : m;
+ },
+ //鍗曚綅杞崲
+ stateFormatSizes(row, column) {
+ if (row.sizes >= 1024) {
+ const val = parseFloat(row.sizes / 1024).toFixed(3);
+ return val + ' GB';
+ } else {
+ return row.sizes + ' MB';
+ }
+ },
+ //鐩綍鏍戣幏鍙�
+ async getSelectDictTab() {
+ const data = await selectDictTab();
+ if (data.code != 200) {
+ this.$message.error('涓嬫媺璋冪敤澶辫触');
+ }
+ this.optionCount = data.result;
+ this.activeName = data.result[0].tab;
+ },
+ getTableDesc(res) {
+ this.activeName = res.tab;
+ },
//鏄剧ず鏉冮檺鎸夐挳
showPermsBtn() {
let currentPerms = this.$store.state.currentPerms;
@@ -400,35 +512,26 @@
);
},
// 璇锋眰鏁版嵁鍐呭
- getMetaData(params) {
- select_meta_ByPageAndCount(params).then((res) => {
+ getMetaData() {
+ select_meta_ByPageAndCount(this.listData).then((res) => {
this.tableData = res.result;
this.count = res.count;
});
},
// 鏌ヨ
queryInfo() {
- let searchData = {
- name: this.queryForm.name.trim(),
- pageIndex: this.pageIndex,
- pageSize: this.pageSize,
- };
- select_meta_ByPageAndCount(searchData).then((res) => {
- if (res.code == 200) {
- this.tableData = res.result;
- this.count = res.count;
- } else {
- console.log('鏌ヨ鎺ュ彛鎶ラ敊');
- this.$notify.error({
- title: res.code,
- message: res.result,
- });
- }
- });
+ this.listData.name = this.queryForm.name.trim();
+ this.listData.pageSize = 10;
+ this.listData.pageIndex = 1;
+ this.getMetaData();
},
// 閲嶇疆鏌ヨ
resetInfo(formName) {
this.$refs[formName].resetFields();
+ this.listData.pageSize = 10;
+ this.listData.pageIndex = 1;
+ this.listData.name = null;
+ this.getMetaData();
},
//鏂板鎸夐挳
showAddDialog() {
@@ -450,7 +553,9 @@
setTimeout(() => {
this.fullscreenLoading = false;
if (res.code == 200) {
- this.getMetaData({ pageIndex: 1, pageSize: 10 });
+ this.listData.pageSize = 10;
+ this.listData.pageIndex = 1;
+ this.getMetaData();
this.$message({
message: '娣诲姞鎴愬姛',
type: 'success',
@@ -493,7 +598,9 @@
message: '鍒犻櫎鎴愬姛!',
});
this.multipleSelection = [];
- this.getMetaData({ pageIndex: 1, pageSize: 10 });
+ this.listData.pageSize = 10;
+ this.listData.pageIndex = 1;
+ this.getMetaData();
} else {
this.$message.error('鍒犻櫎澶辫触');
this.multipleSelection = [];
@@ -550,7 +657,9 @@
setTimeout(() => {
this.fullscreenLoading = false;
if (res.code == 200) {
- this.getMetaData({ pageIndex: 1, pageSize: 10 });
+ this.listData.pageSize = 10;
+ this.listData.pageIndex = 1;
+ this.getMetaData();
this.$message({
message: '淇敼鎴愬姛',
type: 'success',
@@ -586,13 +695,23 @@
},
handleSizeChange(val) {
- this.pageSize = val;
- this.queryInfo();
+ this.listData.pageSize = val;
+ this.listData.pageIndex = 1;
+ this.getMetaData();
},
handleCurrentChange(val) {
- this.pageIndex = val;
- this.currentPage = val;
- this.queryInfo();
+ this.listData.pageIndex = val;
+ this.getMetaData();
+ },
+ //鏍戝垪琛ㄧ敓鎴�
+ treeData(source) {
+ let cloneData = JSON.parse(JSON.stringify(source)); // 瀵规簮鏁版嵁娣卞害鍏嬮殕
+ return cloneData.filter((father) => {
+ // 寰幆鎵�鏈夐」
+ let branchArr = cloneData.filter((child) => father.id == child.pid); // 瀵规瘮ID锛屽垎鍒笂涓嬬骇鑿滃崟锛屽苟杩斿洖鏁版嵁
+ branchArr.length > 0 ? (father.children = branchArr) : ''; // 缁欑埗绾ф坊鍔犱竴涓猚hildren灞炴�э紝骞惰祴鍊�
+ return father.pid == 0; // 杩斿洖涓�绾ц彍鍗�
+ });
},
},
};
@@ -617,15 +736,39 @@
}
}
.bottom {
- width: 98%;
+ width: 100%;
margin-top: 1%;
height: 74%;
- padding: 1%;
- border: 1px solid white;
- border-radius: 5px;
- .rightTable {
+ display: flex;
+ justify-content: space-between;
+ .leftTree {
+ width: 15%;
height: 100%;
- width: 100%;
+ border: 1px solid white;
+ border-radius: 5px;
+ padding: 1%;
+ max-height: 670px;
+ overflow-y: auto;
+ li {
+ color: white;
+ border-bottom: 1px solid white;
+ line-height: 30px;
+ text-align: center;
+ }
+ li:hover {
+ background: rgba(255, 255, 255, 0.3);
+ }
+ .active {
+ color: #409eff;
+ }
+ }
+ .rightTable {
+ width: 80%;
+ height: 100%;
+ border: 1px solid white;
+
+ border-radius: 5px;
+ padding: 1%;
.table_box {
width: 100%;
height: 93%;
diff --git a/src/views/datamanage/styleManage.vue b/src/views/datamanage/styleManage.vue
index 6abc0ea..49b36ea 100644
--- a/src/views/datamanage/styleManage.vue
+++ b/src/views/datamanage/styleManage.vue
@@ -31,7 +31,7 @@
>{{ $t('common.empty') }}</el-button
>
<el-button v-if="btnStatus.insert"
- @click="InsertFormdialog = true"
+ @click="setInsertShow()"
icon="el-icon-edit"
type="success"
size="small"
@@ -258,7 +258,13 @@
:label="$t('dataManage.styleObj.dirid')"
:label-width="formLabelWidth"
>
- <el-input
+ <el-cascader
+ v-model="upform.dirid"
+ :options="editcatalogOption"
+ @change="catalogChange"
+ :props="cascader" style="width:730px"
+ ></el-cascader>
+ <!-- <el-input
v-model="upform.dirValue"
disabled
autocomplete="off"
@@ -268,13 +274,20 @@
@click="showDirTree(1)"
style="margin-left: 10px"
><i class="el-icon-plus"></i
- ></el-link>
+ ></el-link> -->
</el-form-item>
<el-form-item
:label="$t('dataManage.styleObj.depid')"
:label-width="formLabelWidth"
>
- <el-input
+ <el-cascader
+ v-model="upform.depid"
+ :options="editCompanyOption"
+ @change="editcompanyChange"
+ :props="cascader"
+ style="width:730px"
+ ></el-cascader>
+ <!-- <el-input
v-model="upform.depValue"
disabled
autocomplete="off"
@@ -284,7 +297,7 @@
@click="showDepTree(1)"
style="margin-left: 10px"
><i class="el-icon-plus"></i
- ></el-link>
+ ></el-link> -->
</el-form-item>
<el-form-item
:label="$t('dataManage.styleObj.ver')"
@@ -417,7 +430,14 @@
:label="$t('dataManage.styleObj.dirid')"
:label-width="formLabelWidth"
>
- <el-input
+ <el-cascader
+ v-model="insertform.dirid"
+ :options="catalogOption"
+ @change="catalogChange"
+ :props="cascader"
+ style="width:730px"
+ ></el-cascader>
+ <!-- <el-input
v-model="insertform.dirValue"
disabled
autocomplete="off"
@@ -427,13 +447,20 @@
@click="showDirTree(0)"
style="margin-left: 10px"
><i class="el-icon-plus"></i
- ></el-link>
+ ></el-link> -->
</el-form-item>
<el-form-item
:label="$t('dataManage.styleObj.depid')"
:label-width="formLabelWidth"
>
- <el-input
+ <el-cascader
+ v-model="insertform.depid"
+ :options="companyOption"
+ @change="companyChange"
+ :props="cascader"
+ style="width:730px"
+ ></el-cascader>
+ <!-- <el-input
v-model="insertform.depValue"
disabled
autocomplete="off"
@@ -443,7 +470,7 @@
@click="showDepTree(0)"
style="margin-left: 10px"
><i class="el-icon-plus"></i
- ></el-link>
+ ></el-link> -->
</el-form-item>
<el-form-item
:label="$t('dataManage.styleObj.ver')"
@@ -595,6 +622,8 @@
deleteStyles,
updateStyle,
upload_style,
+ queryDepTree,
+ selectdirTab
} from "../../api/api";
export default {
name: "styleManage",
@@ -641,11 +670,24 @@
insert: false,
update: false,
},
+
+ companyOption:[],
+ catalogOption:[],
+ editCompanyOption:[],
+ editcatalogOption:[],
+ cascader: {
+ label: 'name',
+ value: 'id',
+ children: 'children',
+ checkStrictly: true,
+ emitPath: false,
+ },
};
},
created() {
this.getRoleTabelData();
this.showPermsBtn();
+ this.getQueryDepTree();this.getSelectdirTab();
},
methods: {
showPermsBtn() {
@@ -1092,7 +1134,7 @@
this.upflag = false;
this.dialogFormVisible = false;
this.upform = {};
- this.filesReset();
+ // this.filesReset();
},
submitForm(formName) {
this.getRoleTabelData();
@@ -1129,6 +1171,7 @@
},
handleEdit(index, row) {
+
this.upflag = true;
this.dialogFormVisible = true;
this.upform = row;
@@ -1161,6 +1204,56 @@
"height=800, width=1500, top=150, left=350, toolbar=no, menubar=no, scrollbars=no, resizable=no, location=no, status=no"
);
},
+ catalogChange(res) {
+ this.insertform.dirid = res;
+ this.upform.dirid =res;
+
+ },
+ editcompanyChange(res){
+this.upform.depid = res;
+ },
+ companyChange(res){
+ this.insertform.depid = res;
+
+ },
+ //鏂板鏁版嵁
+ setInsertShow(){
+this.InsertFormdialog = true;
+ },
+ //鐩綍鍒楄〃鑾峰彇
+ async getSelectdirTab() {
+ const res = await selectdirTab();
+ if (res.code != 200) {
+ this.$message.error('鐩綍鍒楄〃鑾峰彇澶辫触');
+ return;
+ }
+ this.insertform.dirid = 1;
+ this.upform.dirid = 1;
+ this.catalogOption = this.treeData(res.result);
+ this.editcatalogOption= this.treeData(res.result);
+ },
+ //鍗曚綅鍒楄〃鑾峰彇
+ async getQueryDepTree() {
+ const res = await queryDepTree();
+ if (res.code != 200) {
+ this.$message.error('鍗曚綅鍒楄〃鑾峰彇澶辫触');
+ return;
+ }
+ this.insertform.depid = 1;
+ this.upform.depid = 1;
+ this.companyOption = this.treeData(res.result);
+ this.editCompanyOption= this.treeData(res.result);
+ },
+ //鏍戝垪琛ㄧ敓鎴�
+ treeData(source) {
+ let cloneData = JSON.parse(JSON.stringify(source)); // 瀵规簮鏁版嵁娣卞害鍏嬮殕
+ return cloneData.filter((father) => {
+ // 寰幆鎵�鏈夐」
+ let branchArr = cloneData.filter((child) => father.id == child.pid); // 瀵规瘮ID锛屽垎鍒笂涓嬬骇鑿滃崟锛屽苟杩斿洖鏁版嵁
+ branchArr.length > 0 ? (father.children = branchArr) : ''; // 缁欑埗绾ф坊鍔犱竴涓猚hildren灞炴�э紝骞惰祴鍊�
+ return father.pid == 0; // 杩斿洖涓�绾ц彍鍗�
+ });
+ },
},
};
</script>
diff --git a/src/views/datamanage/versionManage.vue b/src/views/datamanage/versionManage.vue
index dab9995..bc8d5c6 100644
--- a/src/views/datamanage/versionManage.vue
+++ b/src/views/datamanage/versionManage.vue
@@ -95,7 +95,10 @@
<template slot-scope="scope">
<el-button
v-if="btnStatus.update"
- @click="handleEdit(scope.$index, scope.row)"
+ @click="
+ handleEdit(scope.$index, scope.row);
+ getSelectdirTab();
+ "
type="warning"
size="small"
>{{ $t('common.update') }}</el-button
@@ -146,7 +149,7 @@
<el-cascader
style="width: 300px"
v-model="upform.dirid"
- :options="catalogOption"
+ :options="editcatalogOption"
@change="upCatalogChange"
:props="cascader"
></el-cascader>
@@ -380,10 +383,24 @@
this.$message.error('鐩綍鍒楄〃鑾峰彇澶辫触');
return;
}
+ this.insertform.name = this.getYMD();
this.insertform.path = 1;
this.insertform.dirid = 1;
+ this.upform.dirid == 1;
this.catalogOption = this.treeData(res.result);
+ this.editcatalogOption = this.treeData(res.result);
},
+ getYMD() {
+ let myDate = new Date();
+ let myYear = myDate.getFullYear(); //鑾峰彇瀹屾暣鐨勫勾浠�(4浣�,1970-????)
+ let myMonth = myDate.getMonth() + 1; //鑾峰彇褰撳墠鏈堜唤(0-11,0浠ｈ〃1鏈�)
+ let myToday = myDate.getDate(); //鑾峰彇褰撳墠鏃�(1-31)
+ myMonth = myMonth > 9 ? myMonth : '0' + myMonth;
+ myToday = myToday > 9 ? myToday : '0' + myToday;
+ let nowDate = 'V' + myYear + myMonth + myToday;
+ return nowDate;
+ },
+
//鏍戝垪琛ㄧ敓鎴�
treeData(source) {
let cloneData = JSON.parse(JSON.stringify(source)); // 瀵规簮鏁版嵁娣卞害鍏嬮殕
--
Gitblit v1.9.3