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/dataLoader.vue | 264 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 240 insertions(+), 24 deletions(-)
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>
--
Gitblit v1.9.3