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

修改禅道已知bug

Browse Source
This commit is contained in:
qq787203167
2022-06-21 10:40:30 +08:00
parent 1ecb2e3baa
commit d634fde92d
5 changed files with 93 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/dashboard/components/customContent.vue
+15 -8
View File
@@ -1,18 +1,19 @@
<template>
<div class="customContent-box">
<div style="display: inline-block">
<div class="box-content-top">
<div class="box-content" v-for="(item,index) in dataSourceContentList" :key="index" @click="urlClick(item)">
<img :src="item.iconPath" class="img" alt="">
<div class="text" :title="item.iconName">{{item.iconName}}</div>
</div>
<div class="box-content-top">
<div class="box-content" v-for="(item,index) in dataSourceContentList" :key="index"
@click="urlClick(item)">
<img :src="item.iconPath" class="img" alt="">
<div class="text" :title="item.iconName">{{item.iconName}}</div>
</div>
<div class="box-content" @click="customClick()" style=";margin-top: 0;float: right">
<div class="box-content" @click="customClick()" style=";margin-top: 0;">
<img src="../../../assets/zdy.png" class="img" alt="">
<div class="text">{{$t('custom')}}</div>
</div>
</div>
<div class="box-content-right">
</div>
<a-modal
:title="$t('custom')"
:width="1180"
@@ -174,11 +175,12 @@
.customContent-box {
width: 100%;
text-align: center;
overflow: hidden;
.box-content-top {
max-width: calc(100% - 130px);
display: inline-block;
overflow: hidden;
overflow: auto;
white-space: nowrap;
}
@@ -249,4 +251,9 @@
margin-top: 10px;
margin-bottom: 30px;
}
.box-content-right {
display: inline-block;
overflow: hidden;
}
</style>
jero-web/src/views/documentTools/virtualList/components/editModel.vue
+48
View File
@@ -373,6 +373,22 @@
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
</div>
<a-form-model-item class="itemModel-text" :prop="'designRemark'">
<a-textarea
style="width: 100%"
:placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"
v-model="formInline.designRemark" :rows="4"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<div class="header-text">
&nbsp;{{$t('PrehomoConfirmation')}}
</div>
@@ -456,6 +472,22 @@
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
</div>
<a-form-model-item class="itemModel-text" :prop="'prehomoRemark'">
<a-textarea
style="width: 100%"
:placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"
v-model="formInline.prehomoRemark" :rows="4"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<div class="header-text">
&nbsp;{{$t('verificationAndConformityconfirmation')}}
</div>
@@ -538,6 +570,22 @@
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
</div>
<a-form-model-item class="itemModel-text" :prop="'verifyRemark'">
<a-textarea
style="width: 100%"
:placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"
v-model="formInline.verifyRemark" :rows="4"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
</a-form-model>
</a-spin>
<div class="drawer-bootom-button">
jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+21 -3
View File
@@ -424,7 +424,6 @@
{
title: this.$t('confirmationOfDesignConformity'),
width: 540,
children: [
{
// TODO 未按要求实现，该列分为上下行，上行显示交付物类型，下行显示交付物模板名称，且交付物模板名称点击可下载。其他2个流程同理
@@ -448,12 +447,18 @@
width: 180,
ellipsis: true,
align: 'center'
},
{
title: this.$t('descriptionDeliverables'),
dataIndex: 'designRemark',
align: 'center',
width: 220,
ellipsis: true
}
]
},
{
title: this.$t('PrehomoConfirmation'),
width: 540,
children: [
{
title: this.$t('Deliverables'),
@@ -476,12 +481,18 @@
width: 180,
ellipsis: true,
align: 'center'
},
{
title: this.$t('descriptionDeliverables'),
dataIndex: 'prehomoRemark',
align: 'center',
width: 220,
ellipsis: true
}
]
},
{
title: this.$t('verificationAndConformityconfirmation'),
width: 540,
children: [
{
title: this.$t('Deliverables'),
@@ -504,6 +515,13 @@
width: 180,
align: 'center',
ellipsis: true
},
{
title: this.$t('descriptionDeliverables'),
dataIndex: 'verifyRemark',
align: 'center',
width: 220,
ellipsis: true
}
]
},
jero-web/src/views/projectManagement/components/certificationProgressEchart.vue
+4 -4
View File
@@ -102,7 +102,7 @@
name: this.$t('notInvolved'),
status: res.certificationProgress
})
color.push('#9DB9D4')
color.push('#707486')
this.dataSource[0].notInvolved = res.certificationProgressCount
} else if (res.certificationProgress == 'Not start') {
data.push({
@@ -110,7 +110,7 @@
name: this.$t('toBeStarted'),
status: res.certificationProgress
})
color.push('#FDB033')
color.push('#00B3BE')
this.dataSource[0].toBeStarted = res.certificationProgressCount
} else if (res.certificationProgress == 'In progress') {
data.push({
@@ -118,7 +118,7 @@
name: this.$t('inProgress'),
status: res.certificationProgress
})
color.push('#FF8543')
color.push('#FDA71C')
this.dataSource[0].inProgress = res.certificationProgressCount
} else if (res.certificationProgress == 'Test failed') {
data.push({
@@ -134,7 +134,7 @@
name: this.$t('experimentPassed'),
status: res.certificationProgress
})
color.push('#2F8DF3')
color.push('#26BD4B')
this.dataSource[0].experimentPassed = res.certificationProgressCount
}
})
jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue
+5 -5
View File
@@ -124,35 +124,35 @@
name: this.$t('toBeConfirmed'),
status: res.designFlowTaskStatus || res.prehomoFlowTaskStatus || res.verifyFlowTaskStatus
})
color.push('#37CED1')
color.push('#00B3BE')
} else if (res.designFlowTaskStatus == 'Compliance' || res.prehomoFlowTaskStatus == 'Compliance' || res.verifyFlowTaskStatus == 'Compliance') {
data.push({
value: res.designFlowTaskStatusCount || res.prehomoFlowTaskStatusCount || res.verifyFlowTaskStatusCount,
name: this.$t('accord'),
status: res.designFlowTaskStatus || res.prehomoFlowTaskStatus || res.verifyFlowTaskStatus
})
color.push('#2F8DF3')
color.push('#26BD4B')
} else if (res.designFlowTaskStatus == 'Non-Compliance' || res.prehomoFlowTaskStatus == 'Non-Compliance' || res.verifyFlowTaskStatus == 'Non-Compliance') {
data.push({
value: res.designFlowTaskStatusCount || res.prehomoFlowTaskStatusCount || res.verifyFlowTaskStatusCount,
name: this.$t('nonConformity'),
status: res.designFlowTaskStatus || res.prehomoFlowTaskStatus || res.verifyFlowTaskStatus
})
color.push('#FF8543')
color.push('#E83030')
} else if (res.designFlowTaskStatus == 'To be tracked' || res.prehomoFlowTaskStatus == 'To be tracked' || res.verifyFlowTaskStatus == 'To be tracked') {
data.push({
value: res.designFlowTaskStatusCount || res.prehomoFlowTaskStatusCount || res.verifyFlowTaskStatusCount,
name: this.$t('Tracked'),
status: res.designFlowTaskStatus || res.prehomoFlowTaskStatus || res.verifyFlowTaskStatus
})
color.push('#FDB033')
color.push('#FDA71C')
} else if (res.designFlowTaskStatus == 'NA' || res.prehomoFlowTaskStatus == 'NA' || res.verifyFlowTaskStatus == 'NA') {
data.push({
value: res.designFlowTaskStatusCount || res.prehomoFlowTaskStatusCount || res.verifyFlowTaskStatusCount,
name: this.$t('notInvolved'),
status: res.designFlowTaskStatus || res.prehomoFlowTaskStatus || res.verifyFlowTaskStatus
})
color.push('#9DB9D4')
color.push('#707486')
} else if (res.designFlowTaskStatus == 'Termination of task' || res.prehomoFlowTaskStatus == 'Termination of task' || res.verifyFlowTaskStatus == 'Termination of task') {
data.push({
value: res.designFlowTaskStatusCount || res.prehomoFlowTaskStatusCount || res.verifyFlowTaskStatusCount,