From 7f0f5bc0be05b8a9206bcff083442379504db009 Mon Sep 17 00:00:00 2001
From: lixuliang <lixuliang_hd@126.com>
Date: 星期二, 30 四月 2024 14:17:06 +0800
Subject: [PATCH] Merge branch 'master' of http://103.135.160.14:9034/r/~shiwenshuai/DTKZZTX
---
src/views/datamanage/dataUpdata.vue | 91 +++++++++++++++++++++------------------------
1 files changed, 43 insertions(+), 48 deletions(-)
diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index c4fefc1..ab7d488 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -4,8 +4,8 @@
element-loading-background="rgba(0, 0, 0, 0.8)"
:element-loading-text="loadText">
<My-bread :list="[
- `${$t('dataManage.dataManage')}`,
- `${$t('dataManage.dataUpdata')}`,
+ `鏁版嵁璧勬簮绠＄悊`,
+ `澶氬獟浣撶礌鏉愮鐞哷,
]"></My-bread>
<el-divider />
<el-tabs type="card"
@@ -20,7 +20,7 @@
:model="formInline"
class="demo-form-inline">
<!-- 鍏ュ簱绫诲瀷 -->
- <el-form-item :label="$t('dataManage.dataUpObj.UploadType')"
+ <!-- <el-form-item :label="$t('dataManage.dataUpObj.UploadType')"
style="margin-right: 2%"
size="small">
<el-select :disabled="tableData.length == 0 ? false : true"
@@ -28,24 +28,19 @@
@change="uploadTypeChange"
:popper-append-to-body="false"
placeholder="璇烽�夋嫨">
- <!-- <el-option
- v-for="item in uploadOption"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- ></el-option>-->
+
- <el-option :label="$t('shuJuGuanLi.pselect.dFile')"
- value="v1" />
- <el-option :label="$t('shuJuGuanLi.pselect.dFiles')"
- value="v2" />
- <el-option :label="$t('shuJuGuanLi.pselect.dFfilest')"
- value="v3" />
- </el-select>
+ <el-option :label="$t('shuJuGuanLi.pselect.dFile')"
+ value="v1" />
+ <el-option :label="$t('shuJuGuanLi.pselect.dFiles')"
+ value="v2" />
+ <el-option :label="$t('shuJuGuanLi.pselect.dFfilest')"
+ value="v3" />
+ </el-select>
- </el-form-item>
+ </el-form-item> -->
<!-- 瀛樺偍鐩綍 -->
- <el-form-item style="margin-right: 2%"
+ <!-- <el-form-item style="margin-right: 2%"
v-show="uploadFlag"
:label="$t('dataManage.dataUpObj.storageDirectory')"
size="small">
@@ -62,8 +57,8 @@
:props="cascader"
@node-click="catalogChange" />
</el-option>
- </el-select>
- <!-- <el-cascader
+ </el-select> -->
+ <!-- <el-cascader
:disabled="tableData.length == 0 ? false : true"
v-model="formInline.dirid"
:options="catalogOption"
@@ -71,9 +66,9 @@
ref="selectcascader"
:props="cascader"
></el-cascader> -->
- </el-form-item>
+ <!-- </el-form-item> -->
<!-- 椤圭洰鍚嶇О -->
- <el-form-item style="margin-right: 2%"
+ <!-- <el-form-item style="margin-right: 2%"
v-show="!uploadFlag"
:label="$t('dataManage.dataUpObj.entryName')"
size="small">
@@ -87,9 +82,9 @@
:label="item.name"
:value="item.name"></el-option>
</el-select>
- </el-form-item>
+ </el-form-item> -->
<!-- 鏁版嵁鐗堟湰 -->
- <el-form-item :label="$t('dataManage.dataUpObj.dataVersion')"
+ <!-- <el-form-item :label="$t('dataManage.dataUpObj.dataVersion')"
style="margin-right: 2%"
size="small">
<el-select :popper-append-to-body="false"
@@ -102,21 +97,15 @@
:value="item.id">
</el-option>
</el-select>
- </el-form-item>
+ </el-form-item> -->
<!-- 鏁版嵁涓撲笟 -->
- <el-form-item :label="$t('dataManage.dataUpObj.dataSpecialty')"
+ <!-- <el-form-item :label="$t('dataManage.dataUpObj.dataSpecialty')"
style="margin-right: 2%"
size="small">
<el-select :popper-append-to-body="false"
:disabled="tableData.length == 0 ? false : true"
v-model="formInline.specialtyId"
:placeholder="$t('common.choose')">
- <!-- <el-option
- v-for="item in specialtyOption"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>-->
<el-option :label="$t('shuJuGuanLi.pselect.SurveyingAndMapping')"
value="娴嬮噺涓撲笟" />
@@ -129,9 +118,9 @@
<el-option :label="$t('shuJuGuanLi.pselect.LineDiscipline')"
value='绾胯矾涓撲笟' />
</el-select>
- </el-form-item>
+ </el-form-item> -->
<!-- 鍧愭爣绯� -->
- <el-form-item :label="$t('dataManage.dataUpObj.coordinateSystem')"
+ <!-- <el-form-item :label="$t('dataManage.dataUpObj.coordinateSystem')"
style="margin-right: 3%"
size="small">
<el-select :popper-append-to-body="false"
@@ -144,7 +133,7 @@
:value="item.epsgcode">
</el-option>
</el-select>
- </el-form-item>
+ </el-form-item> -->
<div class="flex_box">
<div style="margin-right: auto">
<!-- 绾胯矾绫诲埆 -->
@@ -204,7 +193,7 @@
</el-input>
</el-form-item>
<!-- 閫夋嫨鍏冩暟鎹� -->
- <el-form-item v-show="uploadFlag"
+ <!-- <el-form-item v-show="uploadFlag"
v-if="formInline.uploadType == 'v1'"
style="padding-left: 16px">
<el-link :disabled="tableData.length == 0 ? false : true"
@@ -225,8 +214,8 @@
accept=".xls,.xlsx"
style="display: none"
@change="handleMetaFileChange"></input>
- </el-form-item>
- <el-form-item v-show="uploadFlag"
+ </el-form-item> -->
+ <!-- <el-form-item v-show="uploadFlag"
v-if="formInline.uploadType == 'v1'"
size="small">
<el-input :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valueone')"
@@ -234,7 +223,7 @@
style="width:200px;"
disabled>
</el-input>
- </el-form-item>
+ </el-form-item> -->
<!-- 閫夋嫨WBS鏁版嵁 -->
<el-form-item v-show="!uploadFlag">
<el-link :disabled="tableData.length == 0 ? false : true"
@@ -268,8 +257,7 @@
<div>
<el-form-item>
<!-- 涓婁紶 -->
- <el-button v-if="menuStatus.upload"
- :disabled="tableData.length == 0 ? false : true"
+ <el-button :disabled="tableData.length == 0 ? false : true"
@click="setFileUpload"
size="small"
icon="el-icon-upload"
@@ -278,16 +266,14 @@
}}
</el-button>
<!-- 鍒犻櫎 -->
- <el-button v-if="menuStatus.delete"
- :disabled="multipleSelection.length == 0 ? true : false"
+ <el-button :disabled="multipleSelection.length == 0 ? true : false"
icon="el-icon-delete"
size="small"
@click="setFileDelete"
type="danger">{{ $t('common.delete') }}
</el-button>
<!-- 鍏ュ簱 -->
- <el-button v-if="menuStatus.insert"
- @click="setFileWare"
+ <el-button @click="setFileWare"
size="small"
:disabled="tableData.length == 0 ? true : false"
icon="el-icon-folder-add"
@@ -1424,7 +1410,7 @@
},
mounted () {
- this.noteVisible=true;
+ // this.noteVisible=true;
//鑾峰彇鍧愭爣绯�
this.setCoordinateSystem();
//鑾峰彇椤圭洰鍚嶇О
@@ -2945,6 +2931,15 @@
};
</script>
<style lang="less" scoped>
+.subpage_Box {
+ width: calc(98% - 20px);
+ height: 88% !important;
+ padding: 1%;
+ background: #f4f8ff;
+ margin: 10px;
+ position: absolute;
+ /* overflow: auto; */
+}
.bottom {
width: 100%;
margin-top: 0.5%;
@@ -2952,11 +2947,11 @@
height: 570px;
display: flex;
justify-content: space-between;
-
+ background: #f4f8ff;
.rightTable {
width: 98%;
height: 92%;
-
+ background: #f4f8ff;
border-radius: 5px;
padding: 1%;
--
Gitblit v1.9.3