WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhaomeijing
2022-05-25 18:00:40 +08:00
parent dd4f82e072 964e716616
commit 6201a3c238
23 changed files with 270 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
+13
View File
@@ -16,6 +16,7 @@ import com.jero.modules.enums.FixedFieldEnum;
import com.jero.modules.system.entity.SysCategory;
import com.jero.modules.system.model.TreeSelectModel;
import com.jero.modules.system.service.ISysCategoryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -27,6 +28,7 @@ import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -44,6 +46,7 @@ import java.util.stream.Collectors;
* @Date: 2019-05-29
* @Version: V1.0
*/
@Api(tags="标签内容-树形结构")
@RestController
@RequestMapping("/sys/category")
@Slf4j
@@ -94,6 +97,14 @@ public class SysCategoryController {
result.setResult(list);
return result;
}
@AutoLog(value = "标签内容-查询字典配置的父级名称")
@ApiOperation(value = "标签内容-查询字典配置的父级名称", notes = "标签内容-查询字典配置的父级名称")
@GetMapping(value = "/queryPid")
public Result<List<SysCategory>> queryPid() {
List<SysCategory> list = sysCategoryService.queryPid();
return Result.OK(list);
}
/**标签内容-树形结构列表
*
@@ -118,6 +129,7 @@ public class SysCategoryController {
@PostMapping(value = "/add")
public Result<SysCategory> add(@RequestBody SysCategory sysCategory) {
Result<SysCategory> result = new Result<SysCategory>();
sysCategoryService.setAddOrdderNum(sysCategory);
sysCategory.setName(sysCategory.getName().replace(" ",""));
sysCategoryService.addSysCategory(sysCategory);
result.success("添加成功！");
@@ -133,6 +145,7 @@ public class SysCategoryController {
@PutMapping(value = "/edit")
public Result<SysCategory> edit(@RequestBody SysCategory sysCategory) {
Result<SysCategory> result = new Result<SysCategory>();
sysCategoryService.setEditOrderNum(sysCategory);
SysCategory sysCategoryEntity = sysCategoryService.getById(sysCategory.getId());
if(sysCategoryEntity==null) {
result.error500("未找到对应实体");
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java
+1 -1
View File
@@ -436,7 +436,7 @@ public class SysDictController {
@RequiresPermissions("dict:edit")
public Result<SysDict> edit(@RequestBody SysDict sysDict) {
Result<SysDict> result = new Result<SysDict>();
sysDictService.setEditOrdderNum(sysDict);
sysDictService.setEditOrderNum(sysDict);
SysDict sysdict = sysDictService.getById(sysDict.getId());
if (sysdict == null) {
result.error500("未找到对应实体");
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java
+2
View File
@@ -84,6 +84,7 @@ public class SysDictItemController {
@CacheEvict(value= CacheConstant.SYS_DICT_CACHE, allEntries=true)
public Result<SysDictItem> add(@RequestBody SysDictItem sysDictItem) {
Result<SysDictItem> result = new Result<SysDictItem>();
sysDictItemService.setAddOrdderNum(sysDictItem);
//查询同名数据
List<SysDictItem> exitDictItemList = sysDictItemMapper.selctItemByName(sysDictItem.getItemText(),sysDictItem.getDictId());
if(CollectionUtils.isNotEmpty(exitDictItemList)){
@@ -127,6 +128,7 @@ public class SysDictItemController {
@CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true)
public Result<SysDictItem> edit(@RequestBody SysDictItem sysDictItem) {
Result<SysDictItem> result = new Result<SysDictItem>();
sysDictItemService.setEditOrderNum(sysDictItem);
SysDictItem sysdict = sysDictItemService.getById(sysDictItem.getId());
if (sysdict == null) {
result.error500("未找到对应实体");
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java
+6
View File
@@ -85,4 +85,10 @@ public interface ISysCategoryService extends IService<SysCategory> {
public void updateDictDelFlag(int delFlag,String id);
List<SysCategory> queryByTreeDicCode(String dicCode);
void setAddOrdderNum(SysCategory sysCategory);
void setEditOrderNum(SysCategory sysCategory);
List<SysCategory> queryPid();
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java
+4
View File
@@ -30,4 +30,8 @@ public interface ISysDictItemService extends IService<SysDictItem> {
* @param id
*/
public void updateDictDelFlag(int delFlag,String id);
void setAddOrdderNum(SysDictItem sysDictItem);
void setEditOrderNum(SysDictItem sysDictItem);
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java
+1 -1
View File
@@ -172,5 +172,5 @@ public interface ISysDictService extends IService<SysDict> {
void setAddOrdderNum(SysDict sysDict);
void setEditOrdderNum(SysDict sysDict);
void setEditOrderNum(SysDict sysDict);
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java
+84
View File
@@ -309,4 +309,88 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
public List<SysCategory> queryByTreeDicCode(String dicCode) {
return sysCategoryMapper.queryByTreeDicCode(dicCode);
}
@Override
public void setAddOrdderNum(SysCategory sysCategory) {
Integer inputOrderNum = sysCategory.getSortOrder();
if(inputOrderNum != null) {
//查询展示顺序相同的
QueryWrapper<SysCategory> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("sys_dict_id",sysCategory.getSysDictId())
.eq("del_flag", CommonConstant.DEL_FLAG_0)
.orderByAsc("sort_order");
queryWrapper.eq("sort_order", inputOrderNum);
Integer orderNumCount = sysCategoryMapper.selectCount(queryWrapper);
if (orderNumCount > 0) {//有重复展示顺序的,后面的号全+1
//设置排序
QueryWrapper<SysCategory> orderNumQueryWrapper = new QueryWrapper<>();
orderNumQueryWrapper.ge("sort_order", inputOrderNum)
.eq("sys_dict_id",sysCategory.getSysDictId())
.eq("del_flag", CommonConstant.DEL_FLAG_0)
.orderByAsc("sort_order");
List<SysCategory> geOrderNumList = list(orderNumQueryWrapper);
//判断相邻的序号,去掉不邻的
for (int i = 0; i < geOrderNumList.size(); i++) {
if (geOrderNumList.size() == 1) {
break;
} else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) {
int deleteStart = geOrderNumList.get(i + 1).getSortOrder();
geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList());
break;
}
}
geOrderNumList.stream().forEach(e -> e.setSortOrder(e.getSortOrder() + 1));
saveOrUpdateBatch(geOrderNumList);
}
}
}
@Override
public void setEditOrderNum(SysCategory sysCategory) {
Integer inputOrderNum = sysCategory.getSortOrder();
if(inputOrderNum != null) {
//查询展示顺序相同的
QueryWrapper<SysCategory> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("sys_dict_id",sysCategory.getSysDictId())
.eq("del_flag", CommonConstant.DEL_FLAG_0)
.orderByAsc("sort_order");
Integer orderNumData = list(queryWrapper).stream().filter(e -> e.getId().equals(sysCategory.getId()))
.map(e -> e.getSortOrder()).collect(Collectors.toList()).get(0);
queryWrapper.eq("sort_order", inputOrderNum);
Integer orderNumCount = sysCategoryMapper.selectCount(queryWrapper);
if (orderNumCount > 0 && !orderNumData.equals(inputOrderNum)) {//有重复展示顺序的,后面的号全+1
//设置排序
QueryWrapper<SysCategory> orderNumQueryWrapper = new QueryWrapper<>();
orderNumQueryWrapper.ge("sort_order", inputOrderNum)
.eq("sys_dict_id",sysCategory.getSysDictId())
.eq("del_flag", CommonConstant.DEL_FLAG_0)
.orderByAsc("sort_order");
List<SysCategory> geOrderNumList = list(orderNumQueryWrapper);
//判断相邻的序号,去掉不邻的
for (int i = 0; i < geOrderNumList.size(); i++) {
if (geOrderNumList.size() == 1) {
break;
} else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) {
int deleteStart = geOrderNumList.get(i + 1).getSortOrder();
geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList());
break;
}
}
geOrderNumList.stream().forEach(e -> e.setSortOrder(e.getSortOrder() + 1));
saveOrUpdateBatch(geOrderNumList);
}
}
}
@Override
public List<SysCategory> queryPid() {
QueryWrapper<SysCategory> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("pid",0);
List<SysCategory> list = list(queryWrapper);
return list;
}
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java
+79
View File
@@ -1,6 +1,8 @@
package com.jero.modules.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.constant.CommonConstant;
import com.jero.modules.system.entity.SysDictItem;
import com.jero.modules.system.mapper.SysDictItemMapper;
import com.jero.modules.system.service.ISysDictItemService;
@@ -8,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.stream.Collectors;
/**
* <p>
@@ -52,4 +55,80 @@ public class SysDictItemServiceImpl extends ServiceImpl<SysDictItemMapper, SysDi
public void updateDictDelFlag(int delFlag, String id) {
baseMapper.updateDictDelFlag(delFlag,id);
}
@Override
public void setAddOrdderNum(SysDictItem sysDictItem) {
Integer inputOrderNum = sysDictItem.getSortOrder();
if(inputOrderNum != null) {
//查询展示顺序相同的
QueryWrapper<SysDictItem> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0)
.eq("dict_id",sysDictItem.getDictId())
.orderByAsc("order_num");
queryWrapper.eq("order_num", inputOrderNum);
Integer orderNumCount = sysDictItemMapper.selectCount(queryWrapper);
if (orderNumCount > 0) {//有重复展示顺序的,后面的号全+1
//设置排序
QueryWrapper<SysDictItem> orderNumQueryWrapper = new QueryWrapper<>();
orderNumQueryWrapper.ge("order_num", inputOrderNum)
.eq("dict_id",sysDictItem.getDictId())
.eq("del_flag", CommonConstant.DEL_FLAG_0)
.orderByAsc("order_num");
List<SysDictItem> geOrderNumList = list(orderNumQueryWrapper);
//判断相邻的序号,去掉不邻的
for (int i = 0; i < geOrderNumList.size(); i++) {
if (geOrderNumList.size() == 1) {
break;
} else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) {
int deleteStart = geOrderNumList.get(i + 1).getSortOrder();
geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList());
break;
}
}
geOrderNumList.stream().forEach(e -> e.setSortOrder(e.getSortOrder() + 1));
saveOrUpdateBatch(geOrderNumList);
}
}
}
@Override
public void setEditOrderNum(SysDictItem sysDictItem) {
Integer inputOrderNum = sysDictItem.getSortOrder();
if(inputOrderNum != null) {
//查询展示顺序相同的
QueryWrapper<SysDictItem> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0)
.eq("dict_id",sysDictItem.getDictId())
.orderByAsc("sort_order");
Integer orderNumData = list(queryWrapper).stream().filter(e -> e.getId().equals(sysDictItem.getId()))
.map(e -> e.getSortOrder()).collect(Collectors.toList()).get(0);
queryWrapper.eq("sort_order", inputOrderNum);
Integer orderNumCount = sysDictItemMapper.selectCount(queryWrapper);
if (orderNumCount > 0 && !orderNumData.equals(inputOrderNum)) {//有重复展示顺序的,后面的号全+1
//设置排序
QueryWrapper<SysDictItem> orderNumQueryWrapper = new QueryWrapper<>();
orderNumQueryWrapper.ge("sort_order", inputOrderNum)
.eq("dict_id",sysDictItem.getDictId())
.eq("del_flag", CommonConstant.DEL_FLAG_0)
.orderByAsc("sort_order");
List<SysDictItem> geOrderNumList = list(orderNumQueryWrapper);
//判断相邻的序号,去掉不邻的
for (int i = 0; i < geOrderNumList.size(); i++) {
if (geOrderNumList.size() == 1) {
break;
} else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) {
int deleteStart = geOrderNumList.get(i + 1).getSortOrder();
geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList());
break;
}
}
geOrderNumList.stream().forEach(e -> e.setSortOrder(e.getSortOrder() + 1));
saveOrUpdateBatch(geOrderNumList);
}
}
}
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
+1 -1
View File
@@ -484,7 +484,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
}
@Override
public void setEditOrdderNum(SysDict sysDict) {
public void setEditOrderNum(SysDict sysDict) {
Integer inputOrderNum = sysDict.getOrderNum();
if(inputOrderNum != null) {
//查询展示顺序相同的
jero-web/src/common/lang/en-us.js
+4 -3
View File
@@ -786,10 +786,10 @@ module.exports = {
importTemplate: 'Import Template',
verificationConfirmationDeadline: 'Verification compliance confirmation deadline',
technicalEvaluationResults: 'Technical Evaluation Results',
engineeringConfirmation: 'EngineeringConfirmation',
engineeringConfirmation: 'Project Delivery',
feedbackFromTheEngineer: 'Feedback From The Engineer',
completedBy: 'Completed by',
completedTime: 'Completed time',
completedBy: 'Completed By',
completedTime: 'Completed Time',
replyFromProjectContactPerson: 'Responsible Persons reply',
answer: 'Answer',
distributionEngineer: 'Distribution Engineer',
@@ -891,4 +891,5 @@ module.exports = {
custom:'Custom',
notSelected:'Not selected',
ExportReport:'Export Report',
basicInformation:'Basic Information',
}
jero-web/src/common/lang/zh-cn.js
+3 -2
View File
@@ -794,7 +794,7 @@ module.exports = {
importTemplate: '导入模板',
verificationConfirmationDeadline: '验证符合性确认截止时间',
technicalEvaluationResults: '技术评估结果',
engineeringConfirmation: '工程确认',
engineeringConfirmation: '工程交付',
feedbackFromTheEngineer: '工程师反馈意见',
completedBy: '填写人',
completedTime: '填写时间',
@@ -804,7 +804,7 @@ module.exports = {
reminderHandling: '提醒办理',
addFeedback: '添加反馈',
engineer: '工程师',
engineeringConfirmationDetails: '工程确认详情',
engineeringConfirmationDetails: '工程交付详情',
reminder: '提醒',
adopt: '通过',
reviewedByThePersonInCharge: '负责人审核',
@@ -896,4 +896,5 @@ module.exports = {
custom:'自定义',
notSelected:'未选择',
ExportReport:'导出报告',
basicInformation:'基础信息',
}
jero-web/src/views/processCenter/components/footerProcess.vue
+2 -2
View File
@@ -107,8 +107,8 @@
box-sizing: border-box;
.process-header-title {
height: 68px;
line-height: 68px;
/*height: 68px;*/
/*line-height: 68px;*/
background: #FFFFFF;
text-align: right;
jero-web/src/views/processCenter/components/projectInformation.vue
+5 -1
View File
@@ -2,7 +2,7 @@
<div class="box">
<div class="box-text">
<div class="header-text">
{{$t('essentialInformation')}}
{{title}}
</div>
</div>
<div class="content-text">
@@ -49,6 +49,10 @@
queryProject: {
type: Object,
default: {}
},
title: {
type: String,
default: ''
}
},
data() {
jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
+1 -1
View File
@@ -1,7 +1,7 @@
<template>
<div class="box">
<div class="box-text">
<div class="header-text">
<div class="header-text" v-if="$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'fqrsh'">
{{$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'fqrsh'
? $t('personLiableConfirm'):$t('fillInProjectDelivery')}}
<a-icon :title="$route.query.TaskKey == 'zrrclrw'?$t('pleaseConfirmationResults'):$t('pleaseReviewTask')"
jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+1
View File
@@ -7,6 +7,7 @@
<div class="detail-content">
<projectInformation
v-if="isDisplay"
:title="$t('essentialInformation')"
:projectInformationList="projectInformationList"
:url="url"
:queryProject="queryProject"
jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+1
View File
@@ -7,6 +7,7 @@
<div class="detail-content">
<projectInformation
v-if="isDisplay"
:title="$t('basicInformation')"
:projectInformationList="projectInformationList"
:url="url"
:projectInformationId="this.queryBy.projectLibraryId"
jero-web/src/views/projectManagement/ProjectDetails/index.vue
+15 -4
View File
@@ -49,9 +49,9 @@
</div>
</div>
<div class="Virtual-detail-right">
<ProjectDetailsName v-if="textTitle === '项目详情'"/>
<ProjectDetailsName @TaskListChange="TaskListChange" v-if="textTitle === '项目详情'"/>
<listOfRegulations v-else-if="textTitle === '法规清单'"/>
<TaskList :isDisplayNum="isDisplayNum" v-else-if="textTitle === '任务清单'"/>
<TaskList :isDisplayNum="isDisplayNum" :areaOfResponsibility="areaOfResponsibility" v-else-if="textTitle === '任务清单'"/>
<TaskParameterCollection v-else-if="textTitle === '认证参数收集'"/>
<nonConformance v-else-if="textTitle === '未符合项'"/>
</div>
@@ -95,7 +95,8 @@
logList: '/project/projectLawsInventoryLogEO/page',
historicalVersionUrl: '',
queryUserPremissionByProjectLibraryId: '/project/projectCertificationDirectoryEO/queryUserPremissionByProjectLibraryId'
}
},
areaOfResponsibility:{},
}
},
mounted() {
@@ -140,7 +141,17 @@
this.isDisplayNum = res.result
}
})
}
},
TaskListChange(item){
this.areaOfResponsibility = item
this.textTitle = '任务清单'
let textColor = document.getElementsByClassName('Virtual-detail-left-text-color')
if (textColor && textColor.length > 0) {
textColor[0].classList.remove('Virtual-detail-left-text-color')
}
let text = document.getElementsByClassName('Virtual-detail-left-text')
text[2].classList.add('Virtual-detail-left-text-color')
},
}
}
</script>
jero-web/src/views/projectManagement/components/ProjectDetails.vue
+23 -13
View File
@@ -12,58 +12,64 @@
<div class="content-text">
<div class="text-field">
<span class="text-field-left" :title="$t('entryName')">{{$t('entryName')}}</span>
<span class="text-field-right"
<span class="text-field-right" :title="queryForm.projectName"
>{{queryForm.projectName}}</span>
</div>
<div class="text-field">
<span class="text-field-left" :title="$t('targetMarket')">{{$t('targetMarket')}}</span>
<span class="text-field-right"
<span class="text-field-right" :title="queryForm.targetMarket_dictText"
>{{queryForm.targetMarket_dictText}}</span>
</div>
<div class="text-field">
<span class="text-field-left" :title="$t('projectStatus')">{{$t('projectStatus')}}</span>
<span class="text-field-right"
<span class="text-field-right" :title="queryForm.projectStatus_dictText"
>{{queryForm.projectStatus_dictText}}</span>
</div>
</div>
<div class="content-text">
<div class="text-field">
<span class="text-field-left" :title="$t('DigitalPlatform')">{{$t('DigitalPlatform')}}</span>
<span class="text-field-right"
<span class="text-field-right" :title="queryForm.digitalPlatform"
>{{queryForm.digitalPlatform}}</span>
</div>
<div class="text-field">
<span class="text-field-left" :title="$t('ModelPlatform')">{{$t('ModelPlatform')}}</span>
<span class="text-field-right"
<span class="text-field-right" :title="queryForm.vehiclePlatform"
>{{queryForm.vehiclePlatform}}</span>
</div>
</div>
<div class="content-text">
<div class="text-field">
<span class="text-field-left" :title="$t('StudioEngineer')">{{$t('StudioEngineer')}}</span>
<span class="text-field-right"
<span class="text-field-right" :title="queryForm.studioEngineerName"
>{{queryForm.studioEngineerName}}</span>
</div>
<div class="text-field">
<span class="text-field-left" :title="$t('certifiedEngineer')">{{$t('certifiedEngineer')}}</span>
<span class="text-field-right"
<span class="text-field-right" :title="queryForm.certificationEngineerName"
>{{queryForm.certificationEngineerName}}</span>
</div>
</div>
<div class="content-text">
<div class="text-field">
<span class="text-field-left" :title="$t('IPDInformation')">{{$t('IPDInformation')}}</span>
<span class="text-field-right text-field-right-color" @click="urlClick(queryForm.ipdInfo)"
<span class="text-field-right text-field-right-color"
:title="queryForm.ipdInfo"
@click="urlClick(queryForm.ipdInfo)"
>{{queryForm.ipdInfo}}</span>
</div>
<div class="text-field">
<span class="text-field-left" :title="$t('certificationProgram')">{{$t('certificationProgram')}}</span>
<span class="text-field-right text-field-right-color" @click="urlClick(queryForm.attestationPlan)"
<span class="text-field-right text-field-right-color"
:title="queryForm.attestationPlan"
@click="urlClick(queryForm.attestationPlan)"
>{{queryForm.attestationPlan}}</span>
</div>
<div class="text-field">
<span class="text-field-left" :title="$t('dehicleDevelopmentPlan')">{{$t('dehicleDevelopmentPlan')}}</span>
<span class="text-field-right text-field-right-color" @click="urlClick(queryForm.vehicleDevelopmentPlan)"
<span class="text-field-right text-field-right-color"
:title="queryForm.vehicleDevelopmentPlan"
@click="urlClick(queryForm.vehicleDevelopmentPlan)"
>{{queryForm.vehicleDevelopmentPlan}}</span>
</div>
</div>
@@ -104,13 +110,14 @@
</div>
<a-tabs style="margin-top: 20px" v-model="activeKey" class="ant-tabs">
<a-tab-pane :key="$t('CurrentStatusOfTheProject')" :tab="$t('CurrentStatusOfTheProject')">
<currentStatusOfTheProjectEcharts v-if="activeKey == $t('CurrentStatusOfTheProject')"/>
<currentStatusOfTheProjectEcharts @currentStatus="currentStatus"
v-if="activeKey == $t('CurrentStatusOfTheProject')"/>
</a-tab-pane>
<a-tab-pane :key="$t('DeliverableStatus')" :tab="$t('DeliverableStatus')">
<deliverableStatusEchart v-if="activeKey == $t('DeliverableStatus')"/>
<deliverableStatusEchart @currentStatus="currentStatus" v-if="activeKey == $t('DeliverableStatus')"/>
</a-tab-pane>
<a-tab-pane :key="$t('CertificationProgress')" :tab="$t('CertificationProgress')">
<certificationProgressEchart v-if="activeKey == $t('CertificationProgress')"/>
<certificationProgressEchart @currentStatus="currentStatus" v-if="activeKey == $t('CertificationProgress')"/>
</a-tab-pane>
</a-tabs>
<listOfRelevantPersonnel ref="listOfRelevantPersonnelRef"/>
@@ -169,6 +176,9 @@
}
})
},
currentStatus(item) {
this.$emit('TaskListChange', item)
},
getSetting() {
getAction(this.url.queryByProjectId, { projectId: this.$route.query.id }).then((res) => {
if (res.success) {
jero-web/src/views/projectManagement/components/TaskList.vue
+2 -2
View File
@@ -141,7 +141,7 @@
certificationDirectory,
TaskListModel
},
props:['isDisplayNum'],
props: ['isDisplayNum', 'areaOfResponsibility'],
data() {
return {
columns: [
@@ -257,7 +257,7 @@
mounted() {
this.getList()
this.long = localStorage.getItem('language') || 'zh-cn'
console.log(this.areaOfResponsibility)
},
methods: {
...mapGetters(['userInfo']),
jero-web/src/views/projectManagement/components/certificationProgressEchart.vue
+4 -1
View File
@@ -19,7 +19,7 @@
</a-table>
</div>
</div>
<responsibilityList ref="responsibilityListRef"/>
<responsibilityList @responsibility="responsibility" ref="responsibilityListRef"/>
</div>
</template>
@@ -75,6 +75,9 @@
this.getData()
},
methods: {
responsibility(item) {
this.$emit('currentStatus', item)
},
getData() {
getAction(this.url.getProjectDetailsStatistics, { id: this.$route.query.id }).then((res) => {
if (res.success) {
jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue
+4 -2
View File
@@ -26,7 +26,7 @@
</a-table>
</div>
</div>
<responsibilityList ref="responsibilityListRef"/>
<responsibilityList @responsibility="responsibility" ref="responsibilityListRef"/>
</div>
</template>
@@ -174,8 +174,10 @@
})
}
this.getEcharts('main-left', this.$t('CurrentStatusOfTheProject'), color, data)
},
responsibility(item) {
this.$emit('currentStatus', item)
}
}
}
</script>
jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue
+4 -1
View File
@@ -21,7 +21,7 @@
<div id="main-bottom"></div>
</div>
</div>
<responsibilityList ref="responsibilityListRef"/>
<responsibilityList @responsibility="responsibility" ref="responsibilityListRef"/>
</div>
</template>
@@ -250,6 +250,9 @@
,
mainBottomEcharts(data, color) {
this.getEcharts('main-bottom', this.$t('verificationComplianceConfirmationProgress'), color, data, 5)
},
responsibility(item) {
this.$emit('currentStatus', item)
}
}
}
jero-web/src/views/projectManagement/components/responsibilityList.vue
+10 -3
View File
@@ -26,6 +26,9 @@
:data-source="dataSource"
:columns="columns"
>
<a slot="areaOfResponsibility" slot-scope="text,result" @click="areaOfResponsibilityClick(result)">
{{text}}
</a>
</a-table>
</a-modal>
</template>
@@ -53,15 +56,16 @@
title: this.$t('areaOfResponsibility'),
dataIndex: 'dutyTerritory',
align: 'center',
width:400,
ellipsis: true
width: 400,
ellipsis: true,
scopedSlots: { customRender: 'areaOfResponsibility' }
},
{
title: this.$t('Quantity'),
dataIndex: 'amount',
align: 'center',
ellipsis: true,
width:300,
width: 300
}
]
}
@@ -92,6 +96,9 @@
},
handleCancel() {
this.visible = false
},
areaOfResponsibilityClick(item) {
this.$emit('responsibility', item)
}
}
}