diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue index 8875d7e86..ed60ad494 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue @@ -282,7 +282,7 @@ export default { query.exportName = 'normal' } this.confirmLoading = true - downloadFile('report/detail/exportNormal', this.$t('GeneralExportInformation')+'.zip', query) + downloadFile('report/detail/exportNormal', query.exportName+'.zip', query) this.confirmLoading = false } }) diff --git a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue index a102af0ec..466d06588 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/customexportmodle.vue @@ -250,7 +250,7 @@ export default { query.exportName = 'custom' } this.confirmLoading = true - downloadFile('report/detail/exportCustom', this.$t('CustomizeExportInformation')+'.zip', query) + downloadFile('report/detail/exportCustom', query.exportName+'.zip', query) this.confirmLoading = false } }) diff --git a/jero-web/src/views/parameter/parameterexport/components/addModel.vue b/jero-web/src/views/parameter/parameterexport/components/addModel.vue index 4565b1a46..61e274d12 100644 --- a/jero-web/src/views/parameter/parameterexport/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterexport/components/addModel.vue @@ -211,11 +211,11 @@ export default { Action(url, query).then((res) => { if (res.success) { this.confirmLoading = false - this.$message.success(this.$t('OperationSuccessful')) + this.$message.success(res.message) this.visible = false this.$emit('addModelList') } else { - this.$message.warning(this.$t('operationFailed')) + this.$message.warning(res.message) this.confirmLoading = false } }) diff --git a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue index c2396d44b..57d5c035c 100644 --- a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue +++ b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue @@ -210,9 +210,9 @@ }, tooltip: { trigger:'axis', - axisPointer: { // 坐标轴指示器,坐标轴触发有效 - type: 'line'// 默认为直线,可选为:'line' | 'shadow' - }, + // axisPointer: { // 坐标轴指示器,坐标轴触发有效 + // type: 'line'// 默认为直线,可选为:'line' | 'shadow' + // }, formatter: function (params) { var html = params[0].name + "
"; for (var i = 0; i < params.length; i++) { @@ -254,7 +254,7 @@ itemStyle: { color: "#707486", }, - data: this.collectingdata + data: this.notStartdata }, { name: this.$t('Inthecollection'), @@ -265,7 +265,7 @@ itemStyle: { color: "#00B3BE", }, - data: this.notStartdata + data: this.collectingdata }, { name: this.$t('Submitted'),