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）获取任务二项分布参数时，去掉模型的匹配。
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java | 2
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java | 13 --
web/src/views/modules/taskReliability/ReliabilityAssess.vue | 43 +++++++
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskService.java | 191 ++++++++++++++------------------------
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ReliabilityAssessController.java | 16 +++
5 files changed, 128 insertions(+), 137 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ReliabilityAssessController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ReliabilityAssessController.java
index 85be829..a3fcbf9 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ReliabilityAssessController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ReliabilityAssessController.java
@@ -15,16 +15,19 @@
import com.zt.life.modules.mainPart.baseReliability.service.ParamDataBasicService;
import com.zt.life.modules.mainPart.basicInfo.model.ParamData;
import com.zt.life.modules.mainPart.taskReliability.dao.AssessItemDao;
+import com.zt.life.modules.mainPart.taskReliability.dto.TaskModelCheckResultDto;
import com.zt.life.modules.mainPart.taskReliability.model.AssessItem;
import com.zt.life.modules.mainPart.taskReliability.model.AssessResult;
import com.zt.life.modules.mainPart.taskReliability.model.OperatCondit;
import com.zt.life.modules.mainPart.taskReliability.model.ReliabilityAssess;
import com.zt.life.modules.mainPart.taskReliability.service.ReliabilityAssessService;
+import com.zt.life.modules.mainPart.taskReliability.service.TaskService;
import com.zt.life.util.ImportUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -44,6 +47,8 @@
@Autowired
AssessItemDao assessItemDao;
+ @Autowired
+ TaskService taskService;
@PostMapping("page")
@ApiOperation("鍒嗛〉")
@@ -82,6 +87,17 @@
return Result.ok();
}
+ @PostMapping("assessCheck")
+ @ApiOperation("璇勫畾妯″瀷妫�鏌�")
+ @LogOperation("璇勫畾妯″瀷妫�鏌�")
+ public Result<List<TaskModelCheckResultDto>> assessCheck(@RequestBody AssessResult assessResult){
+ List<TaskModelCheckResultDto> list = taskService.checkTaskModelAssess(assessResult.getProductId(),
+ assessResult.getTaskId(),
+ assessResult.getItemId());
+
+ return Result.ok(list);
+ }
+
@PostMapping("assess")
@ApiOperation("璇勫畾")
@LogOperation("璇勫畾")
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java
index 2212a70..d582d6a 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java
@@ -103,20 +103,11 @@
Long assessId = UUIDUtil.generateId();
assessResult.setId(assessId);
-/*
- // 1. 妫�鏌ュ弬鏁板畬鏁存��
- List<TaskModelCheckResultDto> chkResult = taskService.checkTaskModel(simulatAssess.getProductId(),
- simulatAssess.getTaskModelId());
- if (chkResult.size() > 0) {
- result = Result.error("妯″瀷涓嶅畬鏁达紝璇锋鏌ユā鍨嬪畾涔夊強鍙傛暟閰嶇疆銆�");
- return result;
- }
-*/
- // 2. 缁勮渚涚畻娉曞簱璇勫畾鐨勬ā鍨媥ml
+ // 1. 缁勮渚涚畻娉曞簱璇勫畾鐨勬ā鍨媥ml
assembleModelXml(assessResult);
- // 3. 璋冪敤绠楁硶搴擄紝杩涜璇勫畾璁＄畻
+ // 2. 璋冪敤绠楁硶搴擄紝杩涜璇勫畾璁＄畻
result = callReliaAssessLib(assessResult);
if (result.getCode() != 0) throw new RenException(result.getMsg());
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
index 989600b..ec03e1b 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java
@@ -1108,7 +1108,7 @@
.filter(item -> taskId.equals(item.getTaskId()))
.filter(item -> taskPhaseModel.getPhaseId().equals(item.getPhaseId()))
.filter(item -> taskPhaseModel.getOperatConditId().equals(item.getOperatConditId()))
- .filter(item -> modelId.equals(item.getModelId()))
+// .filter(item -> modelId.equals(item.getModelId()))
.filter(item -> dataId.equals(item.getProductId()))
.collect(Collectors.toList()).get(0);
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskService.java
index f7f7290..0e5a5ad 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/TaskService.java
@@ -42,6 +42,8 @@
private ParamDataDao paramDataDao;
@Autowired
private TaskBinoParamDao taskBinoParamDao;
+ @Autowired
+ private ReliabilityAssessDao reliabilityAssessDao;
/**
* 鍒嗛〉鏌ヨ
@@ -100,7 +102,7 @@
List<ModelNodeAlgorithm> rbdNodeList = modelNodeAlgorithmDao.getRbdNodes();
// 1.8 鑾峰彇璇ヨ埞鐨勬墍鏈夎澶囧弬鏁癓ist
List<ParamData> paramDataList = paramDataDao.getDeviceParams(productId);
- // 1.8 鑾峰彇璇ヤ换鍔＄殑浜岄」鍒嗗竷鍙傛暟锛塋ist
+ // 1.8 鑾峰彇璇ヤ换鍔＄殑浜岄」鍒嗗竷鍙傛暟List
List<TaskBinoParam> binoParamList = taskBinoParamDao.getBinoParams(taskId);
// 2. 妫�鏌ユ瘡涓换鍔℃ā鍨嬬殑鏁版嵁瀹屾暣鎬�
@@ -218,7 +220,7 @@
List<TaskBinoParam> binoParams = binoParamList.stream().filter(item ->
phase.getId().equals(item.getPhaseId()) &&
taskPhaseModel.getOperatConditId().equals(item.getOperatConditId()) &&
- modelRbds.get(0).getId().equals(item.getModelId()) &&
+// modelRbds.get(0).getId().equals(item.getModelId()) &&
device.getId().equals(item.getProductId())).collect(Collectors.toList());
if (binoParams.size() == 0) {
setTaskModelCheckResult(task, phase, taskPhaseModel,
@@ -342,7 +344,7 @@
* @param productId 浜у搧鑺傜偣ID锛堜竴鑸负鎬讳綋锛�
* @return 妫�鏌ュ嚭鐨勯敊璇殑List锛岄暱搴︿负0琛ㄧず娌℃湁閿欒锛屼笉浼氳繑鍥瀗ull
*/
- public List<TaskModelCheckResultDto> checkTaskModelAssess(Long productId, Long taskId) {
+ public List<TaskModelCheckResultDto> checkTaskModelAssess(Long productId, Long taskId, Long itemId) {
List<TaskModelCheckResultDto> checkResult = new ArrayList<>();
List<XhProductModel> deviceUsedList = new ArrayList<>(); // 妫�鏌ュ璞℃ā鍨嬩腑浣跨敤鍒扮殑鎵�鏈夎澶�
@@ -363,8 +365,8 @@
List<ModelNodeAlgorithm> rbdNodeList = modelNodeAlgorithmDao.getRbdNodes();
// 1.8 鑾峰彇璇ヨ埞鐨勬墍鏈夎澶囧弬鏁癓ist
List<ParamData> paramDataList = paramDataDao.getDeviceParams(productId);
- // 1.8 鑾峰彇璇ヤ换鍔＄殑浜岄」鍒嗗竷鍙傛暟锛塋ist
- List<TaskBinoParam> binoParamList = taskBinoParamDao.getBinoParams(taskId);
+ // 1.8 鑾峰彇璇勫畾鏁版嵁List
+ List<ReliabilityAssess> assessDataList = reliabilityAssessDao.getProductList(productId, itemId);
// 2. 妫�鏌ユ瘡涓换鍔℃ā鍨嬬殑鏁版嵁瀹屾暣鎬�
for (Task task : taskList) {
@@ -425,142 +427,90 @@
for (OperatConditModel gkModel : gkModelTree) {
XhProductModel node = productTreeList.stream().filter(item ->
gkModel.getProductId().equals(item.getId())).collect(Collectors.toList()).get(0);
- if (null == gkModel.getModelId()) {
- // 2.6 宸ュ喌妯″瀷鏍戜笉瀹屾暣
- setTaskModelCheckResult(task, phase, taskPhaseModel,
- node, null, null, null,
- TaskModelCheckResultDto.CATEGORY_GK_MODEL, checkResult);
- } else {
- List<ModelRbd> modelRbds = modelRbdList.stream().filter(item ->
- gkModel.getModelId().equals(item.getId())).collect(Collectors.toList());
- if (modelRbds.size() == 0) {
- // 2.7 寤烘ā鏈畬鎴�
+ if (isNodeInRbdOfParent(node, gkModelTree, rbdNodeList)) {
+ if (null == gkModel.getModelId()) {
+ // 2.6 宸ュ喌妯″瀷鏍戜笉瀹屾暣
setTaskModelCheckResult(task, phase, taskPhaseModel,
node, null, null, null,
- TaskModelCheckResultDto.CATEGORY_MODEL, checkResult);
+ TaskModelCheckResultDto.CATEGORY_GK_MODEL, checkResult);
} else {
- if (!"宸插畬鎴�".equals(modelRbds.get(0).getModelState())) {
+ List<ModelRbd> modelRbds = modelRbdList.stream().filter(item ->
+ gkModel.getModelId().equals(item.getId())).collect(Collectors.toList());
+ if (modelRbds.size() == 0) {
// 2.7 寤烘ā鏈畬鎴�
setTaskModelCheckResult(task, phase, taskPhaseModel,
- node, modelRbds.get(0), null, null,
+ node, null, null, null,
TaskModelCheckResultDto.CATEGORY_MODEL, checkResult);
} else {
- List<Algorithm> algorithmList = algorithmDao.getListByModelId(gkModel.getModelId());
- if (hasNotSupportModel(algorithmList)) {
- // 2.8 鐩墠涓嶆敮鎸佷覆鑱斻�佸苟鑱斿拰琛ㄥ喅浠ュ鐨勬ā鍨�
+ if (!"宸插畬鎴�".equals(modelRbds.get(0).getModelState())) {
+ // 2.7 寤烘ā鏈畬鎴�
setTaskModelCheckResult(task, phase, taskPhaseModel,
node, modelRbds.get(0), null, null,
- TaskModelCheckResultDto.CATEGORY_MODEL_NOT_SUPPORT, checkResult);
+ TaskModelCheckResultDto.CATEGORY_MODEL, checkResult);
} else {
- List<ModelNodeAlgorithm> deviceNodes = rbdNodeList.stream().filter(item ->
- gkModel.getModelId().equals(item.getModelId())).collect(Collectors.toList());
- for (ModelNodeAlgorithm deviceNode : deviceNodes) {
- XhProductModel device = (XhProductModel) productTreeList.stream().filter(item ->
- deviceNode.getDataId().equals(item.getId())).collect(Collectors.toList()).get(0);
- if ("5".equals(device.getProductType())) {
- // 璁惧
- List<ParamData> params = paramDataList.stream().filter(item ->
- deviceNode.getDataId().equals(item.getProductId())).collect(Collectors.toList());
- if (params.size() == 0) {
- // 璁惧鍙傛暟鏈厤缃�
- setTaskModelCheckResult(task, phase, taskPhaseModel,
- node, modelRbds.get(0), device, null,
- TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
- } else {
- ParamData param = params.get(0);
- if (param.getReliabDistribType() == null) {
+ List<Algorithm> algorithmList = algorithmDao.getListByModelId(gkModel.getModelId());
+ if (hasNotSupportModel(algorithmList)) {
+ // 2.8 鐩墠涓嶆敮鎸佷覆鑱斻�佸苟鑱斿拰琛ㄥ喅浠ュ鐨勬ā鍨�
+ setTaskModelCheckResult(task, phase, taskPhaseModel,
+ node, modelRbds.get(0), null, null,
+ TaskModelCheckResultDto.CATEGORY_MODEL_NOT_SUPPORT, checkResult);
+ } else {
+ List<ModelNodeAlgorithm> deviceNodes = rbdNodeList.stream().filter(item ->
+ gkModel.getModelId().equals(item.getModelId())).collect(Collectors.toList());
+ for (ModelNodeAlgorithm deviceNode : deviceNodes) {
+ XhProductModel device = (XhProductModel) productTreeList.stream().filter(item ->
+ deviceNode.getDataId().equals(item.getId())).collect(Collectors.toList()).get(0);
+ if ("5".equals(device.getProductType())) {
+ // 璁惧
+ List<ParamData> params = paramDataList.stream().filter(item ->
+ deviceNode.getDataId().equals(item.getProductId())).collect(Collectors.toList());
+ if (params.size() == 0) {
+ // 2.9 璁惧鍙傛暟鏈厤缃�
setTaskModelCheckResult(task, phase, taskPhaseModel,
- node, modelRbds.get(0), device, "鍙潬鎬у垎甯冪被鍨�",
+ node, modelRbds.get(0), device, null,
TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
} else {
- if (param.getReliabDistribType() == 1) {
- // 鎸囨暟鍒嗗竷
- if (param.getTaskMtbcfRegulate() == null) {
+ ParamData param = params.get(0);
+ if (param.getReliabDistribType() == null) {
+ setTaskModelCheckResult(task, phase, taskPhaseModel,
+ node, modelRbds.get(0), device, "鍙潬鎬у垎甯冪被鍨�",
+ TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
+ } else {
+ if (param.getReliabDistribType() != 1 && param.getReliabDistribType() != 3) {
+ // 2.10 鐩墠涓嶆敮鎸佷簩椤瑰垎甯冨拰鎸囨暟鍒嗗竷浠ュ鐨勫垎甯冪被鍨�
setTaskModelCheckResult(task, phase, taskPhaseModel,
- node, modelRbds.get(0), device, "MTBCF",
- TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
- }
- }
- if (param.getReliabDistribType() == 2) {
- // 濞佸竷灏斿垎甯�
- if (param.getTaskMtbcfRegulate() == null) {
- setTaskModelCheckResult(task, phase, taskPhaseModel,
- node, modelRbds.get(0), device, "MTBCF",
- TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
- }
- if (param.getTaskMtbcfOtherParams2() == null) {
- setTaskModelCheckResult(task, phase, taskPhaseModel,
- node, modelRbds.get(0), device, "MTBCF鍙傛暟2",
- TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
- }
- if (param.getTaskMtbcfOtherParams3() == null) {
- setTaskModelCheckResult(task, phase, taskPhaseModel,
- node, modelRbds.get(0), device, "MTBCF鍙傛暟3",
- TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
- }
- }
- if (param.getReliabDistribType() == 3) {
- // 浜岄」鍒嗗竷
- List<TaskBinoParam> binoParams = binoParamList.stream().filter(item ->
- phase.getId().equals(item.getPhaseId()) &&
- taskPhaseModel.getOperatConditId().equals(item.getOperatConditId()) &&
- modelRbds.get(0).getId().equals(item.getModelId()) &&
- device.getId().equals(item.getProductId())).collect(Collectors.toList());
- if (binoParams.size() == 0) {
- setTaskModelCheckResult(task, phase, taskPhaseModel,
- node, modelRbds.get(0), device, "浜岄」鍒嗗竷鍙傛暟",
- TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
+ node, modelRbds.get(0), device, "鍙潬鎬у垎甯冪被鍨�",
+ TaskModelCheckResultDto.CATEGORY_DISTRIBUTION_NOT_SUPPORT, checkResult);
} else {
- TaskBinoParam binoParam = binoParams.get(0);
- if (binoParam.getSuccessRate() == null) {
+ List<ReliabilityAssess> assessDatas = assessDataList.stream().filter(item ->
+ item.getId().equals(device.getId())).collect(Collectors.toList());
+ if (assessDatas.size() ==0) {
+ // 2.11 璇勫畾鏁版嵁鏈綍鍏�
setTaskModelCheckResult(task, phase, taskPhaseModel,
- node, modelRbds.get(0), device, "鎴愬姛鐜�",
- TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
+ node, modelRbds.get(0), device, null,
+ TaskModelCheckResultDto.CATEGORY_NO_ASSESS_DATA, checkResult);
} else {
- if (binoParam.getSuccessTimes() != null && binoParam.getSimulatTimes() == null) {
+ ReliabilityAssess assessData = assessDatas.get(0);
+ if (assessData.getFailNum() == null || assessData.getFailNum() == 0) {
+ // 2.11 璇勫畾鏁版嵁鏈綍鍏�
setTaskModelCheckResult(task, phase, taskPhaseModel,
- node, modelRbds.get(0), device, "鎬绘鏁�",
- TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
+ node, modelRbds.get(0), device, "鏁呴殰娆℃暟",
+ TaskModelCheckResultDto.CATEGORY_NO_ASSESS_DATA, checkResult);
}
- if (binoParam.getSuccessTimes() == null && binoParam.getSimulatTimes() != null) {
+ if (param.getReliabDistribType() == 1 &&
+ (assessData.getRunTimes() == null || assessData.getRunTimes() == 0.0)) {
+ // 2.11 璇勫畾鏁版嵁鏈綍鍏�
setTaskModelCheckResult(task, phase, taskPhaseModel,
- node, modelRbds.get(0), device, "鎴愬姛娆℃暟",
- TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
+ node, modelRbds.get(0), device, "璇曢獙鏃堕棿",
+ TaskModelCheckResultDto.CATEGORY_NO_ASSESS_DATA, checkResult);
}
- }
- }
- }
- if (1 == param.getRepairable()) {
- // 鍙淮淇�
- if (param.getRepairDistribType() == null) {
- setTaskModelCheckResult(task, phase, taskPhaseModel,
- node, modelRbds.get(0), device, "缁翠慨鍒嗗竷绫诲瀷",
- TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
- }
- if (param.getRepairDistribType() == 1) {
- // 鎸囨暟鍒嗗竷
- if (param.getRepairMttcr() == null) {
- setTaskModelCheckResult(task, phase, taskPhaseModel,
- node, modelRbds.get(0), device, "MTTCR",
- TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
- }
- }
- if (param.getRepairDistribType() == 2) {
- // 濞佸竷灏斿垎甯�
- if (param.getRepairMttcr() == null) {
- setTaskModelCheckResult(task, phase, taskPhaseModel,
- node, modelRbds.get(0), device, "MTTCR",
- TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
- }
- if (param.getRepairMttcrOtherParams2() == null) {
- setTaskModelCheckResult(task, phase, taskPhaseModel,
- node, modelRbds.get(0), device, "MTTCR鍙傛暟2",
- TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
- }
- if (param.getRepairMttcrOtherParams3() == null) {
- setTaskModelCheckResult(task, phase, taskPhaseModel,
- node, modelRbds.get(0), device, "MTTCR鍙傛暟3",
- TaskModelCheckResultDto.CATEGORY_PARAM, checkResult);
+ if (param.getReliabDistribType() == 3 &&
+ (assessData.getRunNum() == null || assessData.getRunNum() == 0.0)) {
+ // 2.11 璇勫畾鏁版嵁鏈綍鍏�
+ setTaskModelCheckResult(task, phase, taskPhaseModel,
+ node, modelRbds.get(0), device, "璇曢獙娆℃暟",
+ TaskModelCheckResultDto.CATEGORY_NO_ASSESS_DATA, checkResult);
+ }
}
}
}
@@ -575,7 +525,6 @@
}
}
}
-
}
}
// 3. 杩斿洖妫�鏌ョ粨鏋�
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