From a43fd8f15c7da7f4a14ba4ebb79970dad4ce1fae Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 八月 2024 15:18:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/taskReliability/SimulatAssess.vue | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/web/src/views/modules/taskReliability/SimulatAssess.vue b/web/src/views/modules/taskReliability/SimulatAssess.vue
index 55d2a39..bafe055 100644
--- a/web/src/views/modules/taskReliability/SimulatAssess.vue
+++ b/web/src/views/modules/taskReliability/SimulatAssess.vue
@@ -27,15 +27,12 @@
<div>
<el-col :span="4">
<div style="margin-right: 5px;height: calc(88vh - 100px)" v-if="isSelect">
- <product-model-tree :isShow="false"></product-model-tree>
+ <product-model-tree @on-selected="onTreeSelected" showXdy="false"
+ ref="ProductModelTree" :isShow="false" basic="4" :productId="dataForm.productId"/>
</div>
</el-col>
<el-col :span="20">
<div style="margin-top: 20px">
- <div style="margin-left: 400px" v-if="isShow">
- <el-tag type="info" effect="dark" style="font-size: 20px">MTBF:{{MTBF}}</el-tag>
- <el-tag type="info" effect="dark" style="margin-left: 50px;font-size: 20px">MTTR:{{MTTR}}</el-tag>
- </div>
<div>
<SimulatCurve ref="SimulatCurve"></SimulatCurve>
</div>
@@ -49,7 +46,6 @@
<script>
import SimulatCurve from "./SimulatCurve";
- import SimulatData from "./SimulatData";
import ProductModelTree from "../basicInfo/ProductModelTree";
@@ -68,9 +64,9 @@
id: '',
pid: '',
productId: '',
+ showProductId: '',
taskModelId: '',
- dataType: '',
- isRepair: '',
+ dataType: 'fz',
samplPeriod: '',
simulatFrequency: '',
simulatTime: ''
@@ -83,23 +79,32 @@
watch: {
percentage() {
if (this.percentage === 100) {
- this.$refs.SimulatCurve.initEcharts(this.dataForm.id,this.dataForm.taskModelId, this.dataForm.samplPeriod);
+ this.$refs.SimulatCurve.initEcharts(this.dataForm);
}
}
},
components: {
ProductModelTree,
SimulatCurve,
- SimulatData
},
methods: {
+ onTreeSelected(data) {
+ if (this.dataForm.id){
+ console.log(data, 'onProductSelected')
+ this.dataForm.showProductId = data.id
+ this.$refs.SimulatCurve.getProductEcharts(this.dataForm);
+ }
+ },
// 鑾峰彇淇℃伅
onProductSelected(data) {
this.isSelect = true
console.log(data, ' onProductSelected(data)')
this.dataForm.productId = data.id
this.getTaskList()
+ this.$nextTick(() => {
+ this.$refs.ProductModelTree.getProductList()
+ })
},
onTaskSelected(data) {
console.log(data, ' onProductSelected(data)')
@@ -131,6 +136,7 @@
)
} else {
clearInterval(this.timers)
+ this.percentage = 0
}
},
async analyze() {
--
Gitblit v1.9.1