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

修改UAT问题 项目状态看板排序和搜索跳转等

Browse Source
This commit is contained in:
高嵩
2023-03-16 17:40:04 +08:00
parent 516fa722b8
commit 9eb84ced51
8 changed files with 1268 additions and 1080 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+1 -2
View File
@@ -534,8 +534,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
fieldList = fieldList.stream() fieldList = fieldList.stream()
.filter(e -> !"serial_number".equals(e.getDbFieldName()) .filter(e -> !"serial_number".equals(e.getDbFieldName())
&& !"title".equals(e.getDbFieldName()) && !"title".equals(e.getDbFieldName())
&& !"title_en".equals(e.getDbFieldName()) && !"title_en".equals(e.getDbFieldName()))
&& !"state".equals(e.getDbFieldName()))
.collect(Collectors.toList()); .collect(Collectors.toList());
if (fieldList.size() != 0) { if (fieldList.size() != 0) {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
+19 -4
View File
@@ -147,12 +147,27 @@ public class ProjectLibraryBase implements Comparable<ProjectLibraryBase> {
@Override @Override
public int compareTo(ProjectLibraryBase o) { public int compareTo(ProjectLibraryBase o) {
return Integer.valueOf(this.projectVersion)-Integer.valueOf(o.projectVersion);//升序 if (!this.getProjectName().equals(o.getProjectName())) {
// return o.id-this.id;//降序 return this.getProjectName().compareTo(o.getProjectName());//升序
}
if (!this.getYearName().equals(o.getYearName())) {
if (this.getYearName().length() != o.getYearName().length()) {
return this.getYearName().length() - o.getYearName().length();
} else {
return this.getYearName().compareTo(o.getYearName());//升序
}
}
if (!this.getTargetMarket().equals(o.getTargetMarket())) {
return this.getTargetMarket().compareTo(o.getTargetMarket());//升序
}
if (!this.getProjectVersion().equals(o.getProjectVersion())) {
return Integer.valueOf(this.projectVersion) - Integer.valueOf(o.projectVersion);//升序
}
return 0;
} }
public String getShowName(){ public String getShowName() {
return projectName+yearName+targetMarket+projectVersion; return projectName + " " + yearName + "-" + targetMarket + "-" + projectVersion;
} }
@Override @Override
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
+6 -8
View File
@@ -117,7 +117,6 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
} }
} }
List<ProjectLibraryBase> projectLibraryBaseLinkedList = new LinkedList<>(); List<ProjectLibraryBase> projectLibraryBaseLinkedList = new LinkedList<>();
for (ProjectLibraryBase libraryBase : projectLibraryBaseList) { for (ProjectLibraryBase libraryBase : projectLibraryBaseList) {
if(StringUtils.isBlank(libraryBase.getParentId())){ if(StringUtils.isBlank(libraryBase.getParentId())){
@@ -131,13 +130,13 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
projectLibraryBaseLinkedList.addAll(projectLibraryBaseListTemp); projectLibraryBaseLinkedList.addAll(projectLibraryBaseListTemp);
} }
} }
projectLibraryBaseList.sort(Comparator.comparing(ProjectLibraryBase::getShowName)); Collections.sort(projectLibraryBaseList);
List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsByDictCode("region"); List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsByDictCode("region");
for (ProjectLibraryBase libraryBase : projectLibraryBaseList) { for (ProjectLibraryBase libraryBase : projectLibraryBaseList) {
targetMarket(projectLibraryBase, dictItemList, libraryBase); targetMarket(projectLibraryBase, dictItemList, libraryBase);
Map<String,Object> mapList = new HashMap<>(); Map<String,Object> mapList = new HashMap<>();
List<List<TimeNodeVO>> collect = new ArrayList<>(); List<List<TimeNodeVO>> collect;
if(ObjectUtils.isNotEmpty(startTime) && ObjectUtils.isNotEmpty(endTime)){ if(ObjectUtils.isNotEmpty(startTime) && ObjectUtils.isNotEmpty(endTime)){
collect = listNew.stream().filter(e -> libraryBase.getId().equals(e.get(0).getProjectId())).collect(Collectors.toList()); collect = listNew.stream().filter(e -> libraryBase.getId().equals(e.get(0).getProjectId())).collect(Collectors.toList());
}else{ }else{
@@ -147,8 +146,9 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
if(collect.size() != 0){ if(collect.size() != 0){
index ++; index ++;
mapList.put("index",index); mapList.put("index",index);
mapList.put("projectName",libraryBase.getProjectName()+" "+libraryBase.getYearName()+"-"+libraryBase.getTargetMarket()+"-"+libraryBase.getProjectVersion()); mapList.put("projectName",libraryBase.getShowName());
mapList.put("data",collect); mapList.put("data",collect);
mapList.put("projectInfo",libraryBase);
result.add(mapList); result.add(mapList);
} }
} }
@@ -215,9 +215,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
lambdaQueryWrapper.in(ProjectTaskInventoryEO::getProjectLawsInventoryId,projectLawsInventoryEOIdAll); lambdaQueryWrapper.in(ProjectTaskInventoryEO::getProjectLawsInventoryId,projectLawsInventoryEOIdAll);
projectTaskInventoryEOList = projectTaskInventoryEOService.list(lambdaQueryWrapper); projectTaskInventoryEOList = projectTaskInventoryEOService.list(lambdaQueryWrapper);
} }
Collections.sort(projectLibraryBaseList);
projectLibraryBaseList.sort(Comparator.comparing(ProjectLibraryBase::getShowName));
for (ProjectLibraryBase libraryBase : projectLibraryBaseList) { for (ProjectLibraryBase libraryBase : projectLibraryBaseList) {
//处理目标市场 //处理目标市场
targetMarket(projectLibraryBase, dictItemList, libraryBase); targetMarket(projectLibraryBase, dictItemList, libraryBase);
@@ -234,7 +232,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
projectVersion = "00"; projectVersion = "00";
} }
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
map.put("projectName",libraryBase.getProjectName()+" "+libraryBase.getYearName()+"-"+libraryBase.getTargetMarket()+"-"+projectVersion);//项目名称 map.put("projectName",libraryBase.getShowName());//项目名称
map.put("targetMarket",libraryBase.getTargetMarket());//目标市场 map.put("targetMarket",libraryBase.getTargetMarket());//目标市场
//1. 项目当前状态--projectState(蓝/红/黄/绿)-->studio视角下的数据 //1. 项目当前状态--projectState(蓝/红/黄/绿)-->studio视角下的数据
jero-web/src/common/lang/en-us.js
+1
View File
@@ -1384,4 +1384,5 @@ module.exports = {
beforedatein:'In... Before date (inclusive)', beforedatein:'In... Before date (inclusive)',
inRecentMonthsin6:'Within 6 months (implemented)', inRecentMonthsin6:'Within 6 months (implemented)',
batchUpdateDeadline:'Batch update deadline', batchUpdateDeadline:'Batch update deadline',
timeInterval:'Time Interval',
} }
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -1485,4 +1485,5 @@ module.exports = {
beforedatein:'在...日期之前（包含）', beforedatein:'在...日期之前（包含）',
inRecentMonthsin6:'近6个月内（已实施）', inRecentMonthsin6:'近6个月内（已实施）',
batchUpdateDeadline:'批量更新截止时间', batchUpdateDeadline:'批量更新截止时间',
timeInterval:'时间区间',
} }
jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue
+11 -11
View File
@@ -31,17 +31,17 @@
v-model="queryParam.title"></a-input> v-model="queryParam.title"></a-input>
</div> </div>
</a-col> </a-col>
<a-col :md="12" :sm="8"> <!-- <a-col :md="12" :sm="8">-->
<div class="box-title-text"> <!-- <div class="box-title-text">-->
<div class="title-text" :title="$t('status')"> <!-- <div class="title-text" :title="$t('status')">-->
<span>{{$t('status')}}</span> <!-- <span>{{$t('status')}}</span>-->
</div> <!-- </div>-->
<j-dict-select-tag class="box-input" v-model="queryParam.state" <!-- <j-dict-select-tag class="box-input" v-model="queryParam.state"-->
:placeholder="$t('PleaseSelect')+$t('status')" <!-- :placeholder="$t('PleaseSelect')+$t('status')"-->
:type="'select'" <!-- :type="'select'"-->
:triggerChange="false" :dictCode="'state'"/> <!-- :triggerChange="false" :dictCode="'state'"/>-->
</div> <!-- </div>-->
</a-col> <!-- </a-col>-->
</template> </template>
<span style="float: right;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="12" :sm="24"> <a-col :md="12" :sm="24">
jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue
+204 -65
View File
@@ -3,16 +3,55 @@
<div class="Virtual-detail-header" style="position: fixed;top: 0"> <div class="Virtual-detail-header" style="position: fixed;top: 0">
<div class="Virtual-detail-title"> <div class="Virtual-detail-title">
<span> <span>
{{this.$t('regulatoryCertificationTaskPlan')}} {{ this.$t('regulatoryCertificationTaskPlan') }}
</span> </span>
</div> </div>
</div> </div>
<div style="padding: 87px 0 0 0;background: #ffffff;height:100%"> <div style="padding: 87px 0 0 0;background: #ffffff;height:100%">
<div class="detail-content" style="height: 100%"> <div class="detail-content" style="height: 100%">
<span style="float: right" class="box-top-text-right"> <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('entryName')">
<span>{{ $t('entryName') }}</span>
</div>
<a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('entryName')"
v-model="queryParam.projectName"></a-input>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('targetMarket')">
<span>{{ $t('targetMarket') }}</span>
</div>
<j-dict-select-tag class="box-input" v-model="queryParam.targetMarket"
:placeholder="$t('PleaseSelect')+$t('targetMarket')"
:type="'select'"
:triggerChange="false" :dictCode="'region'" />
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('projectStatus')">
<span>{{ $t('projectStatus') }}</span>
</div>
<j-dict-select-tag class="box-input" v-model="queryParam.projectStatus"
:placeholder="$t('PleaseSelect')+$t('projectStatus')"
:type="'select'"
:triggerChange="false" :dictCode="'project_status'" />
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('timeInterval')">
<span>{{ $t('timeInterval') }}</span>
</div>
<a-range-picker <a-range-picker
:placeholder="[this.$t('startMonth'), this.$t('endMonth')]" :placeholder="[this.$t('startMonth'), this.$t('endMonth')]"
format="YYYY-MM" format="YYYY-MM"
class="box-input"
v-model="getTime" v-model="getTime"
:mode="mode2" :mode="mode2"
:open="open" :open="open"
@@ -22,22 +61,71 @@
> >
<div slot="renderExtraFooter" style="width: 100%;display: block"> <div slot="renderExtraFooter" style="width: 100%;display: block">
<div style="text-align: right;width: 100%"> <div style="text-align: right;width: 100%">
<a-button type="primary" @click="okChange">{{$t('determine')}}</a-button> <a-button type="primary" @click="okChange">{{ $t('determine') }}</a-button>
</div> </div>
</div> </div>
</a-range-picker> </a-range-picker>
</div>
</a-col>
<a-col :md="6" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('brand')">
<span>{{ $t('brand') }}</span>
</div>
<j-dict-select-tag class="box-input" v-model="queryParam.brand"
:placeholder="$t('PleaseSelect')+$t('brand')"
:type="'select'"
:triggerChange="false" :dictCode="'brand'" />
</div>
</a-col>
<span style="float: right" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
<a-button class="box-button" style="margin-left: 8px"
@click="searchReset">{{ $t('reset') }}</a-button>
</a-col>
</span> </span>
</a-row>
</a-form>
</div>
<!-- <span style="float: right" class="box-top-text-right">-->
<!-- <a-range-picker-->
<!-- :placeholder="[this.$t('startMonth'), this.$t('endMonth')]"-->
<!-- format="YYYY-MM"-->
<!-- v-model="getTime"-->
<!-- :mode="mode2"-->
<!-- :open="open"-->
<!-- @openChange="openChange"-->
<!-- @panelChange="panelChange"-->
<!-- @change="hodeChange"-->
<!-- >-->
<!-- <div slot="renderExtraFooter" style="width: 100%;display: block">-->
<!-- <div style="text-align: right;width: 100%">-->
<!-- <a-button type="primary" @click="okChange">{{ $t('determine') }}</a-button>-->
<!-- </div>-->
<!-- </div>-->
<!-- </a-range-picker>-->
<!-- </span>-->
<div class="box-top-content" style="position: relative"> <div class="box-top-content" style="position: relative">
<!-- <div id="main"></div>--> <!-- <div id="main"></div>-->
<!-- <div class="axis-tip"></div>--> <!-- <div class="axis-tip"></div>-->
<div class="box-top-content-right-top"> <div class="box-top-content-right-top">
<div class="box-top-content-right-top-text" v-for="(item,index) in timeList" :key="index">{{item}}</div> <div class="box-top-content-right-top-text" v-for="(item,index) in timeList" :key="index">{{ item }}</div>
</div> </div>
<div style="overflow:visible;"> <div style="overflow:visible;">
<div class="box-top-content-left"> <div class="box-top-content-left">
<div class="box-top-content-left-text" :title="item.projectName" <div class="box-top-content-left-text"
v-for="(item,index) in timeData" :key="index"> v-for="(item,index) in timeData" :key="index">
{{item.projectName}} <a-tooltip overlayClassName="overlayClassName" placement="topLeft">
<template slot="title">
<div>{{ item.projectName }}</div>
<div>
{{ $t('explain') }}:{{ item.projectInfo.explanation }}
</div>
</template>
<span @click="projectInfoClick(item.projectInfo)" style="cursor: pointer">{{ item.projectName
}}</span>
</a-tooltip>
</div> </div>
</div> </div>
<div class="box-top-content-right"> <div class="box-top-content-right">
@@ -47,12 +135,13 @@
<div class="process-content-content" :style="val.left" <div class="process-content-content" :style="val.left"
v-for="(val,indexOne) in item.data[0]" :key="indexOne"> v-for="(val,indexOne) in item.data[0]" :key="indexOne">
<div class="process-content-right-top" v-if="indexOne % 2 == 0" :title="val.name">{{val.name}}</div> <div class="process-content-right-top" v-if="indexOne % 2 == 0" :title="val.name">{{ val.name }}
<div class="process-content-right-button" v-if="indexOne % 2 == 1" :title="val.name">{{val.name}} </div>
<div class="process-content-right-button" v-if="indexOne % 2 == 1" :title="val.name">{{ val.name }}
</div> </div>
<a-tooltip placement="topLeft" overlayClassName="tooltipColor"> <a-tooltip placement="topLeft" overlayClassName="tooltipColor">
<template slot="title"> <template slot="title">
<span>{{val.time.slice(0,11)}}</span> <span>{{ val.time.slice(0, 11) }}</span>
</template> </template>
<img v-if="val.status == 1" src="../../../../assets/done.svg" class="process-content-left" alt=""> <img v-if="val.status == 1" src="../../../../assets/done.svg" class="process-content-left" alt="">
<img v-else-if="val.status == 2" src="../../../../assets/open.svg" <img v-else-if="val.status == 2" src="../../../../assets/open.svg"
@@ -67,13 +156,13 @@
</div> </div>
<div class="box-top-content-right-xian"></div> <div class="box-top-content-right-xian"></div>
<div class="box-top-content-right-text"> <div class="box-top-content-right-text">
{{handlingTime}} {{ handlingTime }}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<JLoading :loading="loadingMain">{{this.$t('dataLoading')}}</JLoading> <JLoading :loading="loadingMain">{{ this.$t('dataLoading') }}</JLoading>
</div> </div>
</div> </div>
</div> </div>
@@ -81,11 +170,11 @@
</template> </template>
<script> <script>
import { getAction, postAction, deleteAction } from '@/api/manage' import { getAction, postAction, deleteAction } from '@/api/manage'
import moment from 'moment' import moment from 'moment'
import * as echarts from 'echarts' import * as echarts from 'echarts'
export default { export default {
name: 'TaskPlanList', name: 'TaskPlanList',
data() { data() {
return { return {
@@ -103,7 +192,9 @@
getTime: [], getTime: [],
timeList: [], timeList: [],
timeData: [], timeData: [],
handlingTime: '' handlingTime: '',
queryParam: {},
toggleSearchStatus: false
} }
}, },
created() { created() {
@@ -180,7 +271,8 @@
getTimeline() { getTimeline() {
let query = { let query = {
startTime: this.startTime || this.getNewDate('before', 6), startTime: this.startTime || this.getNewDate('before', 6),
endTime: this.endTime || this.getNewDate('after', 5) endTime: this.endTime || this.getNewDate('after', 5),
...this.queryParam
} }
this.loadingMain = true this.loadingMain = true
getAction(this.url.timeline, query).then((res) => { getAction(this.url.timeline, query).then((res) => {
@@ -191,12 +283,19 @@
} }
}) })
}, },
projectInfoClick(item) {
let newUrl = this.$router.resolve({
path: '/ProjectDetails',
query: item
})
window.open(newUrl.href, '_blank')
},
openChange(val) { openChange(val) {
this.open = val this.open = val
}, },
okChange() { okChange() {
this.open = false this.open = false
this.getTimeline() // this.getTimeline()
}, },
hodeChange() { hodeChange() {
this.getTime = [] this.getTime = []
@@ -212,7 +311,8 @@
getTimelineList(time) { getTimelineList(time) {
let query = { let query = {
startTime: this.startTime || this.getNewDate('before', 6), startTime: this.startTime || this.getNewDate('before', 6),
endTime: this.endTime || this.getNewDate('after', 5) endTime: this.endTime || this.getNewDate('after', 5),
...this.queryParam
} }
getAction(this.url.timelineList, query).then((res) => { getAction(this.url.timelineList, query).then((res) => {
if (res.success) { if (res.success) {
@@ -312,20 +412,44 @@
this.loadingMain = false this.loadingMain = false
}, 500) }, 500)
},
searchQuery() {
this.getTimeline()
},
searchReset() {
this.getTime = []
this.startTime = undefined
this.endTime = undefined
this.queryParam = {}
this.getTimeline()
} }
} }
} }
</script> </script>
<style> <style>
.ant-calendar-footer-btn .ant-calendar-footer-extra{ .ant-calendar-footer-btn .ant-calendar-footer-extra {
float: right; float: right;
} }
.overlayClassName .ant-tooltip-inner {
color: #fff !important;
background-color: rgba(0, 0, 0, 0.75) !important;
}
.overlayClassName .ant-tooltip-arrow::before {
background-color: rgba(0, 0, 0, 0.75) !important;
}
.overlayClassName {
max-width: 500px !important;
}
</style> </style>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
.doc-detail {
.doc-detail {
background: #fff; background: #fff;
height: 100%; height: 100%;
@@ -351,16 +475,16 @@
line-height: 68px; line-height: 68px;
} }
} }
} }
.box-title-text { .box-title-text {
line-height: 1.4; line-height: 1.4;
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 10px; margin-bottom: 10px;
} }
.title-text { .title-text {
width: 70px; width: 70px;
color: #000F16; color: #000F16;
display: inline-block; display: inline-block;
@@ -372,41 +496,42 @@
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.box-input { .box-input {
display: inline-block; display: inline-block;
width: 70%; width: calc(100% - 70px);
height: 38px; height: 38px;
margin-top: 2px; margin-top: 2px;
} }
.box-top-text { .box-top-text {
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 500;
color: #000F16; color: #000F16;
display: inline-block; display: inline-block;
} }
.box-top-content { .box-top-content {
width: 100%; width: 100%;
height: calc(100vh - 160px); height: calc(100vh - 200px);
margin-bottom: 20px; margin-bottom: 20px;
padding: 0 50px 10px 20px; padding: 0 50px 10px 20px;
box-sizing: border-box; box-sizing: border-box;
overflow: auto; overflow: auto;
} }
.box-button { .box-button {
height: 38px; height: 38px;
} display: inline-block;
}
#main { #main {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.axis-tip { .axis-tip {
display: none; display: none;
position: absolute; position: absolute;
padding: 5px 5px; padding: 5px 5px;
@@ -416,9 +541,9 @@
background: #ffffff; background: #ffffff;
box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.2); box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.2);
border-radius: 4px; border-radius: 4px;
} }
.box-top-text-right { .box-top-text-right {
display: inline-block; display: inline-block;
float: right; float: right;
height: 38px; height: 38px;
@@ -426,16 +551,26 @@
margin-top: -4px; margin-top: -4px;
margin-right: 20px; margin-right: 20px;
margin-bottom: 10px; margin-bottom: 10px;
} }
.box-top-content-left { .box-top-text-left {
display: inline-block;
float: left;
height: 38px;
width: 100%;
margin-top: -4px;
margin-left: 20px;
margin-bottom: 10px;
}
.box-top-content-left {
width: 140px; width: 140px;
float: left; float: left;
padding-top: 68px; padding-top: 68px;
margin-right: 20px; margin-right: 20px;
} }
.box-top-content-left-text { .box-top-content-left-text {
color: #191E29; color: #191E29;
font-weight: bold; font-weight: bold;
font-size: 12px; font-size: 12px;
@@ -445,14 +580,14 @@
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
} }
.box-top-content-right { .box-top-content-right {
width: calc(100% - 160px); width: calc(100% - 160px);
float: left; float: left;
} }
.box-top-content-right-top { .box-top-content-right-top {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
@@ -462,9 +597,9 @@
z-index: 100; z-index: 100;
padding-top: 25px; padding-top: 25px;
padding-left: 160px; padding-left: 160px;
} }
.box-top-content-right-top-text { .box-top-content-right-top-text {
border-left: 1px #EAEAEC solid; border-left: 1px #EAEAEC solid;
border-top: 1px #EAEAEC solid; border-top: 1px #EAEAEC solid;
border-bottom: 1px #EAEAEC solid; border-bottom: 1px #EAEAEC solid;
@@ -476,18 +611,18 @@
line-height: 36px; line-height: 36px;
letter-spacing: 0px; letter-spacing: 0px;
text-align: center; text-align: center;
} }
.box-top-content-right-top-text:last-child { .box-top-content-right-top-text:last-child {
border-right: 1px #EAEAEC solid; border-right: 1px #EAEAEC solid;
} }
.box-top-content-right-bottom { .box-top-content-right-bottom {
position: relative; position: relative;
padding-top: 60px; padding-top: 60px;
} }
.process-content { .process-content {
position: relative; position: relative;
height: 84px; height: 84px;
@@ -554,18 +689,18 @@
position: absolute; position: absolute;
top: 16px; top: 16px;
} }
} }
.box-top-content-right-xian { .box-top-content-right-xian {
width: 2px; width: 2px;
height: 100%; height: 100%;
border: 1px #21c9cc dashed; border: 1px #21c9cc dashed;
position: absolute; position: absolute;
top: -36px; top: -36px;
z-index: 999; z-index: 999;
} }
.box-top-content-right-text { .box-top-content-right-text {
position: absolute; position: absolute;
top: -60px; top: -60px;
color: #21c9cc; color: #21c9cc;
@@ -573,5 +708,9 @@
font-size: 14px; font-size: 14px;
width: 100px; width: 100px;
z-index: 101; z-index: 101;
} }
::v-deep .ant-row {
margin-right: 0 !important;
}
</style> </style>
jero-web/src/views/projectManagement/projectStatusBoard/index.vue
+127 -92
View File
@@ -6,7 +6,7 @@
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text" :title="$t('entryName')"> <div class="title-text" :title="$t('entryName')">
<span>{{$t('entryName')}}</span> <span>{{ $t('entryName') }}</span>
</div> </div>
<j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('entryName')" <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('entryName')"
v-model="queryParam.projectName"></j-input> v-model="queryParam.projectName"></j-input>
@@ -15,37 +15,38 @@
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text" :title="$t('targetMarket')"> <div class="title-text" :title="$t('targetMarket')">
<span>{{$t('targetMarket')}}</span> <span>{{ $t('targetMarket') }}</span>
</div> </div>
<j-dict-select-tag class="box-input" v-model="queryParam.targetMarket" <j-dict-select-tag class="box-input" v-model="queryParam.targetMarket"
:placeholder="$t('PleaseSelect')+$t('targetMarket')" :placeholder="$t('PleaseSelect')+$t('targetMarket')"
:type="'select'" :type="'select'"
:triggerChange="false" :dictCode="'region'"/> :triggerChange="false" :dictCode="'region'" />
</div> </div>
</a-col> </a-col>
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text" :title="$t('brand')"> <div class="title-text" :title="$t('brand')">
<span>{{$t('brand')}}</span> <span>{{ $t('brand') }}</span>
</div> </div>
<j-dict-select-tag class="box-input" v-model="queryParam.brand" <j-dict-select-tag class="box-input" v-model="queryParam.brand"
:placeholder="$t('PleaseSelect')+$t('brand')" :placeholder="$t('PleaseSelect')+$t('brand')"
:type="'select'" :type="'select'"
:triggerChange="false" :dictCode="'brand'"/> :triggerChange="false" :dictCode="'brand'" />
</div> </div>
</a-col> </a-col>
<span style="float: right;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
<a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button> <a-button class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
<a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button> <a-button class="box-button" style="margin-left: 8px"
@click="searchReset">{{ $t('reset') }}</a-button>
</a-col> </a-col>
</span> </span>
</a-row> </a-row>
</a-form> </a-form>
</div> </div>
<div class="box-top"> <div class="box-top">
<span class="box-top-text">{{$t('regulatoryCertificationTaskPlan')}}</span> <span class="box-top-text">{{ $t('regulatoryCertificationTaskPlan') }}</span>
<span class="box-top-text fullScreenView" @click="TaskPlanListClick">{{$t('fullScreenView')}}</span> <span class="box-top-text fullScreenView" @click="TaskPlanListClick">{{ $t('fullScreenView') }}</span>
<span style="float: right" class="box-top-text-right"> <span style="float: right" class="box-top-text-right">
<a-range-picker <a-range-picker
:placeholder="[this.$t('startMonth'), this.$t('endMonth')]" :placeholder="[this.$t('startMonth'), this.$t('endMonth')]"
@@ -59,7 +60,7 @@
> >
<div slot="renderExtraFooter" style="width: 100%;display: block"> <div slot="renderExtraFooter" style="width: 100%;display: block">
<div style="text-align: right;width: 100%;"> <div style="text-align: right;width: 100%;">
<a-button type="primary" @click="okChange">{{$t('determine')}}</a-button> <a-button type="primary" @click="okChange">{{ $t('determine') }}</a-button>
</div> </div>
</div> </div>
</a-range-picker> </a-range-picker>
@@ -68,13 +69,21 @@
<!-- <div id="main"></div>--> <!-- <div id="main"></div>-->
<!-- <div class="axis-tip"></div>--> <!-- <div class="axis-tip"></div>-->
<div class="box-top-content-right-top"> <div class="box-top-content-right-top">
<div class="box-top-content-right-top-text" v-for="(item,index) in timeList" :key="index">{{item}}</div> <div class="box-top-content-right-top-text" v-for="(item,index) in timeList" :key="index">{{ item }}</div>
</div> </div>
<div style="overflow:visible;"> <div style="overflow:visible;">
<div class="box-top-content-left"> <div class="box-top-content-left">
<div class="box-top-content-left-text" :title="item.projectName" <div class="box-top-content-left-text"
v-for="(item,index) in timeData" :key="index"> v-for="(item,index) in timeData" :key="index">
{{item.projectName}} <a-tooltip overlayClassName="overlayClassName" placement="topLeft">
<template slot="title">
<div>{{ item.projectName }}</div>
<div>
{{$t('explain')}}:{{item.projectInfo.explanation}}
</div>
</template>
<span @click="projectInfoClick(item.projectInfo)" style="cursor: pointer">{{ item.projectName }}</span>
</a-tooltip>
</div> </div>
</div> </div>
<div class="box-top-content-right"> <div class="box-top-content-right">
@@ -83,12 +92,12 @@
<div class="process-content-right-xian"></div> <div class="process-content-right-xian"></div>
<div class="process-content-content" :style="val.left" <div class="process-content-content" :style="val.left"
v-for="(val,indexOne) in item.data[0]" :key="indexOne"> v-for="(val,indexOne) in item.data[0]" :key="indexOne">
<div class="process-content-right-top" v-if="indexOne % 2 == 0" :title="val.name">{{val.name}}</div> <div class="process-content-right-top" v-if="indexOne % 2 == 0" :title="val.name">{{ val.name }}</div>
<div class="process-content-right-button" v-if="indexOne % 2 == 1" :title="val.name">{{val.name}} <div class="process-content-right-button" v-if="indexOne % 2 == 1" :title="val.name">{{ val.name }}
</div> </div>
<a-tooltip placement="topLeft" overlayClassName="tooltipColor"> <a-tooltip placement="topLeft" overlayClassName="tooltipColor">
<template slot="title"> <template slot="title">
<span>{{val.time.slice(0,11)}}</span> <span>{{ val.time.slice(0, 11) }}</span>
</template> </template>
<img v-if="val.status == 1" src="../../../assets/done.svg" class="process-content-left" <img v-if="val.status == 1" src="../../../assets/done.svg" class="process-content-left"
alt=""> alt="">
@@ -104,17 +113,17 @@
</div> </div>
<div class="box-top-content-right-xian"></div> <div class="box-top-content-right-xian"></div>
<div class="box-top-content-right-text"> <div class="box-top-content-right-text">
{{handlingTime}} {{ handlingTime }}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<JLoading :loading="loadingMain">{{this.$t('dataLoading')}}</JLoading> <JLoading :loading="loadingMain">{{ this.$t('dataLoading') }}</JLoading>
</div> </div>
</div> </div>
<div class="box-bottom"> <div class="box-bottom">
<span class="box-top-text">{{$t('projectStatusAndProgress')}}</span> <span class="box-top-text">{{ $t('projectStatusAndProgress') }}</span>
<span class="box-top-text fullScreenView" @click="projectNameClick">{{$t('fullScreenView')}}</span> <span class="box-top-text fullScreenView" @click="projectNameClick">{{ $t('fullScreenView') }}</span>
<div> <div>
<a-table <a-table
ref="table" ref="table"
@@ -127,32 +136,38 @@
:columns="columns" :columns="columns"
> >
<span slot="projectStatusTitle"> <span slot="projectStatusTitle">
<span>{{this.$t('CurrentStatusOfTheProject')}}</span><br/> <span>{{ this.$t('CurrentStatusOfTheProject') }}</span><br />
<span>{{'('+$t('red')+'/'+$t('yellow')+'/'+$t('green')+'/'+$t('blue')+')'}}</span> <span>{{ '(' + $t('red') + '/' + $t('yellow') + '/' + $t('green') + '/' + $t('blue') + ')' }}</span>
</span> </span>
<span slot="CertificationProgressTitle"> <span slot="CertificationProgressTitle">
<span>{{this.$t('CertificationProgress')}}</span><br/> <span>{{ this.$t('CertificationProgress') }}</span><br />
<span>{{'('+$t('notInvolved')+'/'+$t('toBeStarted')+'/'+$t('inProgress')+'/'+$t('experimentFailed')+'/'+$t('experimentPassed')+')'}}</span> <span>{{ '(' + $t('notInvolved') + '/' + $t('toBeStarted') + '/' + $t('inProgress') + '/' + $t('experimentFailed') + '/' + $t('experimentPassed') + ')'
}}</span>
</span> </span>
<span slot="listConfirmationStatusTitle"> <span slot="listConfirmationStatusTitle">
<span>{{this.$t('listConfirmation')}}</span><br/> <span>{{ this.$t('listConfirmation') }}</span><br />
<span>{{'('+$t('notLaunch')+'/'+$t('toBeConfirmed')+'/'+$t('accept')+'/'+$t('refuse')+')'}}</span> <span>{{ '(' + $t('notLaunch') + '/' + $t('toBeConfirmed') + '/' + $t('accept') + '/' + $t('refuse') + ')'
}}</span>
</span> </span>
<span slot="taskAffirmStatusTitle"> <span slot="taskAffirmStatusTitle">
<span>{{this.$t('taskAffirm')}}</span><br/> <span>{{ this.$t('taskAffirm') }}</span><br />
<span>{{'('+$t('notLaunch')+'/'+$t('toBeConfirmed')+'/'+$t('accept')+'/'+$t('refuse')+')'}}</span> <span>{{ '(' + $t('notLaunch') + '/' + $t('toBeConfirmed') + '/' + $t('accept') + '/' + $t('refuse') + ')'
}}</span>
</span> </span>
<span slot="designComplianceReviewTitle"> <span slot="designComplianceReviewTitle">
<span>{{this.$t('designComplianceReview')}}</span><br/> <span>{{ this.$t('designComplianceReview') }}</span><br />
<span>{{'('+$t('toBeConfirmed')+'/'+$t('accord')+'/'+$t('nonConformity')+'/'+$t('Tracked')+'/'+$t('notInvolved')+'/'+$t('taskTermination')+')'}}</span> <span>{{ '(' + $t('toBeConfirmed') + '/' + $t('accord') + '/' + $t('nonConformity') + '/' + $t('Tracked') + '/' + $t('notInvolved') + '/' + $t('taskTermination') + ')'
}}</span>
</span> </span>
<span slot="preHomeConfirmationTitle"> <span slot="preHomeConfirmationTitle">
<span>{{this.$t('preHomeConfirmation')}}</span><br/> <span>{{ this.$t('preHomeConfirmation') }}</span><br />
<span>{{'('+$t('toBeConfirmed')+'/'+$t('accord')+'/'+$t('nonConformity')+'/'+$t('Tracked')+'/'+$t('notInvolved')+'/'+$t('taskTermination')+')'}}</span> <span>{{ '(' + $t('toBeConfirmed') + '/' + $t('accord') + '/' + $t('nonConformity') + '/' + $t('Tracked') + '/' + $t('notInvolved') + '/' + $t('taskTermination') + ')'
}}</span>
</span> </span>
<span slot="verificationComplianceReviewTitle"> <span slot="verificationComplianceReviewTitle">
<span>{{this.$t('verificationComplianceReview')}}</span><br/> <span>{{ this.$t('verificationComplianceReview') }}</span><br />
<span>{{'('+$t('toBeConfirmed')+'/'+$t('accord')+'/'+$t('nonConformity')+'/'+$t('Tracked')+'/'+$t('notInvolved')+'/'+$t('taskTermination')+')'}}</span> <span>{{ '(' + $t('toBeConfirmed') + '/' + $t('accord') + '/' + $t('nonConformity') + '/' + $t('Tracked') + '/' + $t('notInvolved') + '/' + $t('taskTermination') + ')'
}}</span>
</span> </span>
</a-table> </a-table>
</div> </div>
@@ -161,14 +176,14 @@
</template> </template>
<script> <script>
import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage' import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
import * as echarts from 'echarts' import * as echarts from 'echarts'
import moment from 'moment' import moment from 'moment'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
export default { export default {
name: 'index', name: 'index',
mixins:[ResizeHeader, ResizeColumnProvide], mixins: [ResizeHeader, ResizeColumnProvide],
data() { data() {
return { return {
queryParam: {}, queryParam: {},
@@ -458,6 +473,7 @@
}) })
this.timeData = timeData this.timeData = timeData
console.log(this.timeData)
this.timeData = [...this.timeData] this.timeData = [...this.timeData]
this.loadingMain = false this.loadingMain = false
}, 500) }, 500)
@@ -495,30 +511,48 @@
path: '/projectStatusAndProgress' path: '/projectStatusAndProgress'
}) })
window.open(newUrl.href, '_blank') window.open(newUrl.href, '_blank')
},
projectInfoClick(item){
let newUrl = this.$router.resolve({
path: '/ProjectDetails',
query: item
})
window.open(newUrl.href, '_blank')
},
} }
} }
}
</script> </script>
<style> <style>
.box-top-text-right .ant-calendar-picker-input { .box-top-text-right .ant-calendar-picker-input {
height: 38px; height: 38px;
width: 300px; width: 300px;
} }
.ant-calendar-footer-btn .ant-calendar-footer-extra{
.ant-calendar-footer-btn .ant-calendar-footer-extra {
float: right; float: right;
} }
.overlayClassName .ant-tooltip-inner {
color: #fff!important;
background-color: rgba(0, 0, 0, 0.75) !important;
}
.overlayClassName .ant-tooltip-arrow::before{
background-color: rgba(0, 0, 0, 0.75) !important;
}
.overlayClassName{
max-width: 500px!important;
}
</style> </style>
<style scoped lang="less"> <style scoped lang="less">
@import'~@assets/less/common.less'; @import '~@assets/less/common.less';
.box-title-text { .box-title-text {
line-height: 1.4; line-height: 1.4;
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 10px; margin-bottom: 10px;
} }
.title-text { .title-text {
width: 70px; width: 70px;
color: #000F16; color: #000F16;
display: inline-block; display: inline-block;
@@ -530,42 +564,42 @@
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.box-input { .box-input {
display: inline-block; display: inline-block;
width: 70%; width: 70%;
height: 38px; height: 38px;
margin-top: 2px; margin-top: 2px;
} }
.box-top-text { .box-top-text {
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 500;
color: #000F16; color: #000F16;
margin-bottom: 20px; margin-bottom: 20px;
display: inline-block; display: inline-block;
} }
.box-top-content { .box-top-content {
width: 100%; width: 100%;
height: 500px; height: 500px;
margin-bottom: 20px; margin-bottom: 20px;
padding: 0 58px 20px 10px; padding: 0 58px 20px 10px;
box-sizing: border-box; box-sizing: border-box;
overflow: auto; overflow: auto;
} }
.box-button { .box-button {
height: 38px; height: 38px;
} }
#main { #main {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.axis-tip { .axis-tip {
display: none; display: none;
position: absolute; position: absolute;
padding: 5px 5px; padding: 5px 5px;
@@ -575,30 +609,30 @@
background: #ffffff; background: #ffffff;
box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.2); box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.2);
border-radius: 4px; border-radius: 4px;
} }
.box-top-text-right { .box-top-text-right {
display: inline-block; display: inline-block;
float: right; float: right;
height: 38px; height: 38px;
width: 300px; width: 300px;
margin-top: -4px; margin-top: -4px;
} }
.fullScreenView { .fullScreenView {
margin-left: 16px; margin-left: 16px;
color: #21c9cc; color: #21c9cc;
cursor: pointer; cursor: pointer;
} }
.box-top-content-left { .box-top-content-left {
width: 140px; width: 140px;
float: left; float: left;
padding-top: 57px; padding-top: 57px;
margin-right: 20px; margin-right: 20px;
} }
.box-top-content-left-text { .box-top-content-left-text {
color: #191E29; color: #191E29;
font-weight: bold; font-weight: bold;
font-size: 12px; font-size: 12px;
@@ -608,14 +642,14 @@
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
} }
.box-top-content-right { .box-top-content-right {
width: calc(100% - 160px); width: calc(100% - 160px);
float: left; float: left;
} }
.box-top-content-right-top { .box-top-content-right-top {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
@@ -625,9 +659,9 @@
z-index: 100; z-index: 100;
padding-top: 20px; padding-top: 20px;
padding-left: 160px; padding-left: 160px;
} }
.box-top-content-right-top-text { .box-top-content-right-top-text {
border-left: 1px #EAEAEC solid; border-left: 1px #EAEAEC solid;
border-top: 1px #EAEAEC solid; border-top: 1px #EAEAEC solid;
border-bottom: 1px #EAEAEC solid; border-bottom: 1px #EAEAEC solid;
@@ -640,18 +674,18 @@
line-height: 36px; line-height: 36px;
letter-spacing: 0px; letter-spacing: 0px;
text-align: center; text-align: center;
} }
.box-top-content-right-top-text:last-child { .box-top-content-right-top-text:last-child {
border-right: 1px #EAEAEC solid; border-right: 1px #EAEAEC solid;
} }
.box-top-content-right-bottom { .box-top-content-right-bottom {
position: relative; position: relative;
padding-top: 50px; padding-top: 50px;
} }
.process-content { .process-content {
position: relative; position: relative;
height: 84px; height: 84px;
@@ -718,18 +752,18 @@
position: absolute; position: absolute;
top: 16px; top: 16px;
} }
} }
.box-top-content-right-xian { .box-top-content-right-xian {
width: 2px; width: 2px;
height: 100%; height: 100%;
border: 1px #21c9cc dashed; border: 1px #21c9cc dashed;
position: absolute; position: absolute;
top: -36px; top: -36px;
z-index: 999; z-index: 999;
} }
.box-top-content-right-text { .box-top-content-right-text {
position: absolute; position: absolute;
top: -60px; top: -60px;
color: #21c9cc; color: #21c9cc;
@@ -737,13 +771,14 @@
font-size: 14px; font-size: 14px;
width: 100px; width: 100px;
z-index: 101; z-index: 101;
} }
/deep/.ant-table-column-title{ /deep/ .ant-table-column-title {
font-weight: bold!important; font-weight: bold !important;
} }
::v-deep .ant-table-placeholder{ ::v-deep .ant-table-placeholder {
margin-top: 8px !important; margin-top: 8px !important;
} }
</style> </style>