From 3c54f403c6c9756725f9d016e7ff05c5b64327d0 Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期二, 22 十月 2024 14:36:53 +0800 Subject: [PATCH] 关于修改可靠性产品重复 --- web/src/views/modules/taskReliability/SimulatAssess.vue | 46 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 37 insertions(+), 9 deletions(-) diff --git a/web/src/views/modules/taskReliability/SimulatAssess.vue b/web/src/views/modules/taskReliability/SimulatAssess.vue index 7697123..a864ee6 100644 --- a/web/src/views/modules/taskReliability/SimulatAssess.vue +++ b/web/src/views/modules/taskReliability/SimulatAssess.vue @@ -35,6 +35,23 @@ </div> </el-col> </el-row> + <el-dialog v-dialogDrag :close-on-click-modal="false" top="8vh" :visible.sync="dialogVisible" title="妯″瀷妫�鏌�" width="60%" @close="dialogVisible = false"> + <el-tag type="danger" style="margin-bottom: 10px">妯″瀷瀹氫箟/鍙傛暟閰嶇疆閲屽瓨鍦ㄤ互涓嬮棶棰橈細</el-tag> + <el-table :data="modelCheckResult" height="350" + :header-cell-style="{'text-align':'center'}"> + <el-table-column prop="category" label="妫�鏌ョ粨鏋�" align="center" width="150"/> + <el-table-column prop="taskName" label="浠诲姟鍚嶇О" align="center"/> + <el-table-column prop="taskPhaseName" label="浠诲姟闃舵鍚嶇О" align="center"/> + <el-table-column prop="gkName" label="宸ュ喌鍚嶇О" align="center"/> + <el-table-column prop="nodeName" label="鑺傜偣鍚嶇О" align="center"/> + <el-table-column prop="modelName" label="妯″瀷鍚嶇О" align="center"/> + <el-table-column prop="deviceName" label="璁惧鍚嶇О" align="center"/> + <el-table-column prop="paramName" label="鍙傛暟鍚嶇О" align="center"/> + </el-table> + <div slot="footer" class="dialog-footer"> + <el-button type="primary" @click="dialogVisible = false">鍏� 闂�</el-button> + </div> + </el-dialog> </div> </template> @@ -61,10 +78,12 @@ showProductId: '', taskModelId: '', dataType: 'fz', - samplPeriod: '', - simulatFrequency: '', - simulatTime: '' - } + samplPeriod: '10', + simulatFrequency: 500, + simulatTime: '', + }, + dialogVisible: false, + modelCheckResult: [], } }, mounted() { @@ -96,6 +115,7 @@ console.log(data, ' onProductSelected(data)') this.dataForm.productId = data.id this.getTaskList() + this.dataForm.taskModelId = '' this.$nextTick(() => { this.$refs.ProductModelTree.getProductList() }) @@ -118,12 +138,12 @@ this.taskList = res.data }, getStroke() { - //console.log('getStroke:',this.progress.start,"锛�",this.progress.speed) if (this.percentage < 100) { - //console.log('getStroke2') - this.$http.get(`/taskReliability/SimulatAssess/getCalcProgress?taskId=${this.dataForm.id}`).then( + let param = { + taskList: [this.dataForm.id] + } + this.$http.get(`/taskReliability/SimulatAssess/getCalcProgress`, {params: param}).then( res => { - // console.log(res.data, 'res.data') if (res.data) { this.percentage = parseFloat(res.data) } @@ -135,12 +155,20 @@ } }, async analyze() { + this.dialogVisible = false + this.modelCheckResult = [] this.isShow = true let result = await this.$http.get(`/basicInfo/TyProductModel/getUuid`) this.dataForm.id = result.data let res = await this.$http.post('/taskReliability/SimulatAssess/analyze', this.dataForm) if (res.success) { - this.timers = window.setInterval(this.getStroke, 1000) + console.log(res.data) + if (res.data && res.data.length > 0) { + this.modelCheckResult = res.data + this.dialogVisible = true + } else { + this.timers = window.setInterval(this.getStroke, 1000) + } } } } -- Gitblit v1.9.1