From 7abc95a191d2c1a9bb9ff8fd7fb05470a0d4e86b Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 八月 2024 10:04:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/taskReliability/SimulatHistory.vue | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/web/src/views/modules/taskReliability/SimulatHistory.vue b/web/src/views/modules/taskReliability/SimulatHistory.vue
index c6bc234..45a4853 100644
--- a/web/src/views/modules/taskReliability/SimulatHistory.vue
+++ b/web/src/views/modules/taskReliability/SimulatHistory.vue
@@ -17,7 +17,7 @@
</el-input>
</zt-form-item>
<zt-form-item label="浠跨湡娆℃暟" prop="simulatFrequency">
- <el-input v-model="dataForm.simulatFrequency" readonly="false" >
+ <el-input v-model="dataForm.simulatFrequency" readonly="false">
</el-input>
</zt-form-item>
</el-form>
@@ -25,7 +25,7 @@
<el-col :span="4">
<div style="margin-right: 5px;height: calc(88vh - 100px)" v-if="isSelect">
<product-model-tree @on-selected="onTreeSelected" showXdy="false"
- ref="ProductModelTree" :isShow="false" basic="4"/>
+ ref="ProductModelTree" :isShow="false" basic="4" :productId="dataForm.productId"/>
</div>
</el-col>
<el-col :span="20">
@@ -57,7 +57,7 @@
taskList: [],
dataForm: {
id: '',
- taskDuration:'',
+ taskDuration: '',
pid: '',
productId: '',
showProductId: '',
@@ -100,7 +100,7 @@
this.simulatList = res.data
},
onTreeSelected(data) {
- if (this.dataForm.id){
+ if (this.dataForm.id) {
console.log(data, 'onProductSelected')
this.dataForm.showProductId = data.id
this.$refs.SimulatCurve.getProductEcharts(this.dataForm);
@@ -113,6 +113,9 @@
this.dataForm.productId = data.id
this.getTaskList()
this.dataForm.taskModelId = ''
+ this.$nextTick(() => {
+ this.$refs.ProductModelTree.getProductList()
+ })
},
onTaskSelected(data) {
console.log(data, ' onProductSelected(data)')
@@ -120,22 +123,21 @@
this.getSimulatList()
this.dataForm.id = ''
},
- onSimulatSelected(data) {
+ async onSimulatSelected(data) {
this.dataForm.id = data.id
this.dataForm.samplPeriod = data.samplPeriod
- this.getSimulatParams()
- this.$refs.SimulatCurve.initEcharts(this.dataForm)
- },
- async getSimulatParams() {
let params = {
id: this.dataForm.id,
taskModelId: this.dataForm.taskModelId
}
let res = await this.$http.get('/taskReliability/SimulatAssess/getSimulatParams', {params: params})
console.log(res.data.samplPeriod)
- this.dataForm.taskDuration = res.data.taskDuration
+ this.dataForm.samplPeriod = res.data.samplPeriod
this.dataForm.simulatFrequency = res.data.simulatFrequency
- }
+ this.$nextTick(() => {
+ this.$refs.SimulatCurve.initEcharts(this.dataForm)
+ })
+ },
}
}
</script>
--
Gitblit v1.9.1