From 2add98d335305c4f1169f32bc09e9f196862c72f Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 20 May 2022 09:12:58 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/projectManagement/components/TaskList.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 6626f9ec9..848f92710 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -275,8 +275,6 @@ }, verifyTaskClick(val, num, isTrue) { let query = {} - console.log(typeof isTrue) - return switch (num) { case 1: query = { From 99e4b27ed980d564f8fb84f74ae76003d8af8ea5 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 20 May 2022 09:26:25 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/processCenter/processForm/taskListProcess/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index 7c565020e..2b670acd9 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -195,7 +195,7 @@ this.loading = true getAction(this.url.list, query).then((res) => { if (res.success) { - this.queryPersonInCharge = res.result[1] || {} + this.queryPersonInCharge = res.result[0] || {} if (this.$route.query.taskIds) { this.isDisplay = false this.queryTaskDetailByTask(function() { From fa30e6e95b82adc9ef00fb484c0b7eb0c988b4fc Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 20 May 2022 09:33:37 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E6=80=A7=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processForm/taskListProcess/index.vue | 12 +++- .../components/responsibilityList.vue | 72 +++++++++++++++++++ 2 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 jero-web/src/views/projectManagement/components/responsibilityList.vue diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index 2b670acd9..ee7046a05 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -274,7 +274,17 @@ deliveryRequirements: val.deliveryRequirements } putAction(this.url.dreSubmit, query).then((res) => { - + if (res.success) { + this.loading = false + this.$message.success(this.$t('OperationSuccessful')) + this.$router.push({ + path: '/ProjectDetails', + query: this.$route.query + }) + }else{ + this.loading = false + this.$message.warning(this.$t('operationFailed')) + } }) }, completeTask(value) { diff --git a/jero-web/src/views/projectManagement/components/responsibilityList.vue b/jero-web/src/views/projectManagement/components/responsibilityList.vue new file mode 100644 index 000000000..9570755b9 --- /dev/null +++ b/jero-web/src/views/projectManagement/components/responsibilityList.vue @@ -0,0 +1,72 @@ + + + + + \ No newline at end of file From 02a8c30ddeebc6c6a8562cb45088e73e013e1545 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Fri, 20 May 2022 10:00:37 +0800 Subject: [PATCH 4/8] =?UTF-8?q?[update]=20=E5=BC=95=E7=94=A8=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 + jero-web/src/common/lang/zh-cn.js | 2 + .../components/ReferenceParameter/index.vue | 76 ++++--------------- .../ParameterItemCollectionList.vue | 15 +++- 4 files changed, 32 insertions(+), 63 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 2a48eadea..cdedc21ef 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -708,6 +708,8 @@ module.exports = { uploadTime: 'Upload time', enclosure: 'enclosure', // 认证 + from: 'from', + ReferenceTo: 'Reference To', checkTheDeadline: 'Select the collection deadline of the parameter item', accountNumber: 'account Number', fullName: 'full Name', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 2045b71d1..6b0b043db 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -718,6 +718,8 @@ module.exports = { uploadTime: '上传时间', enclosure: '附件', // 认证 + from: '从', + ReferenceTo: '引用到', checkTheDeadline: '选中参数项收集截止时间', accountNumber: '账号', fullName: '姓名', diff --git a/jero-web/src/components/ReferenceParameter/index.vue b/jero-web/src/components/ReferenceParameter/index.vue index 9e2bceb9f..e29c23cfa 100644 --- a/jero-web/src/components/ReferenceParameter/index.vue +++ b/jero-web/src/components/ReferenceParameter/index.vue @@ -10,49 +10,27 @@ :wrapper-col='wrapperCol' > - - - + + +
+ +
    配置
+
- - - + + +
+ +
    配置
+
- - {{ $t('query') }} - {{ $t('reset') }} - - - -
- -
{{ $t('cancel') }} {{ $t('submit') }} @@ -76,21 +54,6 @@ export default { selectedRowKeysDate: {}, loading: false, editId: '', - columns: [ - { - title: this.$t('fullName'), - dataIndex: 'realname', - key: 'showArea', - align: 'center', - ellipsis: true - }, - { - title: this.$t('accountNumber'), - align: 'center', - dataIndex: 'username', - ellipsis: true - } - ], newVisible: false, labelCol: { xs: { span: 24 }, @@ -108,7 +71,7 @@ export default { confirmLoading: false, selectedRowKeys: [], pageNo: 1, - pageSize: 10 + pageSize: 10, } }, props: { @@ -122,15 +85,6 @@ export default { this.loadData() }, methods: { - pageOnChange(page, pageSize) { - this.pageNo = page - this.loadData() - }, - SizeChange(page, pageSize) { - this.pageNo = 1 - this.pageSize = pageSize - this.loadData() - }, loadData() { this.loading = true let params = { diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index d18ec4816..fc1e1df27 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -114,7 +114,7 @@ {{$t('sendBack')}}
-
+
{{$t('referenceparameter')}}
@@ -172,6 +172,10 @@ + + + + @@ -180,6 +184,7 @@ import TableCollection from '@/components/tableCollection/index' import { getAction,postAction } from '../../../api/manage' import ParameterLibraryAdd from '@/components/ParameterLibraryAdd/index' import TaskCutOffTime from '@/components/TaskCutOffTime/index' +import ReferenceParameter from '@/components/ReferenceParameter/index' import AssignedBy from '@/components/AssignedBy/index' import axios from 'axios' import { ACCESS_TOKEN } from '@/store/mutation-types' @@ -191,7 +196,8 @@ export default { TableCollection, ParameterLibraryAdd, AssignedBy, - TaskCutOffTime + TaskCutOffTime, + ReferenceParameter }, data(){ return{ @@ -276,6 +282,7 @@ export default { areaVisibleFreeze: false, // 冻结配置 areaVisibleAssignedby: false, // 分配填写人弹框 areaVisibleTaskCutOffTime: false, // 截至时间弹框 + areaVisiblereferenceparameter: false, // 引用参数弹框 wrapperCol: { xs: { span: 24 }, sm: { span: 14 } @@ -592,6 +599,10 @@ export default { this.areaVisibleTaskCutOffTime = val this.$refs.CollectionTabel.getTableList() }, + //引用参数 + referenceparameter() { + this.areaVisiblereferenceparameter = true + }, handleModule() { }, From f4e9eb55536de9eb10b5311d213434603729f4f5 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 20 May 2022 10:29:24 +0800 Subject: [PATCH 5/8] update --- .../impl/ProjectLibraryBaseServiceImpl.java | 65 ++++++++++++------- 1 file changed, 40 insertions(+), 25 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 7040622f3..c025bcae8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -16,9 +16,11 @@ import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.mapper.ProjectTaskInventoryEOMapper; import com.jero.modules.project.service.IConditionAssessmentEOService; import com.jero.modules.project.service.IProjectLibraryBaseService; +import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.mapper.SysDictItemMapper; import com.jero.modules.system.mapper.SysUserMapper; +import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.system.util.StringUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.poi.hssf.usermodel.HSSFSheet; @@ -68,6 +70,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl result = new HashMap<>(); QueryWrapper lawsInventoryEOQueryWrapper = new QueryWrapper<>(); @@ -334,30 +339,35 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl> conditionAssessmentMapList = this.conditionAssessmentEOService.getProjectStatusAssessStatisticsGroupByTerritory(params); - result.put("conditionAssessmentMapList",conditionAssessmentMapList); + disposeData(conditionAssessmentMapList,cut); + result.put("dataList",conditionAssessmentMapList); }else if(StringUtils.equals(OperatorTypeEnum.QUERY_LISTING_TO_CONFIRM_STATISTICS.getValue(),operatorType)){ //清单确认 状态 String inventoryAffirmStatus = (String) params.get("inventoryAffirmStatus"); List> listingToConfirmList = this.projectLawsInventoryEOMapper.getListingToConfirmStatisticsGroupByTerritory(projectLibraryId,inventoryAffirmStatus); - result.put("listingToConfirmList",listingToConfirmList); + disposeData(listingToConfirmList,cut); + result.put("dataList",listingToConfirmList); }else if(StringUtils.equals(OperatorTypeEnum.QUERY_TASK_TO_CONFIRM_STATISTICS.getValue(),operatorType)){ //任务确认 状态 String taskAffirmStatus = (String) params.get("taskAffirmStatus"); List> taskToConfirmList = this.projectLawsInventoryEOMapper.getTaskToConfirmStatisticsGroupByTerritory(projectLibraryId,taskAffirmStatus); - result.put("taskToConfirmList",taskToConfirmList); + disposeData(taskToConfirmList,cut); + result.put("dataList",taskToConfirmList); }else if(StringUtils.equals(OperatorTypeEnum.QUERY_DESIGN_STATISTICS.getValue(),operatorType)){ //设计符合性 流程任务状态 String designFlowTaskStatus = (String) params.get("designFlowTaskStatus"); if(CollectionUtils.isNotEmpty(projectLawsInventoryIdList)){ List> designComplianceList = this.projectTaskInventoryEOMapper.getDesignComplianceStatisticeGroupByTerritory(projectLawsInventoryIdList,designFlowTaskStatus); - result.put("designComplianceList",designComplianceList); + disposeData(designComplianceList,cut); + result.put("dataList",designComplianceList); } }else if(StringUtils.equals(OperatorTypeEnum.QUERY_PREHOMO_STATISTICS.getValue(),operatorType)){ //prehomo确认 流程任务状态 String prehomoFlowTaskStatus = (String) params.get("prehomoFlowTaskStatus"); if(CollectionUtils.isNotEmpty(projectLawsInventoryIdList)){ List> prehomoList = this.projectTaskInventoryEOMapper.getPrehomoStatisticeGroupByTerritory(projectLawsInventoryIdList,prehomoFlowTaskStatus); - result.put("prehomoList",prehomoList); + disposeData(prehomoList,cut); + result.put("dataList",prehomoList); } }else if(StringUtils.equals(OperatorTypeEnum.QUERY_VERIFY_STATISTICS.getValue(),operatorType)){ //验证符合性 流程任务状态 @@ -365,7 +375,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl> verifyComplianceList = this.projectTaskInventoryEOMapper.getVerifyComplianceStatisticeGroupByTerritory(projectLawsInventoryIdList,verifyFlowTaskStatus); - result.put("verifyComplianceList",verifyComplianceList); + disposeData(verifyComplianceList,cut); + result.put("dataList",verifyComplianceList); } }else if(StringUtils.equals(OperatorTypeEnum.QUERY_CERTIFICATION_PROGRESS_STATISTICS.getValue(),operatorType)){ //认证进度 流程任务状态 @@ -373,7 +384,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl> certificationProgressList = this.projectTaskInventoryEOMapper.getCertificationProgressStatisticsGroupByTerritory(projectLawsInventoryIdList,certificationProgress); - result.put("certificationProgressList",certificationProgressList); + disposeData(certificationProgressList,cut); + result.put("dataList",certificationProgressList); } } return result; @@ -458,23 +470,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl projectDetailsStatisticsGroupByTerritory, Map params){ List> exportData = new ArrayList<>(); - String operatorType = (String) params.get("operatorType"); - if(StringUtils.equals(OperatorTypeEnum.QUERY_CURRENT_PROJECT_STATUS_STATISTICS.getValue(),operatorType)){ - exportData = (List>) projectDetailsStatisticsGroupByTerritory.get("conditionAssessmentMapList"); - }else if(StringUtils.equals(OperatorTypeEnum.QUERY_LISTING_TO_CONFIRM_STATISTICS.getValue(),operatorType)){ - exportData = (List>) projectDetailsStatisticsGroupByTerritory.get("listingToConfirmList"); - }else if(StringUtils.equals(OperatorTypeEnum.QUERY_TASK_TO_CONFIRM_STATISTICS.getValue(),operatorType)){ - exportData = (List>) projectDetailsStatisticsGroupByTerritory.get("taskToConfirmList"); - }else if(StringUtils.equals(OperatorTypeEnum.QUERY_DESIGN_STATISTICS.getValue(),operatorType)){ - exportData = (List>) projectDetailsStatisticsGroupByTerritory.get("designComplianceList"); - }else if(StringUtils.equals(OperatorTypeEnum.QUERY_PREHOMO_STATISTICS.getValue(),operatorType)){ - exportData = (List>) projectDetailsStatisticsGroupByTerritory.get("prehomoList"); - }else if(StringUtils.equals(OperatorTypeEnum.QUERY_VERIFY_STATISTICS.getValue(),operatorType)){ - exportData = (List>) projectDetailsStatisticsGroupByTerritory.get("verifyComplianceList"); - }else if(StringUtils.equals(OperatorTypeEnum.QUERY_CERTIFICATION_PROGRESS_STATISTICS.getValue(),operatorType)){ - exportData = (List>) projectDetailsStatisticsGroupByTerritory.get("certificationProgressList"); - } - + exportData = (List>) projectDetailsStatisticsGroupByTerritory.get("dataList"); int rowIndex = 1; for (int dataIndex = 0; dataIndex < exportData.size(); dataIndex++) { Row dataRow = sheet.createRow(rowIndex); @@ -483,6 +479,25 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl> datas,String cut){ + List dictItemList = sysDictItemServiceImpl.selectItemsByDictCode("duty_territory"); + if(CollectionUtils.isNotEmpty(datas)){ + for (Map data : datas) { + List dutyTerritory = dictItemList.stream().filter(dict -> StringUtils.equals(dict.getItemValue(), data.get("dutyTerritory").toString())).collect(Collectors.toList()); + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + data.put("",dutyTerritory.get(0).getItemText()); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + data.put("",dutyTerritory.get(0).getEnName()); + } + } + } + } } From 7428b00dcad365e8bfdc0b254700a7f7ad7dc5fb Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 20 May 2022 10:40:03 +0800 Subject: [PATCH 6/8] update --- .../project/service/impl/ProjectLibraryBaseServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index c025bcae8..e4ccc929e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -491,9 +491,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl data : datas) { List dutyTerritory = dictItemList.stream().filter(dict -> StringUtils.equals(dict.getItemValue(), data.get("dutyTerritory").toString())).collect(Collectors.toList()); if(StringUtils.equals(cut,CutEnum.CN.getValue())){ - data.put("",dutyTerritory.get(0).getItemText()); + data.put("dutyTerritory",dutyTerritory.get(0).getItemText()); }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ - data.put("",dutyTerritory.get(0).getEnName()); + data.put("dutyTerritory",dutyTerritory.get(0).getEnName()); } } } From 995ae452eb8222f114031a277c015ac31a997720 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Fri, 20 May 2022 10:40:40 +0800 Subject: [PATCH 7/8] =?UTF-8?q?[update]=20=E5=BC=95=E7=94=A8=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ReferenceParameter/index.vue | 119 +++++++++++++----- .../ParameterItemCollectionList.vue | 2 +- 2 files changed, 87 insertions(+), 34 deletions(-) diff --git a/jero-web/src/components/ReferenceParameter/index.vue b/jero-web/src/components/ReferenceParameter/index.vue index e29c23cfa..1124a403c 100644 --- a/jero-web/src/components/ReferenceParameter/index.vue +++ b/jero-web/src/components/ReferenceParameter/index.vue @@ -4,7 +4,7 @@
- + + + + {{ item.label }} + + +
    配置
 @@ -22,8 +27,13 @@
- + + + + {{ item.label }} + + +
    配置
 @@ -49,8 +59,6 @@ export default { data() { return { token:Vue.ls.get(ACCESS_TOKEN), - title: this.$t('add'), - total: 0, selectedRowKeysDate: {}, loading: false, editId: '', @@ -63,18 +71,23 @@ export default { xs: { span: 24 }, sm: { span: 14 } }, - form: {}, + formInline: {}, rules: {}, areaTable: [], flag: false, //表单提交标识 spinLoading: false, confirmLoading: false, selectedRowKeys: [], - pageNo: 1, - pageSize: 10, + fromDate: [], + fromDateTo: [], } }, props: { + paramsManifest: { + type: Object, + default: {}, + require: true + }, selectedRowKeysArray: { type: String, default: '', @@ -82,24 +95,71 @@ export default { } }, mounted() { - this.loadData() + this.loadData(), + this.loadDataTo() }, methods: { loadData() { - this.loading = true - let params = { - pageNo: this.pageNo, - pageSize: this.pageSize, - ...this.form - } - getAction(`sys/user/page`, params).then(res => { - if (res.success) { - this.areaTable = [...res.result.records] - this.total = res.result.total + let _this = this + let param = {paramsManifestId: this.paramsManifest.id,configFlag: 1} + axios({ + url: '/jero-boot/params/collectManifest/getConfigLableListR', + 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 } - }).finally(() => { - this.loading = false }) + .then( (res) =>{ + console.log(res) + if (res.data.success) { + this.fromDate = res.data.result + }else{ + _this.$message.warning(res.data.result) + } + }) + .catch( (error) =>{ + console.log(error); + }); + }, + loadDataTo() { + let _this = this + let param = {paramsManifestId: this.paramsManifest.id,configFlag: 2} + axios({ + url: '/jero-boot/params/collectManifest/getConfigLableListR', + 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) =>{ + console.log(res) + if (res.data.success) { + this.fromDateTo = res.data.result + }else{ + _this.$message.warning(res.data.result) + } + }) + .catch( (error) =>{ + console.log(error); + }); }, searchQuery() { this.loadData() @@ -117,17 +177,12 @@ export default { }, handleTableChange(val) { }, - //新增 + // 引用参数确定 handleSubmit() { let _this = this - if (this.selectedRowKeys.length == 0) { - this.$message.warning(this.$t('pleaseSelectData')) - } else if (this.selectedRowKeys.length > 1) { - this.$message.warning(this.$t('OnlyOneSelected')) - } else { - let param = {ids: this.selectedRowKeysArray, projectId: this.$route.query.id, dre:this.selectedRowKeysDate[0].username } + let param = {ids: this.selectedRowKeysArray, ...this.formInline } axios({ - url: '/jero-boot/params/collectManifest/updateDreBatch', + url: '/jero-boot/params/collectManifest/referParams', method: 'post', data: param, transformRequest: [function (data) { @@ -145,7 +200,6 @@ export default { .then( (res) =>{ if (res.data.success) { _this.$message.success(res.data.result) - _this.loadData() this.$emit('areaVisibleAssignedbyflag', false) }else{ _this.$message.warning(res.data.result) @@ -154,7 +208,6 @@ export default { .catch( (error) =>{ console.log(error); }); - } } } } diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index fc1e1df27..8a8a08ac1 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -174,7 +174,7 @@ - + From 82983682875044016c87522307bd6ba976a29ed4 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 20 May 2022 10:45:25 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=AF=B9=E6=8E=A5echarts=E7=9A=84=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../certificationProgressEchart.vue | 29 ++++-- .../currentStatusOfTheProjectEcharts.vue | 21 ++++- .../components/deliverableStatusEchart.vue | 67 ++++++++++---- .../components/responsibilityList.vue | 88 +++++++++++++------ 6 files changed, 157 insertions(+), 50 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index cdedc21ef..894c43a0d 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -859,4 +859,5 @@ module.exports = { sponsorReview:'Sponsor review', fillInProjectDelivery:'Fill in project delivery', Resubmit:'Resubmit', + Quantity:'Quantity', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 6b0b043db..bbf1a6890 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -864,4 +864,5 @@ module.exports = { sponsorReview:'发起人审查', fillInProjectDelivery:'填写工程交付', Resubmit:'重新提交', + Quantity:'数量', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue b/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue index 73f125785..36acb5923 100644 --- a/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue +++ b/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue @@ -19,15 +19,20 @@
+