From cf3f4fe7ae304714c83414b1627fa1817e163eb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 26 May 2021 19:35:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2&=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/languages/cn.js | 4 ++ src/components/tableToolsBar/index.vue | 11 ++-- src/pages/localTool/standAutoSplit/index.vue | 40 +++++------ src/pages/localTool/standContrast/index.vue | 10 ++- .../localTool/standardRecognition/index.vue | 14 ++-- .../domesticStandardsAndRegulations/index.vue | 66 +++++++++++-------- src/pages/standardComparisonLibrary/index.vue | 9 +-- 7 files changed, 80 insertions(+), 74 deletions(-) diff --git a/src/assets/languages/cn.js b/src/assets/languages/cn.js index 056dc3a6f..5e38c6dea 100644 --- a/src/assets/languages/cn.js +++ b/src/assets/languages/cn.js @@ -99,6 +99,10 @@ export const m = { country: '国家', tableName: '表格名称', applicableModels: '适用车型', + applicableProductLine: '适用产品线', + associatedModule: '关联模块', + searchByApplicableProductLine: '根据适用产品线查找', + SearchByAssociatedModule: '根据关联模块查找', typesOfEnergy: '能源种类', pleaseSelectRegion: '请选择区域', lookUpByTableName: '根据表格名称查找', diff --git a/src/components/tableToolsBar/index.vue b/src/components/tableToolsBar/index.vue index b59b53091..9e8908925 100644 --- a/src/components/tableToolsBar/index.vue +++ b/src/components/tableToolsBar/index.vue @@ -8,14 +8,16 @@
- {{$t('m.advancedSearch')}} + @click="advancedSearch" style="margin-right: 5px" >{{$t('m.search')}} + size="small" + > + 清空 +
@@ -114,6 +116,7 @@ export default { padding: 8px 20px; .flex(); justify-content: flex-end; + margin-top: -20px; } } .tools-bar-wrapper{ diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index 82f421a16..9333c7b81 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -11,16 +11,14 @@ + @click="searchStandList">搜索 + @click="clearSearchStand">清空 @@ -28,10 +26,10 @@
- 拆分 - 上传 - 导入拆分结果 - 删除 + 拆分 + 上传 + 导入拆分结果 + 删除
@@ -168,7 +166,6 @@ @@ -239,8 +235,8 @@ @pageSizeChange="addFileStandPageSizeChange">
- 取消 - 拆分 + 取消 + 拆分
正在获取数据 @@ -377,7 +373,7 @@ name="file" :on-change="handleUploadChange2" ref="importFileAboutStand"> - {{$t('m.upload')}} + {{$t('m.upload')}}
@@ -489,8 +485,8 @@ ref="importFileAboutStand" :disabled="importSplitResultLoading" > - {{$t('m.upload')}} - 模板下载 + {{$t('m.upload')}} + 模板下载
@@ -550,13 +546,11 @@ icon="el-icon-search" type="primary" class="common-button-primary" - round @click="getSearchSarBussStandPage"> @@ -633,14 +627,12 @@
确定 { this.$http.post('lawss/sarFileSplitInfo/batchDelete', { ids: this.selectedList.join(',') @@ -1347,7 +1339,7 @@ export default { cancelButtonText: '取消', type: 'warning', confirmButtonClass: 'common-button-primary', - roundButton: true + roundButton: false }).then(() => { this.spinShow = true let nowstandItem = JSON.parse(JSON.stringify(data)) @@ -1454,7 +1446,7 @@ export default { cancelButtonText: '取消', type: 'warning', confirmButtonClass: 'common-button-primary', - roundButton: true + roundButton: false }).then(() => { this.$http.post('lawss/sarFileSplitInfo/batchDelete', { ids: id diff --git a/src/pages/localTool/standContrast/index.vue b/src/pages/localTool/standContrast/index.vue index 504ed1176..15d49d176 100644 --- a/src/pages/localTool/standContrast/index.vue +++ b/src/pages/localTool/standContrast/index.vue @@ -16,16 +16,14 @@ + @click="sarStandCompareHisInfo">搜索 + size="mini" + @click="clearSearchStand">清空
diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue index 7ead595b5..33ee6b46b 100644 --- a/src/pages/localTool/standardRecognition/index.vue +++ b/src/pages/localTool/standardRecognition/index.vue @@ -4,10 +4,10 @@
- 上传 - 删除
@@ -165,7 +165,6 @@ {{ $t("m.upload")+' PDF'}} @@ -205,13 +204,12 @@
- 取消 { this.$http.delete( @@ -699,7 +697,7 @@ export default { cancelButtonText: "取消", confirmButtonClass: "common-button-primary", type: "warning", - roundButton: true, + roundButton: false, }); } else { this.$confirm("确认删除这些数据?", "提示", { @@ -707,7 +705,7 @@ export default { cancelButtonText: "取消", type: "warning", confirmButtonClass: "common-button-primary", - roundButton: true, + roundButton: false, }).then(() => { let idsList = []; this.selectTableData.map((item) => { diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index e0b79356f..14f30e304 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -868,14 +868,17 @@
- - - + + + + + + - - - - - - {{ opt.label}} - - - + {{ opt.label}} - - - + + + + + + + + + + {{ opt.label}} + + +
@@ -1671,7 +1675,6 @@ export default { }) const dynamicFormField = this.sarStandardsInfoEO - this.sarStandardsInfoEO.EOPSSRQ = this.$moment(this.sarStandardsInfoEO.EOPSSRQ).isValid() ? this.$moment(this.sarStandardsInfoEO.EOPSSRQ) : this.sarStandardsInfoEO.EOPSSRQ this.sarStandardsInfoEO['id'] = item.id this.standState = JSON.parse(JSON.stringify(this.sarStandardsInfoEO.standState)) @@ -3755,12 +3758,23 @@ export default { padding-top: 11px; } -::v-deep .el-drawer__header{ +::v-deep .el-drawer__header { &>span:first-child{ outline: none!important; } } -::v-deep .el-drawer{ +::v-deep .el-drawer { outline: none!important; } +.label-input-form { + /deep/.el-form-item__label { + width:100px; + } + /deep/.el-input__inner { + height: 35px; + line-height: 35px; + border-radius: 0 !important; + } +} + diff --git a/src/pages/standardComparisonLibrary/index.vue b/src/pages/standardComparisonLibrary/index.vue index 92f630b90..072b4f0ff 100644 --- a/src/pages/standardComparisonLibrary/index.vue +++ b/src/pages/standardComparisonLibrary/index.vue @@ -18,7 +18,6 @@ icon="el-icon-search" type="primary" class="common-button-primary" - round @click="searchBtn" > @@ -26,7 +25,6 @@ {{$t('m.clearQuery')}} @@ -38,7 +36,6 @@ 新增 @@ -215,7 +212,7 @@
@@ -615,7 +612,7 @@ export default { confirmButtonText: '确定', confirmButtonClass: 'common-button-primary', cancelButtonText: '取消', - roundButton: true, + roundButton: false, type: 'warning' }).then(() => { this.$http.delete('sys/role/deleteList', { @@ -640,7 +637,7 @@ export default { confirmButtonText: '确定', confirmButtonClass: 'common-button-primary', cancelButtonText: '取消', - roundButton: true, + roundButton: false, type: 'warning' }).then(() => { this.$http.post('lawss/sarStandCompareBase/deletesSarStandCompareBase', {