From 8e44ce5a0c75861e5fdca999e3dc5b6f61faa585 Mon Sep 17 00:00:00 2001
From: TreeWish <1131093754@qq.com>
Date: 星期四, 16 二月 2023 09:42:06 +0800
Subject: [PATCH] Merge branch 'master' of http://103.85.165.99:8989/r/LFWEB_NEW
---
src/views/datamanage/dataUpdata.vue | 145 +++++++++++++++++++++++++++++-------------------
1 files changed, 87 insertions(+), 58 deletions(-)
diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index e3e0e61..36ff6c5 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -25,7 +25,7 @@
class="demo-form-inline"
>
<!-- 鍏ュ簱绫诲瀷 -->
- <el-form-item :label="$t('dataManage.dataUpObj.UploadType')">
+ <el-form-item :label="$t('dataManage.dataUpObj.UploadType')" style="margin-right: 2%">
<el-select
:disabled="tableData.length == 0 ? false : true"
v-model="formInline.uploadType"
@@ -43,6 +43,7 @@
</el-form-item>
<!-- 瀛樺偍鐩綍 -->
<el-form-item
+ style="margin-right: 2%"
v-show="uploadFlag"
:label="$t('dataManage.dataUpObj.storageDirectory')"
>
@@ -76,6 +77,7 @@
</el-form-item>
<!-- 椤圭洰鍚嶇О -->
<el-form-item
+ style="margin-right: 2%"
v-show="!uploadFlag"
:label="$t('dataManage.dataUpObj.entryName')"
>
@@ -95,7 +97,7 @@
</el-select>
</el-form-item>
<!-- 鏁版嵁鐗堟湰 -->
- <el-form-item :label="$t('dataManage.dataUpObj.dataVersion')">
+ <el-form-item :label="$t('dataManage.dataUpObj.dataVersion')" style="margin-right: 2%">
<el-select
:popper-append-to-body="false"
:disabled="tableData.length == 0 ? false : true"
@@ -112,7 +114,7 @@
</el-select>
</el-form-item>
<!-- 鏁版嵁涓撲笟 -->
- <el-form-item :label="$t('dataManage.dataUpObj.dataSpecialty')">
+ <el-form-item :label="$t('dataManage.dataUpObj.dataSpecialty')" style="margin-right: 2%">
<el-select
:popper-append-to-body="false"
:disabled="tableData.length == 0 ? false : true"
@@ -129,7 +131,7 @@
</el-select>
</el-form-item>
<!-- 鍧愭爣绯� -->
- <el-form-item :label="$t('dataManage.dataUpObj.coordinateSystem')">
+ <el-form-item :label="$t('dataManage.dataUpObj.coordinateSystem')" style="margin-right: 3%">
<el-select
:popper-append-to-body="false"
:disabled="tableData.length == 0 ? false : true"
@@ -175,7 +177,7 @@
<el-input
placeholder="璇疯緭鍏ュ唴瀹�"
v-model="formInline.specialtyData"
- style="width:350px;"
+ style="width:210px;"
disabled
>
</el-input>
@@ -205,11 +207,11 @@
@change="handleMetaFileChange"
></input>
</el-form-item>
- <el-form-item v-show="uploadFlag">
+ <el-form-item v-show="uploadFlag" style="margin-left: 0.7%;">
<el-input
placeholder="璇疯緭鍏ュ唴瀹�"
v-model="formInline.metaData"
- style="width:350px;"
+ style="width:210px;"
disabled
>
</el-input>
@@ -244,12 +246,12 @@
<el-input
placeholder="璇烽�夋嫨WBS鏁版嵁"
v-model="formInline.wbsData"
- style="width:350px;"
+ style="width:210px;"
disabled
>
</el-input>
</el-form-item>
- <el-form-item>
+ <el-form-item style="float: right;">
<!-- 涓婁紶 -->
<el-button
v-if="menuStatus.upload"
@@ -270,16 +272,6 @@
@click="setFileDelete"
type="danger"
>{{ $t('common.delete') }}</el-button>
- <!-- 璐ㄦ -->
- <el-button
- 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>
<!-- 鍏ュ簱 -->
<el-button
v-if="menuStatus.insert"
@@ -289,6 +281,17 @@
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()"
+ >{{$t('common.quayTest')}}
+ </el-button>
</el-form-item>
</el-form>
@@ -297,6 +300,7 @@
<!-- 涓婁紶鏁版嵁鍒楄〃 -->
<div class="subpage_Content subpage_Div">
<el-table
+ style="min-height: 470px;"
:data="tableData"
@selection-change="handleSelectionChange"
>
@@ -363,13 +367,21 @@
:model="formWarehousing"
class="demo-form-inline"
>
- <el-form-item :label="$t('dataManage.dataUpObj.describe')">
+ <el-form-item :label="$t('dataManage.dataUpObj.describe')" >
<el-input
v-model="formWarehousing.name"
placeholder="璇疯緭鍏ュ唴瀹�"
+ style="width: 200px;"
></el-input>
</el-form-item>
- <el-form-item>
+ <el-form-item style="float: right;">
+ <el-button
+ v-if="menuStatus.delete"
+ @click="setWarehouseDel"
+ icon="el-icon-folder-delete"
+ type="danger"
+ size="small"
+ >{{ $t('common.delete') }}</el-button>
<el-button
@click="setWarehouseSearch"
icon="el-icon-upload"
@@ -384,39 +396,29 @@
size="small"
type="info"
>{{ $t('common.reset') }}</el-button>
- <el-button
- v-if="menuStatus.delete"
- @click="setWarehouseDel"
- icon="el-icon-folder-delete"
- type="danger"
- size="small"
- >{{ $t('common.delete') }}</el-button>
</el-form-item>
- <el-form-item>
+ <el-form-item style="float: right;">
<el-button
v-if="menuStatus.upload"
:disabled="multipleDelete.length == 0 ? true : false"
@click="setEnclosure"
icon="el-icon-folder-opened"
- type="warning"
+ type="success"
size="small"
>{{ $t('common.enclosure') }}</el-button>
</el-form-item>
</el-form>
</div>
- <div
- class="subpage_Content subpage_Div"
- style="min-height:330px"
- >
- <div class="contentTable">
- <el-table
- ref="multipleTable"
- :data="waretableData"
- tooltip-effect="dark"
- style="width: 100%"
- @selection-change="handleDelteChange"
- >
- <el-table-column
+ <!-- 鍏ュ簱 -->
+ <div class="bottom">
+ <div class="rightTable subpage_Div">
+ <div class="table_box">
+ <el-table
+ ref="filterTable"
+ :data="waretableData"
+ style="width: 100%"
+ height="99%">
+ <el-table-column
type="selection"
width="55"
>
@@ -494,21 +496,24 @@
:formatter="changetimeFile"
width="100"
/>
- </el-table>
- </div>
- <div>
- <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>
+ </el-table>
</div>
+ <div
+ class="pagination_box"
+ >
+ <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>
</el-tab-pane>
</el-tabs>
<!-- 璐ㄦ寮圭獥 -->
@@ -2429,4 +2434,28 @@
}
};
</script>
-
\ No newline at end of file
+<style lang="less" scoped>
+ .bottom {
+ width: 100%;
+ margin-top: 1%;
+ // height: 74%;
+ height: 570px;
+ display: flex;
+ justify-content: space-between;
+
+ .rightTable {
+ width: 98%;
+ height: 92%;
+
+ border-radius: 5px;
+ padding: 1%;
+ .table_box {
+ width: 100%;
+ height: 93%;
+ margin: 0 auto;
+ overflow: auto;
+ }
+ }
+ }
+
+</style>
\ No newline at end of file
--
Gitblit v1.9.3