diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 8c5a086db..57b46d2cc 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -770,6 +770,7 @@ module.exports = { SynchronousReportLibrary: 'Synchronous Report Library', FreezeConfiguration: 'Freeze Configuration', distributionAndCollection: 'Distribution And Collection', + OneclickCollection: 'One-click Collection', deleteConfiguration: 'Delete Configuration', addConfiguration: 'Add Configuration', electricMachinery: 'ElectricMachinery', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index fafc73e2e..97cc4ea13 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -785,6 +785,7 @@ module.exports = { SynchronousReportLibrary: '同步上报库', FreezeConfiguration: '冻结配置', distributionAndCollection: '下发收集', + OneclickCollection: '一键下发收集', deleteConfiguration: '删除配置', addConfiguration: '添加配置', electricMachinery: '电机', diff --git a/jero-web/src/components/TaskCutOffTime/index.vue b/jero-web/src/components/TaskCutOffTime/index.vue index 52b1da1ed..9feec59ec 100644 --- a/jero-web/src/components/TaskCutOffTime/index.vue +++ b/jero-web/src/components/TaskCutOffTime/index.vue @@ -2,7 +2,7 @@
- - {{$t('cutoffTime')}} - - + +
+
+ * + + {{$t('cutoffTime')}} +
+ + + +
+ + + + + @@ -22,6 +41,32 @@ {{ $t('cancel') }} {{ $t('submit') }}
+ + + + +
+ + + + +
+ + +
+
+ {{$t('cancel')}} +
+
+ @@ -43,7 +88,9 @@ export default { selectedRowKeysDate: {}, loading: false, editId: '', + visibleoperationFailed:false, newVisible: false, + NotSelectedRowKeysValue:[], labelCol: { xs: { span: 24 }, sm: { span: 7 } @@ -53,7 +100,11 @@ export default { sm: { span: 14 } }, form: {}, - rules: {}, + rules: { + legalTaskConfirmation:[ + { required: true, message: this.$t('PleaseSelect')+this.$t('cutoffTime'), trigger: 'change' } + ] + }, areaTable: [], flag: false, //表单提交标识 spinLoading: false, @@ -105,19 +156,90 @@ export default { }, //保存 handleSubmit() { - let _this = this - let param = {ids: this.selectedRowKeysArray, deadline: `${this.pickerDate}`, } - this.confirmLoading = true - postAction('/params/collectManifest/updateDeadlineBatch', param).then((res) => { - if (res.success) { - this.$emit('areaVisibleTaskCutOffTimeflag', false) - this.$message.success(_this.$t('OperationSuccessful')) - this.confirmLoading = false - } else { - this.$message.warning(_this.$t('operationFailed')) - this.confirmLoading = false + // let _this = this + // let param = {ids: this.selectedRowKeysArray, deadline: `${this.pickerDate}`, } + // this.confirmLoading = true + // postAction('/params/collectManifest/updateDeadlineBatch', param).then((res) => { + // if (res.success) { + // this.$emit('areaVisibleTaskCutOffTimeflag', false) + // this.$message.success(_this.$t('OperationSuccessful')) + // this.confirmLoading = false + // } else { + // this.$message.warning(_this.$t('operationFailed')) + // this.confirmLoading = false + // } + // }) + this.$refs.ruleForm.validate(valid => { + if(valid){ + let long = localStorage.getItem('language') + let cut = '' + if (long && long == 'zh-cn') { + this.cut = 'cn' + } else if (long && long == 'en-us') { + this.cut = 'en' } - }) + // let _array = [] + // this.selectedRowKeysValue.forEach((item, index) => { + // _array.push(item.id) + // }) + let _this = this + let param = { + paramsManifestId: this.$route.query.id, + projectId: this.$route.query.projectId, + ids: this.selectedRowKeysArray, + cut: this.cut, + deadline: `${this.pickerDate}` + + } + this.textLoading = true + axios({ + url: '/jero-boot/params/collectManifest/issueCollection', + method: 'post', + data: param, + transformRequest: [function(data) { + let ret = '' + for (let it in data) { + ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&' + } + return ret + }], + headers: { + 'Content-Type': 'application/x-www-form-urlencoded', + 'X-Access-Token': _this.token + } + }) + .then((res) => { + if (res.data.success) { + // _this.$message.success(this.$t('OperationSuccessful')) + if(res.data.result.length == 0){ + this.visibleoperationFailed = false + _this.$message.success(this.$t('OperationSuccessful')) + this.$emit('areaVisibleTaskCutOffTimeflag', false) + this.$emit('GetgetTableList') + + }else{ + this.NotSelectedRowKeysValue = res.data.result + this.visibleoperationFailed = true + } + + // this.$emit('areaVisibleTaskCutOffTimeflag', false) + // this.$emit('GetgetTableList') + } else { + _this.$message.warning(this.$t('operationFailed')) + } + }) + .catch((error) => { + this.textLoading = false + }) + } + }) + }, + // 错误数据的弹框 + cancleoperationFailed() { + this.visibleoperationFailed = false + this.$emit('areaVisibleTaskCutOffTimeflag', false) + this.$emit('GetgetTableList') + // this.GetgetTableList() }, onChange(val) { this.pickerDate = moment(val).format('YYYY-MM-DD HH:mm:ss') @@ -131,7 +253,10 @@ export default { + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 5a20c86ad..112095941 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -131,10 +131,10 @@ {{$t('SynchronousReportLibrary')}} -
- - {{$t('TaskCutOffTime')}} -
+ + + +
@@ -154,6 +154,11 @@ {{$t('distributionAndCollection')}}
+ +
+ + {{$t('OneclickCollection')}} +
@@ -257,12 +262,19 @@ @GetgetLoginUserType='GetgetLoginUserType' @areaVisibleAssignedbyflag='areaVisibleAssignedbyflag' @areaVisible='areaVisibleAssignedby = false'/> - - + + + + + + + { - _array.push(item.id) - }) - let _this = this - let param = { - paramsManifestId: this.$route.query.id, - projectId: this.$route.query.projectId, - ids: _array.join(',') - } - this.textLoading = true - axios({ - url: '/jero-boot/params/collectManifest/issueCollection', - method: 'post', - data: param, - transformRequest: [function(data) { - let ret = '' - for (let it in data) { - ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&' - } - return ret - }], - headers: { - 'Content-Type': 'application/x-www-form-urlencoded', - 'X-Access-Token': _this.token - } - }) - .then((res) => { - if (res.data.success) { - _this.$message.success(this.$t('OperationSuccessful')) - _this.areaVisible = false - this.textLoading = false - _this.GetgetTableList() - } else { - this.textLoading = false - _this.$message.warning(this.$t('operationFailed')) - } - }) - .catch((error) => { - this.textLoading = false - }) + // 一键下发收集 + defOneclickCollection() { + this.OneclickCollection = true }, + // // 下发收集---请求接口 + // distributionAndCollection() { + // + // let _array = [] + // this.selectedRowKeysValue.forEach((item, index) => { + // _array.push(item.id) + // }) + // let _this = this + // let param = { + // paramsManifestId: this.$route.query.id, + // projectId: this.$route.query.projectId, + // ids: _array.join(',') + // } + // this.textLoading = true + // axios({ + // url: '/jero-boot/params/collectManifest/issueCollection', + // method: 'post', + // data: param, + // transformRequest: [function(data) { + // let ret = '' + // for (let it in data) { + // ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&' + // } + // return ret + // }], + // headers: { + // 'Content-Type': 'application/x-www-form-urlencoded', + // 'X-Access-Token': _this.token + // } + // }) + // .then((res) => { + // if (res.data.success) { + // _this.$message.success(this.$t('OperationSuccessful')) + // _this.areaVisible = false + // this.textLoading = false + // _this.GetgetTableList() + // } else { + // this.textLoading = false + // _this.$message.warning(this.$t('operationFailed')) + // } + // }) + // .catch((error) => { + // this.textLoading = false + // }) + // }, // 同步上报库 权限 handleSynchronousReportLibraryJurisdiction() { let homoJurisdictionSynchronousLibrary = this.homoJurisdictionSynchronousLibrary() @@ -1412,20 +1437,26 @@ this.areaVisibleAssignedby = val }, // 截止时间 - TaskCutOffTimeLibrary() { - let dreTaskCutOffTimeLibrary = this.dreTaskCutOffTimeLibrary() - if (dreTaskCutOffTimeLibrary == 1) { - this.areaVisibleTaskCutOffTime = true - } else if (dreTaskCutOffTimeLibrary == 0) { - this.visibleoperationFailed = true - this.jurisdiction = 'HOMOJZSJ' - } - }, + // TaskCutOffTimeLibrary() { + // let dreTaskCutOffTimeLibrary = this.dreTaskCutOffTimeLibrary() + // if (dreTaskCutOffTimeLibrary == 1) { + // this.areaVisibleTaskCutOffTime = true + // } else if (dreTaskCutOffTimeLibrary == 0) { + // this.visibleoperationFailed = true + // this.jurisdiction = 'HOMOJZSJ' + // } + // }, // 截至时间确定弹框关闭 areaVisibleTaskCutOffTimeflag(val) { + console.log(val) this.areaVisibleTaskCutOffTime = val this.$refs.CollectionTabel.getTableList() }, + areaVisibleTaskCutOffTimeAll(val){ + console.log(val) + this.OneclickCollection = val + this.$refs.CollectionTabel.getTableList() + }, //引用参数 referenceparameter() { let dreJurisdictionreferenceParameter = this.dreJurisdictionreferenceParameter()