From 33246bb56e05b273944ec1cc03a58dc112e48848 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 16 八月 2024 09:42:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/taskReliability/SimulatHistory.vue | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/web/src/views/modules/taskReliability/SimulatHistory.vue b/web/src/views/modules/taskReliability/SimulatHistory.vue
index 5112b8e..f4c6bbd 100644
--- a/web/src/views/modules/taskReliability/SimulatHistory.vue
+++ b/web/src/views/modules/taskReliability/SimulatHistory.vue
@@ -12,12 +12,13 @@
<zt-form-item label="浠跨湡璁板綍" prop="simulatHis">
<zt-select v-model="dataForm.id" :datas="simulatList" @change="onSimulatSelected"/>
</zt-form-item>
- <zt-form-item label="閲囨牱鍛ㄦ湡" prop="samplPeriod">
- <el-input v-model="dataForm.samplPeriod" >
+ <zt-form-item label="鏃堕棿鍒嗙墖" prop="samplPeriod">
+ <el-input v-model="dataForm.samplPeriod" readonly="false">
+ <template slot="append">鍒嗛挓</template>
</el-input>
</zt-form-item>
- <zt-form-item label="浠跨湡鎬绘椂闀�" prop="taskDuration">
- <el-input v-model="dataForm.taskDuration" >
+ <zt-form-item label="浠跨湡娆℃暟" prop="simulatFrequency">
+ <el-input v-model="dataForm.simulatFrequency" readonly="false">
</el-input>
</zt-form-item>
</el-form>
@@ -25,7 +26,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"/>
+ ref="ProductModelTree" :isShow="false" basic="5" :productId="dataForm.productId"/>
</div>
</el-col>
<el-col :span="20">
@@ -43,7 +44,6 @@
<script>
import SimulatCurve from "./SimulatCurve";
- import SimulatData from "./SimulatData";
import ProductModelTree from "../basicInfo/ProductModelTree";
@@ -56,11 +56,9 @@
productList: [],
simulatList: [],
taskList: [],
- MTBF: '',
- MTTR: '',
dataForm: {
id: '',
- taskDuration:'',
+ taskDuration: '',
pid: '',
productId: '',
showProductId: '',
@@ -78,13 +76,13 @@
components: {
ProductModelTree,
SimulatCurve,
- SimulatData
},
methods: {
async getProductList() {
let res = await this.$http.get('/basicInfo/XhProductModel/getTaskProductList')
this.productList = res.data
+ this.onProductSelected(this.productList[0])
},
async getTaskList() {
let params = {
@@ -96,7 +94,6 @@
},
async getSimulatList() {
let params = {
- productId: this.dataForm.productId,
taskModelId: this.dataForm.taskModelId
}
let res = await this.$http.get('/taskReliability/SimulatAssess/getSimulatList', {params: params})
@@ -104,9 +101,11 @@
this.simulatList = res.data
},
onTreeSelected(data) {
- console.log(data, 'onProductSelected')
- this.dataForm.showProductId = data.id
- this.$refs.SimulatCurve.getProductEcharts(this.dataForm);
+ if (this.dataForm.id) {
+ console.log(data, 'onProductSelected')
+ this.dataForm.showProductId = data.id
+ this.$refs.SimulatCurve.getProductEcharts(this.dataForm);
+ }
},
// 鑾峰彇淇℃伅
onProductSelected(data) {
@@ -115,6 +114,9 @@
this.dataForm.productId = data.id
this.getTaskList()
this.dataForm.taskModelId = ''
+ this.$nextTick(() => {
+ this.$refs.ProductModelTree.getProductList()
+ })
},
onTaskSelected(data) {
console.log(data, ' onProductSelected(data)')
@@ -122,21 +124,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})
- this.dataForm.taskDuration = res.data.taskDuration
+ console.log(res.data.samplPeriod)
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