From a86c2eb2db34d2d350e5c2eb72bf6416ec89c0d2 Mon Sep 17 00:00:00 2001 From: xyc <jc_xiong@hotmail.com> Date: 星期二, 19 十一月 2024 11:43:03 +0800 Subject: [PATCH] 1)可靠性评定时新增模型检查处理; 2)获取任务二项分布参数时,去掉模型的匹配。 --- web/src/views/modules/taskReliability/ReliabilityAssess.vue | 43 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 39 insertions(+), 4 deletions(-) diff --git a/web/src/views/modules/taskReliability/ReliabilityAssess.vue b/web/src/views/modules/taskReliability/ReliabilityAssess.vue index 6516b3e..520ac70 100644 --- a/web/src/views/modules/taskReliability/ReliabilityAssess.vue +++ b/web/src/views/modules/taskReliability/ReliabilityAssess.vue @@ -47,6 +47,24 @@ </el-table> <add-or-update @refreshDataList="refreshData" ref="AddOrUpdate"/> </zt-table-wraper> + <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> </div> </template> @@ -78,7 +96,9 @@ flag2: false, defultKey: [], isExpand:false, - expandText:"涓�閿睍寮�" + expandText:"涓�閿睍寮�", + dialogVisible: false, + modelCheckResult: [], } }, components: { @@ -152,13 +172,28 @@ }) }, async assess() { + this.dialogVisible = false + this.modelCheckResult = [] if (!this.dataForm.productId || !this.dataForm.taskId || !this.dataForm.itemId || !this.dataForm.confidence) { this.$tip.alert("鏈夋湭濉啓鐨勬暟鎹�") return } - let res = await this.$http.post('/taskReliability/ReliabilityAssess/assess', this.dataForm) - console.log(res.data) - this.dataList = res.data + let res = await this.$http.post('/taskReliability/ReliabilityAssess/assessCheck', this.dataForm) + if (res.success) { + if (res.data && res.data.length > 0) { + this.modelCheckResult = res.data + this.dialogVisible = true + } else { + let res = await this.$http.post('/taskReliability/ReliabilityAssess/assess', this.dataForm) + if (res.success) { + console.log(res.data) + this.dataList = res.data + this.$alert('璇勫畾鎴愬姛', '鎻愮ず', { + confirmButtonText: '纭畾' + }) + } + } + } }, async getProductList() { let res = await this.$http.get('/basicInfo/XhProductModel/getTaskProductList') -- Gitblit v1.9.1