From 5ef47212d7a7d5d8fa2b02674c1f1263b07826d0 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 07 十一月 2024 17:45:41 +0800
Subject: [PATCH] 修改工况bug，新增产品节点时存在
---
web/src/views/modules/taskReliability/SchemeCompar.vue | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/web/src/views/modules/taskReliability/SchemeCompar.vue b/web/src/views/modules/taskReliability/SchemeCompar.vue
index 8db5fa8..10efed1 100644
--- a/web/src/views/modules/taskReliability/SchemeCompar.vue
+++ b/web/src/views/modules/taskReliability/SchemeCompar.vue
@@ -10,12 +10,12 @@
@change="onTaskSelected" :multiple="true"/>
</zt-form-item>
<zt-form-item label="鏃堕棿鍒嗙墖" prop="samplPeriod">
- <el-input type="number" :min="1" v-model="dataForm.samplPeriod">
+ <el-input type="number" :min="1" v-model="dataForm.samplPeriod" style="width: 150px;vertical-align: baseline;">
<template slot="append">鍒嗛挓</template>
</el-input>
</zt-form-item>
<zt-form-item label="浠跨湡娆℃暟" prop="simulatFrequency">
- <el-input type="number" :min="1" v-model="dataForm.simulatFrequency">
+ <el-input type="number" :min="1" v-model="dataForm.simulatFrequency" style="width: 150px;vertical-align: baseline;">
<template slot="append">娆℃暟</template>
</el-input>
</zt-form-item>
@@ -34,10 +34,10 @@
<div class="fa-card-a" style="position: relative;height: calc(100vh - 230px)">
<div v-if="Show">
<el-button v-if="isZk" type="info" size="small" icon="el-icon-caret-bottom"
- style="position: absolute;right: 10%;top: 9%;z-index: 1" @click="zk()"></el-button>
+ style="position: absolute;right: 0;top: 0;z-index: 1" @click="zk()"></el-button>
<el-button v-if="!isZk" type="info" size="small" icon="el-icon-caret-right"
- style="position: absolute;right: 10%;top: 9%;z-index: 1" @click="zk()"></el-button>
- <div v-if="isZk" style="position: absolute;right: 10%;top: 13%">
+ style="position: absolute;right: 0;top: 0;z-index: 1" @click="zk()"></el-button>
+ <div v-if="isZk" style="position: absolute;right: 0;top: 5%">
<el-table :data="tableData" border style="width: 500px">
<el-table-column
prop="name"
@@ -156,11 +156,11 @@
ProductModelTree,
},
watch: {
- percentage() {
- if (this.percentage === 100) {
- this.getEcharts();
- }
- }
+ // percentage() {
+ // if (this.percentage === 100) {
+ // this.getEcharts();
+ // }
+ // }
},
methods: {
onTreeSelected(data) {
@@ -205,18 +205,20 @@
console.log(res.data)
this.schemeList = res.data
},
- getStroke() {
- if (this.percentage < 100) {
- let param = {
- taskList: this.fzIdList
- }
- this.$http.get(`/taskReliability/SimulatAssess/getCalcProgress`, {params: param}).then(
- res => {
- if (res.data) {
- this.percentage = parseFloat(res.data)
- }
+ async getStroke() {
+ let param = {
+ taskList: this.fzIdList
+ }
+ let res = await this.$http.get(`/taskReliability/SimulatAssess/getCalcProgress`, {params: param})
+ if (res.success) {
+ if (res.data) {
+ this.percentage = parseFloat(res.data)
+ if (this.percentage >= 100) {
+ clearInterval(this.timers)
+ this.percentage = 0
+ await this.getEcharts();
}
- )
+ }
} else {
clearInterval(this.timers)
this.percentage = 0
@@ -233,6 +235,7 @@
simulatFrequency: this.dataForm.simulatFrequency
}
console.log(this.dataForm.taskModelId, 'this.dataForm.taskModelId')
+ this.percentage = 0
let res = await this.$http.get('/taskReliability/SimulatAssess/SchemeCompar', {params: params})
console.log(res.data, "res")
if (res.success) {
--
Gitblit v1.9.1