diff --git a/jero-web/src/views/documentManage/tags/dialog/DicList.vue b/jero-web/src/views/documentManage/tags/dialog/DicList.vue index 952560c1e..464806d35 100644 --- a/jero-web/src/views/documentManage/tags/dialog/DicList.vue +++ b/jero-web/src/views/documentManage/tags/dialog/DicList.vue @@ -418,7 +418,7 @@ } this.loadData() }else{ - this.$message.warning(this.$t('operationFailed')); + this.$message.warning(res.message); } }) } diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 5f2b632eb..9a319abd9 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -1,9 +1,9 @@ @@ -98,6 +106,7 @@ import ImportFile from '@/components/ImportFile/index' import ParameterTemplateAdd from '../dialog/ParameterTemplateAdd' import ParameterTemplateCody from '../dialog/ParameterTemplateCody' + import ProjectCollectionParameters from '../dialog/ProjectCollectionParameters' import HistoricalVersion from '../dialog/historicalVersion' import { getAction, postAction } from '../../../api/manage' import Configure from '../dialog/configure' @@ -112,7 +121,8 @@ ParameterTemplateAdd, Configure, HistoricalVersion, - ParameterTemplateCody + ParameterTemplateCody, + ProjectCollectionParameters }, data() { return { @@ -189,7 +199,10 @@ itemId: '', historicalVisible: false, historicalRow: {}, // 历史版本得数据 - areaVisibleCody: false // 复制参数清单得弹框 + areaVisibleCody: false, // 复制参数清单得弹框 + drawerVisible: false, + drawerVisibleitem: false, + titleTag: '' } }, mounted() { @@ -237,6 +250,10 @@ this.areaVisible = val this.getlist() }, + // 项目收集参数 + drawerhandleCancel(val) { + this.drawerhandleCancel = val + }, searchQuery() { this.pageNo = 1 this.getlist() @@ -337,8 +354,8 @@ } }, handleCody() { - console.log('复制') - // this.areaVisibleCody = true + this.drawerVisible = true + this.titleTag = '项目收集参数' }, pageOnChange(page, pageSize) { this.pageNo = page @@ -489,6 +506,9 @@ cursor: pointer; border-radius: 4px; } + /deep/.add-padding{ + margin-left: -89px!important; + } + \ No newline at end of file