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

jero-web/src/components/ReferenceParameter/index.vue

@@ -239,7 +239,7 @@ export default {
               this.$emit('GetgetTableList')
               this.confirmLoading = false
             } else {
-              this.$message.warning(res.message)
+              this.$message.warning(this.$t('operationFailed'))
               this.confirmLoading = false
             }
           })

jero-web/src/components/TaskCutOffTime/index.vue

@@ -111,10 +111,10 @@ export default {
         postAction('/params/collectManifest/updateDeadlineBatch', param).then((res) => {
           if (res.success) {
             this.$emit('areaVisibleTaskCutOffTimeflag', false)
-            this.$message.success(res.message)
+            this.$message.success(_this.$t('OperationSuccessful'))
             this.confirmLoading = false
           } else {
-            this.$message.warning(res.message)
+            this.$message.warning(_this.$t('operationFailed'))
             this.confirmLoading = false
           }
         })

jero-web/src/components/tableCollection/index.vue

@@ -279,11 +279,13 @@
       },
       pageOnChange(page, pageSize) {
         this.pageNo = page
+        this.$emit('handlePreservation')
         this.getTableList()
       },
       SizeChange(page, pageSize) {
         this.pageNo = 1
         this.pageSize = pageSize
+        this.$emit('handlePreservation')
         this.getTableList()
       },
       // 查看配置详细信息
@@ -414,9 +416,7 @@
           if (res.success) {
             if (res.result && res.result.userType) {
               this.getTableList(res.result.userType)
-              console.log(11)
             } else {
-              console.log(222)
               this.getTableList(result[0].value)
             }
             this.$emit('LoginUserType', result, this.currentPersonRole, res.result.userType)
@@ -535,6 +535,7 @@
             this.dataSource = tt
             this.total = res.result.total
             this.selectedRowKeys = []
+            this.$emit('getDataSource', this.dataSource)
             setTimeout(() => {
               this.loading = false
             }, 500)

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) => {