Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -164,6 +164,7 @@
             <table-collection ref="CollectionTabel" :url='url' :paramsManifest='paramsManifest' @rowValue='rowValue'
                               :formInline='formInline' :currentPersonRole='currentPersonRole'
                               @getDataSource="getDataSource"
+                              @handlePreservation="handlePreservation"
                               @value='value'
                               @listReset='listReset' @LoginUserType='LoginUserType'/>
           </div>
@@ -880,12 +881,12 @@
           .then((res) => {
             if (res.data.success) {
               this.textLoading = false
-              _this.$message.success(res.data.result)
+              _this.$message.success(this.$t('OperationSuccessful'))
               this.areaVisibleFreeze = false
               this.$refs.CollectionTabel.getTableList()
             } else {
               this.textLoading = false
-              _this.$message.warning(res.data.result)
+              _this.$message.warning(this.$t('operationFailed'))
             }
           })
           .catch((error) => {