From ec86ce630c3bf6ef4abe5f52ecde21eeda03c5e7 Mon Sep 17 00:00:00 2001 From: WX <1377869194@qq.com> Date: 星期二, 15 八月 2023 10:59:21 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.20.39:8989/r/LunarMidplane --- src/views/datamanage/dataUpdata.vue | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue index 738e08a..a967df8 100644 --- a/src/views/datamanage/dataUpdata.vue +++ b/src/views/datamanage/dataUpdata.vue @@ -130,6 +130,7 @@ :disabled="tableData.length == 0 ? false : true" v-model="formInline.verid" :placeholder="$t('common.choose')" + size="small" > <el-option v-for="item in verOption" @@ -141,7 +142,7 @@ </el-select> </el-form-item> <!-- 鏁版嵁涓撲笟 --> - <el-form-item + <!-- <el-form-item :label="$t('dataManage.dataUpObj.dataSpecialty')" style="margin-right: 2%" size="small" @@ -152,12 +153,6 @@ 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')" @@ -180,9 +175,10 @@ value='绾胯矾涓撲笟' /> </el-select> - </el-form-item> + </el-form-item> --> <!-- 鍧愭爣绯� --> <el-form-item + v-show="false" :label="$t('dataManage.dataUpObj.coordinateSystem')" style="margin-right: 3%" size="small" @@ -1924,6 +1920,7 @@ getPerms() { var val = this.$store.state.currentPerms; var permsEntity = this.$store.state.permsEntity; + if (!permsEntity || !permsEntity.length) { getPerms().then((res) => { if (res.code == 200) { @@ -2707,8 +2704,11 @@ return; } this.entryOption = data.result; - this.formInline.entryId = this.entryOption[0].name; - this.formInline.dirid = this.entryOption[0].id; + if (this.entryOption.length > 0) { + this.formInline.entryId = this.entryOption[0].name; + this.formInline.dirid = this.entryOption[0].id; + } + this.getselectVerByDirid(); }, @@ -3174,4 +3174,10 @@ .text-center { text-align: center; } +/deep/ .el-tabs--card > .el-tabs__header .el-tabs__nav { + border: none !important; +} +/deep/ .el-tabs--card > .el-tabs__header .el-tabs__item { + border: none !important; +} </style> -- Gitblit v1.9.3