fix
This commit is contained in:
parent
d53901e00a
commit
501742b95a
@ -83,7 +83,8 @@ export default {
|
|||||||
GET_APPROVAL_CHANGE: {
|
GET_APPROVAL_CHANGE: {
|
||||||
url: '/custom/approval/getTemplateChanges',
|
url: '/custom/approval/getTemplateChanges',
|
||||||
method: 'get'
|
method: 'get'
|
||||||
}, //获取审批所有
|
},
|
||||||
|
// 获取审批所有
|
||||||
GET_PPROVAL_ALL: {
|
GET_PPROVAL_ALL: {
|
||||||
url: '/custom/approval/getApprovalProcess',
|
url: '/custom/approval/getApprovalProcess',
|
||||||
method: 'get'
|
method: 'get'
|
||||||
|
|||||||
@ -1557,7 +1557,6 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.return-opinion-section {
|
.return-opinion-section {
|
||||||
|
|||||||
@ -770,7 +770,16 @@ export default {
|
|||||||
// 新增的图表展示在第一个
|
// 新增的图表展示在第一个
|
||||||
this.chartList.unshift(newChart)
|
this.chartList.unshift(newChart)
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
|
// 优先初始化新加的图表
|
||||||
this.initChart(0)
|
this.initChart(0)
|
||||||
|
// 如果存在其他未初始化的图表,补充初始化一次,避免索引变动导致未挂载
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.chartList.forEach((chart, idx) => {
|
||||||
|
if (!chart.chartInstance) {
|
||||||
|
this.initChart(idx)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
toggleFloatingPanel() {
|
toggleFloatingPanel() {
|
||||||
@ -799,6 +808,14 @@ export default {
|
|||||||
chart.chartInstance = null
|
chart.chartInstance = null
|
||||||
}
|
}
|
||||||
this.chartList.splice(index, 1)
|
this.chartList.splice(index, 1)
|
||||||
|
// 删除后重新检查剩余图表的初始化状态
|
||||||
|
this.$nextTick(() => {
|
||||||
|
this.chartList.forEach((c, idx) => {
|
||||||
|
if (c && !c.chartInstance) {
|
||||||
|
this.initChart(idx)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
},
|
},
|
||||||
handleClearAllCharts() {
|
handleClearAllCharts() {
|
||||||
this.disposeAllCharts()
|
this.disposeAllCharts()
|
||||||
@ -1269,8 +1286,12 @@ export default {
|
|||||||
// 保存新选择的机型信息,用于后续查询
|
// 保存新选择的机型信息,用于后续查询
|
||||||
chart.newSelectedModels = newSelectedModels
|
chart.newSelectedModels = newSelectedModels
|
||||||
|
|
||||||
|
// 先触发查询,再关闭弹窗,避免 currentChartIndex 被重置
|
||||||
|
const chartIndex = this.currentChartIndex
|
||||||
|
if (chartIndex >= 0) {
|
||||||
|
this.handleChartModelQuery(chartIndex)
|
||||||
|
}
|
||||||
this.handleAddModelDialogClose()
|
this.handleAddModelDialogClose()
|
||||||
this.handleChartModelQuery(this.currentChartIndex)
|
|
||||||
},
|
},
|
||||||
// 图表机型查询
|
// 图表机型查询
|
||||||
handleChartModelQuery(index) {
|
handleChartModelQuery(index) {
|
||||||
|
|||||||
@ -20,10 +20,14 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
<el-button class="update-favorite-button" @click="handleUpdateFavorite"
|
<el-button class="update-favorite-button" @click="handleUpdateFavorite"
|
||||||
>更新常用</el-button
|
>
|
||||||
|
更新常用
|
||||||
|
</el-button
|
||||||
>
|
>
|
||||||
<el-button type="primary" class="add-favorite-button" @click="handleAddFavorite"
|
<el-button type="primary" class="add-favorite-button" @click="handleAddFavorite"
|
||||||
>新增常用</el-button
|
>
|
||||||
|
新增常用
|
||||||
|
</el-button
|
||||||
>
|
>
|
||||||
<el-button class="hidden-params-button" @click="handleShowHiddenParams">
|
<el-button class="hidden-params-button" @click="handleShowHiddenParams">
|
||||||
已隐藏参数
|
已隐藏参数
|
||||||
@ -44,8 +48,12 @@
|
|||||||
<div class="left-param-panel">
|
<div class="left-param-panel">
|
||||||
<div class="tree-search-header">
|
<div class="tree-search-header">
|
||||||
<el-radio-group v-model="treeSearchMode" size="mini" class="search-mode-switch">
|
<el-radio-group v-model="treeSearchMode" size="mini" class="search-mode-switch">
|
||||||
<el-radio-button label="subsystem">子系统</el-radio-button>
|
<el-radio-button label="subsystem">
|
||||||
<el-radio-button label="parts">零部件名称</el-radio-button>
|
子系统
|
||||||
|
</el-radio-button>
|
||||||
|
<el-radio-button label="parts">
|
||||||
|
零部件名称
|
||||||
|
</el-radio-button>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</div>
|
</div>
|
||||||
<el-input
|
<el-input
|
||||||
@ -78,13 +86,21 @@
|
|||||||
<table class="comparison-table">
|
<table class="comparison-table">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th class="subsystem-column">子系统名称</th>
|
<th class="subsystem-column">
|
||||||
<th class="parts-column">零部件名称</th>
|
子系统名称
|
||||||
<th class="param-column">参数名称</th>
|
</th>
|
||||||
|
<th class="parts-column">
|
||||||
|
零部件名称
|
||||||
|
</th>
|
||||||
|
<th class="param-column">
|
||||||
|
参数名称
|
||||||
|
</th>
|
||||||
<th v-for="(model, index) in comparisonModels" :key="index" class="model-column">
|
<th v-for="(model, index) in comparisonModels" :key="index" class="model-column">
|
||||||
<div class="model-header">
|
<div class="model-header">
|
||||||
<div v-if="model.name" class="model-name"
|
<div v-if="model.name" class="model-name"
|
||||||
>{{ model.name }} V{{ model.parameterVersion }}</div
|
>
|
||||||
|
{{ model.name }} V{{ model.parameterVersion }}
|
||||||
|
</div
|
||||||
>
|
>
|
||||||
<i
|
<i
|
||||||
v-if="model.name"
|
v-if="model.name"
|
||||||
@ -107,8 +123,12 @@
|
|||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr v-for="(param, paramIndex) in displayParams" :key="paramIndex">
|
<tr v-for="(param, paramIndex) in displayParams" :key="paramIndex">
|
||||||
<td class="subsystem-column">{{ param.subsystemName }}</td>
|
<td class="subsystem-column">
|
||||||
<td class="parts-column">{{ param.displayPartsName }}</td>
|
{{ param.subsystemName }}
|
||||||
|
</td>
|
||||||
|
<td class="parts-column">
|
||||||
|
{{ param.displayPartsName }}
|
||||||
|
</td>
|
||||||
<td class="param-column">
|
<td class="param-column">
|
||||||
<span class="param-name">{{ getParamDisplayName(param) }}</span>
|
<span class="param-name">{{ getParamDisplayName(param) }}</span>
|
||||||
<i
|
<i
|
||||||
@ -157,7 +177,8 @@
|
|||||||
<el-table-column type="selection" width="55" />
|
<el-table-column type="selection" width="55" />
|
||||||
<el-table-column prop="modelName" label="产品型号" min-width="150" />
|
<el-table-column prop="modelName" label="产品型号" min-width="150" />
|
||||||
<el-table-column prop="parameterVersion" label="版本" min-width="70"
|
<el-table-column prop="parameterVersion" label="版本" min-width="70"
|
||||||
><template slot-scope="scope">
|
>
|
||||||
|
<template slot-scope="scope">
|
||||||
<span>V{{ scope.row.parameterVersion }}</span>
|
<span>V{{ scope.row.parameterVersion }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
@ -220,7 +241,9 @@
|
|||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
<div slot="footer" class="dialog-footer">
|
<div slot="footer" class="dialog-footer">
|
||||||
<el-button @click="handleHiddenParamsDialogClose">取消</el-button>
|
<el-button @click="handleHiddenParamsDialogClose">
|
||||||
|
取消
|
||||||
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
:disabled="selectedParamsToRestore.length === 0"
|
:disabled="selectedParamsToRestore.length === 0"
|
||||||
@ -255,7 +278,9 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<div slot="footer" class="dialog-footer">
|
<div slot="footer" class="dialog-footer">
|
||||||
<el-button @click="handleAddFavoriteDialogClose">取消</el-button>
|
<el-button @click="handleAddFavoriteDialogClose">
|
||||||
|
取消
|
||||||
|
</el-button>
|
||||||
<el-button type="primary" :loading="savingFavorite" @click="handleConfirmAddFavorite">
|
<el-button type="primary" :loading="savingFavorite" @click="handleConfirmAddFavorite">
|
||||||
确定
|
确定
|
||||||
</el-button>
|
</el-button>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user