From 6250f74b2a02770a37f2f0144c762f7952a12bd6 Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期二, 18 二月 2025 08:58:51 +0800 Subject: [PATCH] 修改 --- web/src/views/modules/taskReliability/SchemeCompar.vue | 63 +++++++++++++++++++++---------- 1 files changed, 42 insertions(+), 21 deletions(-) diff --git a/web/src/views/modules/taskReliability/SchemeCompar.vue b/web/src/views/modules/taskReliability/SchemeCompar.vue index 8db5fa8..d735ea1 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" @@ -69,6 +69,24 @@ align="right"> <template slot-scope="scope"> <span>{{ keepNumberBy4(scope.row.msr) }}</span> + </template> + </el-table-column> + <el-table-column + prop="mttfMle" + label="鑺傜偣瀵垮懡" + width="100px" + align="right"> + <template slot-scope="scope"> + <span>{{ keepNumberBy4(scope.row.mttfMle) }}</span> + </template> + </el-table-column> + <el-table-column + prop="mttrMle" + label="骞冲潎缁翠慨鏃堕棿" + width="100px" + align="right"> + <template slot-scope="scope"> + <span>{{ keepNumberBy4(scope.row.mttrMle) }}</span> </template> </el-table-column> </el-table> @@ -156,11 +174,11 @@ ProductModelTree, }, watch: { - percentage() { - if (this.percentage === 100) { - this.getEcharts(); - } - } + // percentage() { + // if (this.percentage === 100) { + // this.getEcharts(); + // } + // } }, methods: { onTreeSelected(data) { @@ -205,18 +223,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 +253,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