From b02c7eb73aabc8531b6e52b02fc15489f0441b52 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期一, 28 十月 2024 10:13:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/taskReliability/SimulatHistory.vue | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/web/src/views/modules/taskReliability/SimulatHistory.vue b/web/src/views/modules/taskReliability/SimulatHistory.vue
index f4c6bbd..8a3bd42 100644
--- a/web/src/views/modules/taskReliability/SimulatHistory.vue
+++ b/web/src/views/modules/taskReliability/SimulatHistory.vue
@@ -1,7 +1,6 @@
<template>
<div class="fa-card-a">
<el-row :gutter="5">
- <div class="mod-taskReliability-simulatAssess">
<el-form :inline="true" :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="80px">
<zt-form-item label="浜у搧鑺傜偣" prop="productId">
<zt-select v-model="dataForm.productId" :datas="productList" @change="onProductSelected"/>
@@ -22,22 +21,17 @@
</el-input>
</zt-form-item>
</el-form>
- <div>
<el-col :span="4">
- <div style="margin-right: 5px;height: calc(88vh - 100px)" v-if="isSelect">
+ <div style="margin-right: 5px;height: calc(100vh - 230px)" v-if="isSelect">
<product-model-tree @on-selected="onTreeSelected" showXdy="false"
ref="ProductModelTree" :isShow="false" basic="5" :productId="dataForm.productId"/>
</div>
</el-col>
<el-col :span="20">
- <div style="margin-top: 20px">
- <div>
+ <div class="fa-card-a" style="height: calc(100vh - 230px)">
<SimulatCurve ref="SimulatCurve"></SimulatCurve>
- </div>
</div>
</el-col>
- </div>
- </div>
</el-row>
</div>
</template>
@@ -103,7 +97,7 @@
onTreeSelected(data) {
if (this.dataForm.id) {
console.log(data, 'onProductSelected')
- this.dataForm.showProductId = data.id
+ this.dataForm.showProductId = data.dataId
this.$refs.SimulatCurve.getProductEcharts(this.dataForm);
}
},
--
Gitblit v1.9.1