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

对接项目库详情的项目状态

Browse Source
This commit is contained in:
范强强
2023-04-26 17:03:56 +08:00
parent 410091d828
commit 9771e84f7d
4 changed files with 297 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/projectManagement/components/certificationActivity.vue
+44 -33
View File
@@ -97,34 +97,38 @@
data.push({ data.push({
value: res.taskAffirmStatusCount, value: res.taskAffirmStatusCount,
name: this.$t('notLaunch'), name: this.$t('notLaunch'),
color: '#00B3BE' color: '#00B3BE',
status:res.taskAffirmStatus
}) })
color.push('#00B3BE') color.push('#00B3BE')
} else if (res.taskAffirmStatus == 'List to confirm') { } else if (res.taskAffirmStatus == 'List to confirm') {
data.push({ data.push({
value: res.taskAffirmStatusCount, value: res.taskAffirmStatusCount,
name: this.$t('listToConfirm'), name: this.$t('listToConfirm'),
color: '#FDA71C' color: '#FDA71C',
status:res.taskAffirmStatus
}) })
color.push('#FDA71C') color.push('#FDA71C')
} else if (res.taskAffirmStatus == 'Accepted') { } else if (res.taskAffirmStatus == 'Accepted') {
data.push({ data.push({
value: res.taskAffirmStatusCount, value: res.taskAffirmStatusCount,
name: this.$t('accept'), name: this.$t('accept'),
color: '#26BC4B' color: '#26BC4B',
status:res.taskAffirmStatus
}) })
color.push('#26BC4B') color.push('#26BC4B')
} else if (res.taskAffirmStatus == 'Rejected') { } else if (res.taskAffirmStatus == 'Rejected') {
data.push({ data.push({
value: res.taskAffirmStatusCount, value: res.taskAffirmStatusCount,
name: this.$t('refuse'), name: this.$t('refuse'),
color: '#E83030' color: '#E83030',
status:res.taskAffirmStatus
}) })
color.push('#E83030') color.push('#E83030')
} }
}) })
} }
this.getEcharts('main-left', this.$t('regulatoryTaskConfirmation'), color, data) this.getEcharts('main-left', this.$t('certificationTaskConfirmation'), color, data)
}, },
mainRightEcharts(dataSource){ mainRightEcharts(dataSource){
let data = [] let data = []
@@ -136,28 +140,32 @@
data.push({ data.push({
value: res.taskAffirmStatusCount, value: res.taskAffirmStatusCount,
name: this.$t('notLaunch'), name: this.$t('notLaunch'),
color: '#00B3BE' color: '#00B3BE',
status:res.taskAffirmStatus
}) })
color.push('#00B3BE') color.push('#00B3BE')
} else if (res.taskAffirmStatus == 'List to confirm') { } else if (res.taskAffirmStatus == 'List to confirm') {
data.push({ data.push({
value: res.taskAffirmStatusCount, value: res.taskAffirmStatusCount,
name: this.$t('listToConfirm'), name: this.$t('listToConfirm'),
color: '#FDA71C' color: '#FDA71C',
status:res.taskAffirmStatus
}) })
color.push('#FDA71C') color.push('#FDA71C')
} else if (res.taskAffirmStatus == 'Review and pass') { } else if (res.taskAffirmStatus == 'Review and pass') {
data.push({ data.push({
value: res.taskAffirmStatusCount, value: res.taskAffirmStatusCount,
name: this.$t('reviewAndPass'), name: this.$t('reviewAndPass'),
color: '#26BC4B' color: '#26BC4B',
status:res.taskAffirmStatus
}) })
color.push('#26BC4B') color.push('#26BC4B')
} else if (res.taskAffirmStatus == 'Review and return') { } else if (res.taskAffirmStatus == 'Review and return') {
data.push({ data.push({
value: res.taskAffirmStatusCount, value: res.taskAffirmStatusCount,
name: this.$t('reviewAndReturn'), name: this.$t('reviewAndReturn'),
color: '#E83030' color: '#E83030',
status:res.taskAffirmStatus
}) })
color.push('#E83030') color.push('#E83030')
} }
@@ -174,49 +182,56 @@
data.push({ data.push({
value: res.certificationProgressCount, value: res.certificationProgressCount,
name: this.$t('Notatthe'), name: this.$t('Notatthe'),
color: '#00B3BE' color: '#00B3BE',
status:res.certificationProgress
}) })
color.push('#00B3BE') color.push('#00B3BE')
} else if (res.certificationProgress == 'In progress') { } else if (res.certificationProgress == 'In progress') {
data.push({ data.push({
value: res.certificationProgressCount, value: res.certificationProgressCount,
name: this.$t('inProgress'), name: this.$t('inProgress'),
color: '#FDA71C' color: '#FDA71C',
status:res.certificationProgress
}) })
color.push('#FDA71C') color.push('#FDA71C')
} else if (res.certificationProgress == 'Test passed') { } else if (res.certificationProgress == 'Test passed') {
data.push({ data.push({
value: res.certificationProgressCount, value: res.certificationProgressCount,
name: this.$t('experimentPassed'), name: this.$t('experimentPassed'),
color: '#26BC4B' color: '#26BC4B',
status:res.certificationProgress
}) })
color.push('#26BC4B') color.push('#26BC4B')
} else if (res.certificationProgress == 'Test failed') { } else if (res.certificationProgress == 'Test failed') {
data.push({ data.push({
value: res.certificationProgressCount, value: res.certificationProgressCount,
name: this.$t('experimentFailed'), name: this.$t('experimentFailed'),
color: '#E83030' color: '#E83030',
status:res.certificationProgress
}) })
color.push('#E83030') color.push('#E83030')
}else if (res.certificationProgress == 'Component report not submitted') { }else if (res.certificationProgress == 'Component report not submitted') {
data.push({ data.push({
value: res.certificationProgressCount, value: res.certificationProgressCount,
name: this.$t('componentReportNotSubmitted'), name: this.$t('componentReportNotSubmitted'),
color: '#FDA71C' color: '#FDA71C',
status:res.certificationProgress
}) })
color.push('#FDA71C') color.push('#FDA71C')
}else if (res.certificationProgress == 'Component report submitted') { }else if (res.certificationProgress == 'Component report submitted') {
data.push({ data.push({
value: res.certificationProgressCount, value: res.certificationProgressCount,
name: this.$t('componentReportSubmitted'), name: this.$t('componentReportSubmitted'),
color: '#6FD682' color: '#6FD682',
status:res.certificationProgress
}) })
color.push('#6FD682') color.push('#6FD682')
}else if (res.certificationProgress == 'Component report has been stored') { }else if (res.certificationProgress == 'Component report has been stored') {
data.push({ data.push({
value: res.certificationProgressCount, value: res.certificationProgressCount,
name: this.$t('componentReportHasBeenStored'), name: this.$t('componentReportHasBeenStored'),
color: '#26BC4B' color: '#26BC4B',
status:res.certificationProgress
}) })
color.push('#26BC4B') color.push('#26BC4B')
} }
@@ -264,22 +279,16 @@
title: params.seriesName, title: params.seriesName,
projectLibraryId: this.$route.query.id projectLibraryId: this.$route.query.id
} }
// if (num === 1) { if (params.seriesName === this.$t('certificationTaskConfirmation')) {
// query.operatorType = 'queryListingToConfirmStatistics' query.operatorType = 'queryRZTaskToConfirmStatistics'
// query.inventoryAffirmStatus = params.data.status query.status = params.data.status
// } else if (num === 2) { } else if (params.seriesName === this.$t('preHomoFlow')) {
// query.operatorType = 'queryTaskToConfirmStatistics' query.operatorType = 'queryPrehomoStatistics'
// query.taskAffirmStatus = params.data.status query.status = params.data.status
// } else if (num === 3) { } else if (params.seriesName === this.$t('CertificationProgress')) {
// query.operatorType = 'queryDesignStatistics' query.operatorType = 'queryCertificationProgressStatistics'
// query.designFlowTaskStatus = params.data.status query.status = params.data.status
// } else if (num === 4) { }
// query.operatorType = 'queryPrehomoStatistics'
// query.prehomoFlowTaskStatus = params.data.status
// } else if (num === 5) {
// query.operatorType = 'queryVerifyStatistics'
// query.verifyFlowTaskStatus = params.data.status
// }
this.$refs.responsibilityListRef.getData(query) this.$refs.responsibilityListRef.getData(query)
}) })
}, },
@@ -313,7 +322,8 @@
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-bottom: 20px; flex-wrap: wrap;
/*margin-bottom: 20px;*/
.box-content-left { .box-content-left {
width: calc(50% - 10px); width: calc(50% - 10px);
@@ -351,6 +361,7 @@
border: 2px #eff1f3 solid; border: 2px #eff1f3 solid;
position: relative; position: relative;
border-radius: 6px; border-radius: 6px;
margin-top: 20px;
.box-content-text { .box-content-text {
height: 30px; height: 30px;
jero-web/src/views/projectManagement/components/regulatoryCompliance.vue
+44 -15
View File
@@ -127,11 +127,28 @@
] ]
}) })
myChart.on('click', (params) => { myChart.on('click', (params) => {
let query = { let query = {}
if (params.seriesName == this.$t('regulatoryTaskConfirmation')){
query = {
title: params.seriesName, title: params.seriesName,
projectLibraryId: this.$route.query.id, projectLibraryId: this.$route.query.id,
operatorType: 'queryCurrentProjectStatusStatistics', operatorType: 'queryFGTaskToConfirmStatistics',
conditionAssessment: params.data.color status:params.data.status
}
}else if(params.seriesName == this.$t('designCompliance')){
query = {
title: params.seriesName,
projectLibraryId: this.$route.query.id,
operatorType: 'queryDesignStatistics',
status:params.data.status
}
}else if(params.seriesName == this.$t('verifyCompliance')){
query = {
title: params.seriesName,
projectLibraryId: this.$route.query.id,
operatorType: 'queryVerifyStatistics',
status:params.data.status
}
} }
this.$refs.responsibilityListRef.getData(query) this.$refs.responsibilityListRef.getData(query)
}) })
@@ -147,28 +164,32 @@
data.push({ data.push({
value: res.taskAffirmStatusCount, value: res.taskAffirmStatusCount,
name: this.$t('notLaunch'), name: this.$t('notLaunch'),
color: '#00B3BE' color: '#00B3BE',
status: res.taskAffirmStatus
}) })
color.push('#00B3BE') color.push('#00B3BE')
} else if (res.taskAffirmStatus == 'List to confirm') { } else if (res.taskAffirmStatus == 'List to confirm') {
data.push({ data.push({
value: res.taskAffirmStatusCount, value: res.taskAffirmStatusCount,
name: this.$t('listToConfirm'), name: this.$t('listToConfirm'),
color: '#FDA71C' color: '#FDA71C',
status: res.taskAffirmStatus
}) })
color.push('#FDA71C') color.push('#FDA71C')
} else if (res.taskAffirmStatus == 'Accepted') { } else if (res.taskAffirmStatus == 'Accepted') {
data.push({ data.push({
value: res.taskAffirmStatusCount, value: res.taskAffirmStatusCount,
name: this.$t('accept'), name: this.$t('accept'),
color: '#26BC4B' color: '#26BC4B',
status: res.taskAffirmStatus
}) })
color.push('#26BC4B') color.push('#26BC4B')
} else if (res.taskAffirmStatus == 'Rejected') { } else if (res.taskAffirmStatus == 'Rejected') {
data.push({ data.push({
value: res.taskAffirmStatusCount, value: res.taskAffirmStatusCount,
name: this.$t('refuse'), name: this.$t('refuse'),
color: '#E83030' color: '#E83030',
status: res.taskAffirmStatus
}) })
color.push('#E83030') color.push('#E83030')
} }
@@ -187,28 +208,32 @@
data.push({ data.push({
value: res.designFlowTaskStatusCount, value: res.designFlowTaskStatusCount,
name: this.$t('notLaunch'), name: this.$t('notLaunch'),
color: '#00B3BE' color: '#00B3BE',
status:res.designFlowTaskStatus
}) })
color.push('#00B3BE') color.push('#00B3BE')
} else if (res.designFlowTaskStatus == 'List to confirm') { } else if (res.designFlowTaskStatus == 'List to confirm') {
data.push({ data.push({
value: res.designFlowTaskStatusCount, value: res.designFlowTaskStatusCount,
name: this.$t('listToConfirm'), name: this.$t('listToConfirm'),
color: '#FDA71C' color: '#FDA71C',
status:res.designFlowTaskStatus
}) })
color.push('#FDA71C') color.push('#FDA71C')
} else if (res.designFlowTaskStatus == 'Compliance') { } else if (res.designFlowTaskStatus == 'Compliance') {
data.push({ data.push({
value: res.designFlowTaskStatusCount, value: res.designFlowTaskStatusCount,
name: this.$t('compliance'), name: this.$t('compliance'),
color: '#26BC4B' color: '#26BC4B',
status:res.designFlowTaskStatus
}) })
color.push('#26BC4B') color.push('#26BC4B')
} else if (res.designFlowTaskStatus == 'Non-Compliance') { } else if (res.designFlowTaskStatus == 'Non-Compliance') {
data.push({ data.push({
value: res.designFlowTaskStatusCount, value: res.designFlowTaskStatusCount,
name: this.$t('nonCompliance'), name: this.$t('nonCompliance'),
color: '#707486' color: '#707486',
status:res.designFlowTaskStatus
}) })
color.push('#707486') color.push('#707486')
} }
@@ -227,28 +252,32 @@
data.push({ data.push({
value: res.verifyFlowTaskStatusCount, value: res.verifyFlowTaskStatusCount,
name: this.$t('notLaunch'), name: this.$t('notLaunch'),
color: '#00B3BE' color: '#00B3BE',
status:res.verifyFlowTaskStatus
}) })
color.push('#00B3BE') color.push('#00B3BE')
} else if (res.verifyFlowTaskStatus == 'List to confirm') { } else if (res.verifyFlowTaskStatus == 'List to confirm') {
data.push({ data.push({
value: res.verifyFlowTaskStatusCount, value: res.verifyFlowTaskStatusCount,
name: this.$t('listToConfirm'), name: this.$t('listToConfirm'),
color: '#FDA71C' color: '#FDA71C',
status:res.verifyFlowTaskStatus
}) })
color.push('#FDA71C') color.push('#FDA71C')
} else if (res.verifyFlowTaskStatus == 'Compliance') { } else if (res.verifyFlowTaskStatus == 'Compliance') {
data.push({ data.push({
value: res.verifyFlowTaskStatusCount, value: res.verifyFlowTaskStatusCount,
name: this.$t('compliance'), name: this.$t('compliance'),
color: '#26BC4B' color: '#26BC4B',
status:res.verifyFlowTaskStatus
}) })
color.push('#26BC4B') color.push('#26BC4B')
} else if (res.verifyFlowTaskStatus == 'Non-Compliance') { } else if (res.verifyFlowTaskStatus == 'Non-Compliance') {
data.push({ data.push({
value: res.verifyFlowTaskStatusCount, value: res.verifyFlowTaskStatusCount,
name: this.$t('nonCompliance'), name: this.$t('nonCompliance'),
color: '#707486' color: '#707486',
status:res.verifyFlowTaskStatus
}) })
color.push('#707486') color.push('#707486')
} }
jero-web/src/views/projectManagement/components/responsibilityList.vue
+4 -3
View File
@@ -41,7 +41,7 @@
export default { export default {
name: 'responsibilityList', name: 'responsibilityList',
mixins:[ResizeHeader, ResizeColumnProvide], mixins: [ResizeHeader, ResizeColumnProvide],
data() { data() {
return { return {
visible: false, visible: false,
@@ -101,8 +101,9 @@
this.visible = false this.visible = false
}, },
areaOfResponsibilityClick(item) { areaOfResponsibilityClick(item) {
if (this.queryParam.operatorType == 'queryListingToConfirmStatistics' || if (this.queryParam.operatorType == 'queryFGTaskToConfirmStatistics' ||
this.queryParam.operatorType == 'queryTaskToConfirmStatistics'){ this.queryParam.operatorType == 'queryDesignStatistics' ||
this.queryParam.operatorType == 'queryVerifyStatistics') {
item.isListing = '1' item.isListing = '1'
} }
this.$emit('responsibility', item) this.$emit('responsibility', item)
jero-web/src/views/projectManagement/components/settingList.vue
+35 -16
View File
@@ -1,19 +1,20 @@
<template> <template>
<a-modal <a-drawer
:title="$t('setting')" :title="$t('setting')"
:width="1100"
:visible="visible"
:confirm-loading="confirmLoading"
:maskClosable="false" :maskClosable="false"
@ok="handleOk" :width="1000"
@cancel="handleCancel" placement="right"
> :closable="true"
@close="handleCancel"
:visible="visible"
style="height: 100%;overflow: auto;padding-bottom: 53px;">
<a-spin :spinning="confirmLoading">
<a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm"> <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<!-- <span class="Required">*</span>--> <!-- <span class="Required">*</span>-->
<span class="title-text-text" :title="$t('listPublishing')"> <span class="title-text-text" :title="$t('listPublishing')">
{{$t('listPublishing')}}</span> {{$t('listPublishing')}}</span>
</div> </div>
@@ -32,7 +33,7 @@
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<!-- <span class="Required">*</span>--> <!-- <span class="Required">*</span>-->
<span class="title-text-text" :title="$t('responsibilityConfirmation')"> <span class="title-text-text" :title="$t('responsibilityConfirmation')">
{{$t('responsibilityConfirmation')}}</span> {{$t('responsibilityConfirmation')}}</span>
</div> </div>
@@ -51,7 +52,7 @@
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<!-- <span class="Required">*</span>--> <!-- <span class="Required">*</span>-->
<span class="title-text-text" :title="$t('designVerification')"> <span class="title-text-text" :title="$t('designVerification')">
{{$t('designVerification')}}</span> {{$t('designVerification')}}</span>
</div> </div>
@@ -70,7 +71,7 @@
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<!-- <span class="Required">*</span>--> <!-- <span class="Required">*</span>-->
<span class="title-text-text" :title="$t('getStarted')"> <span class="title-text-text" :title="$t('getStarted')">
{{$t('getStarted')}}</span> {{$t('getStarted')}}</span>
</div> </div>
@@ -89,7 +90,7 @@
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<!-- <span class="Required">*</span>--> <!-- <span class="Required">*</span>-->
<span class="title-text-text" :title="$t('certificationStartOne')"> <span class="title-text-text" :title="$t('certificationStartOne')">
{{$t('certificationStartOne')}}</span> {{$t('certificationStartOne')}}</span>
</div> </div>
@@ -128,7 +129,7 @@
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<!-- <span class="Required">*</span>--> <!-- <span class="Required">*</span>-->
<span class="title-text-text" :title="$t('certificationEnd')"> <span class="title-text-text" :title="$t('certificationEnd')">
{{$t('certificationEnd')}}</span> {{$t('certificationEnd')}}</span>
</div> </div>
@@ -148,7 +149,7 @@
<a-col :span="12"> <a-col :span="12">
<div class="box-title-text"> <div class="box-title-text">
<div class="title-text"> <div class="title-text">
<!-- <span class="Required">*</span>--> <!-- <span class="Required">*</span>-->
<span class="title-text-text" :title="$t('verificationAndVerification')"> <span class="title-text-text" :title="$t('verificationAndVerification')">
{{$t('verificationAndVerification')}}</span> {{$t('verificationAndVerification')}}</span>
</div> </div>
@@ -166,7 +167,12 @@
</a-col> </a-col>
</a-row> </a-row>
</a-form-model> </a-form-model>
</a-modal> </a-spin>
<div class="drawer-bootom-button">
<a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
<a-button @click="handleOk" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
</div>
</a-drawer>
</template> </template>
<script> <script>
@@ -366,7 +372,7 @@
} }
.title-text { .title-text {
width: 144px; width: 106px;
text-align: right; text-align: right;
display: inline-block; display: inline-block;
font-weight: 500; font-weight: 500;
@@ -403,4 +409,17 @@
color: red; color: red;
margin-right: 3px; margin-right: 3px;
} }
.drawer-bootom-button {
position: absolute;
bottom: 0;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
left: 0;
z-index: 100;
background: #fff;
border-radius: 0 0 2px 2px;
}
</style> </style>