From 79eab76ac1b4b77696c92d72cfbde1e122c4c28f Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期一, 28 十月 2024 17:58:44 +0800 Subject: [PATCH] 关于修改可靠性产品重复 --- web/src/views/modules/taskReliability/SimulatAssess.vue | 62 +++++++++++++++++++----------- 1 files changed, 39 insertions(+), 23 deletions(-) diff --git a/web/src/views/modules/taskReliability/SimulatAssess.vue b/web/src/views/modules/taskReliability/SimulatAssess.vue index a864ee6..de15fbc 100644 --- a/web/src/views/modules/taskReliability/SimulatAssess.vue +++ b/web/src/views/modules/taskReliability/SimulatAssess.vue @@ -8,18 +8,24 @@ <zt-form-item label="鎬讳綋浠诲姟" prop="taskModelId"> <zt-select v-model="dataForm.taskModelId" :datas="taskList" @change="onTaskSelected"/> </zt-form-item> - <zt-form-item label="鏃堕棿鍒嗙墖" prop="samplPeriod"> - <el-input type="number" :min="1" v-model="dataForm.samplPeriod"> + <zt-form-item label="鏃堕棿鍒嗙墖" prop="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"> + <zt-form-item label="浠跨湡娆℃暟" prop="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> - <zt-form-item> + <el-form-item prop="repairDiracFlag" label-width="150px" style="margin-left: 20px"> + <el-checkbox v-model="dataForm.repairDiracFlag">鍙慨璁惧鍙潬搴︿负1</el-checkbox> + </el-form-item> + <zt-form-item style="margin-left: 20px"> <zt-button @click="analyze()">浠跨湡鍒嗘瀽</zt-button> + </zt-form-item> + <zt-form-item style="margin-left: 20px"> + <zt-button @click="displayProcess()">鏌ョ湅绠楁硶搴撹繘绋�</zt-button> </zt-form-item> </el-form> <el-progress v-if="isShow" :percentage="percentage"></el-progress> @@ -52,18 +58,20 @@ <el-button type="primary" @click="dialogVisible = false">鍏� 闂�</el-button> </div> </el-dialog> + <Process ref="process"></Process> </div> </template> <script> import SimulatCurve from "./SimulatCurve"; import ProductModelTree from "../basicInfo/ProductModelTree"; + import Process from "./Process"; export default { data() { return { - timers: '', + timers: null, isSelect: false, isShow: false, percentage: 0, @@ -81,6 +89,7 @@ samplPeriod: '10', simulatFrequency: 500, simulatTime: '', + repairDiracFlag: false }, dialogVisible: false, modelCheckResult: [], @@ -90,15 +99,16 @@ this.getProductList() }, watch: { - percentage() { - if (this.percentage === 100) { - this.$refs.SimulatCurve.initEcharts(this.dataForm); - } - } + // percentage() { + // if (this.percentage === 100) { + // this.$refs.SimulatCurve.initEcharts(this.dataForm); + // } + // } }, components: { ProductModelTree, SimulatCurve, + Process, }, methods: { @@ -137,18 +147,20 @@ console.log(res.data) this.taskList = res.data }, - getStroke() { - if (this.percentage < 100) { - let param = { - taskList: [this.dataForm.id] - } - this.$http.get(`/taskReliability/SimulatAssess/getCalcProgress`, {params: param}).then( - res => { - if (res.data) { - this.percentage = parseFloat(res.data) - } + async getStroke() { + let param = { + taskList: [this.dataForm.id] + } + 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 + this.$refs.SimulatCurve.initEcharts(this.dataForm); } - ) + } } else { clearInterval(this.timers) this.percentage = 0 @@ -160,9 +172,10 @@ this.isShow = true let result = await this.$http.get(`/basicInfo/TyProductModel/getUuid`) this.dataForm.id = result.data + this.percentage = 0 let res = await this.$http.post('/taskReliability/SimulatAssess/analyze', this.dataForm) if (res.success) { - console.log(res.data) + console.log(res.data, 'res.data') if (res.data && res.data.length > 0) { this.modelCheckResult = res.data this.dialogVisible = true @@ -170,6 +183,9 @@ this.timers = window.setInterval(this.getStroke, 1000) } } + }, + displayProcess() { + this.$refs.process.$refs.dialog.init() } } } -- Gitblit v1.9.1