fix
This commit is contained in:
parent
2ab9517ed0
commit
3d49c29967
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -164,7 +164,7 @@
|
||||
/>
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="config-item">
|
||||
<div class="config-item canshu">
|
||||
<span class="config-label">Y轴(参数):</span>
|
||||
<el-select v-model="chart.yAxisParam" multiple collapse-tags clearable class="y-axis-param-select" @change="updateChart(index)">
|
||||
<el-option
|
||||
@ -1604,7 +1604,7 @@ export default {
|
||||
height: 32px;
|
||||
}
|
||||
::v-deep .y-axis-param-select {
|
||||
width: 250px;
|
||||
width: 250px !important;
|
||||
}
|
||||
::v-deep .el-select .el-input__inner {
|
||||
height: 32px;
|
||||
@ -1622,6 +1622,14 @@ export default {
|
||||
color: #606266;
|
||||
}
|
||||
}
|
||||
|
||||
.canshu {
|
||||
width:370px;
|
||||
::v-deep .y-axis-param-select {
|
||||
width: 280px !important;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.chart-wrapper {
|
||||
|
||||
@ -39,15 +39,15 @@
|
||||
<div class="info-grid">
|
||||
<div class="info-item">
|
||||
<span class="label">流程主题</span>
|
||||
<span class="value">{{ progressDetail.modelName || '--' }}</span>
|
||||
<span class="value">{{ progressDetail.processTitle || '--' }}</span>
|
||||
</div>
|
||||
<div class="info-item">
|
||||
<span class="label">机型名称</span>
|
||||
<span class="value">{{ progressDetail.applicant || '--' }}</span>
|
||||
<span class="value">{{ progressDetail.modelName || '--' }}</span>
|
||||
</div>
|
||||
<div class="info-item">
|
||||
<span class="label">版本</span>
|
||||
<span class="value">{{ progressDetail.submitTime || '--' }}</span>
|
||||
<span class="label">发起人</span>
|
||||
<span class="value">{{ progressDetail.applicant || '--' }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
@ -124,7 +124,7 @@
|
||||
<div class="node-user">
|
||||
{{ node.userName || '--' }}
|
||||
<span class="node-time">
|
||||
{{ formatTime(node.operateTime) }}
|
||||
{{ node.operateTime }}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
@ -311,7 +311,7 @@ export default {
|
||||
nodes.push({
|
||||
title: record.node || '审批节点',
|
||||
userName: record.unapprovedPerson || '--',
|
||||
operateTime: record.approvalTime || record.handleTime || record.createTime || '',
|
||||
operateTime: record.operateTime || record.handleTime || record.createTime || '',
|
||||
result: result,
|
||||
status: status,
|
||||
opinion: record.common || record.comment || record.opinion || null
|
||||
@ -469,7 +469,8 @@ export default {
|
||||
const orderB = b.nodeOrder !== undefined && b.nodeOrder !== null ? Number(b.nodeOrder) : 0
|
||||
return orderA - orderB
|
||||
})
|
||||
|
||||
this.progressDetail.processTitle = resp.data?.processTitle || '--'
|
||||
this.progressDetail.modelName = resp.data?.modelName || '--'
|
||||
// 查找是否有 REJECT 节点
|
||||
const rejectIndex = sortedRecords.findIndex((record) => record.operate === 'REJECT')
|
||||
|
||||
@ -939,7 +940,7 @@ export default {
|
||||
|
||||
.info-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, minmax(200px, 1fr));
|
||||
grid-template-columns: repeat(3, minmax(200px, 1fr));
|
||||
gap: 16px 24px;
|
||||
|
||||
.info-item {
|
||||
|
||||
@ -566,7 +566,7 @@ export default {
|
||||
result = 'PASS'
|
||||
status = 'PASS'
|
||||
} else if (node.result === '待审批') {
|
||||
result = 'STAY'
|
||||
result = '待审批'
|
||||
status = 'STAY'
|
||||
}
|
||||
}
|
||||
@ -622,6 +622,7 @@ export default {
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.getReportDetailProcess()
|
||||
},
|
||||
methods: {
|
||||
setStatusText(result) {
|
||||
@ -735,10 +736,9 @@ export default {
|
||||
return
|
||||
}
|
||||
const request = {
|
||||
...api.GET_PPROVAL_ALL,
|
||||
...api.GET_REPORT_DETAIL_PROCESS,
|
||||
params: {
|
||||
flowId: flowId,
|
||||
templateId: reportId // 报告ID作为templateId参数
|
||||
flowId: flowId// 报告ID作为templateId参数
|
||||
},
|
||||
disableSuccessMsg: true
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user