From a8ce806c8a81f685fa9fafaa453820197ced9961 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 10 十二月 2024 10:39:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java | 3 ++-
web/src/views/modules/taskReliability/ModelView.vue | 8 ++++----
2 files changed, 6 insertions(+), 5 deletions(-)
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 05d095f..a38a8d1 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
@@ -1105,7 +1105,8 @@
ParamData paramData = paramDataList.stream().filter(item ->
dataId.equals(item.getProductId())).collect(Collectors.toList()).get(0);
Double ratio = paramData.getTaskMtbcfOperatingRatio();
- if (null != ratio && ratio > 0) {
+// if (null != ratio && ratio > 0) {
+ if (null != ratio && ratio != 1.0) {
// 闂存柇鍨嬭澶囩殑澶勭悊
double cycon = taskPhaseModel.getOperatConditDuration() * ratio;
double cycdown = taskPhaseModel.getOperatConditDuration() - cycon;
diff --git a/web/src/views/modules/taskReliability/ModelView.vue b/web/src/views/modules/taskReliability/ModelView.vue
index 89fb91d..9f462fa 100644
--- a/web/src/views/modules/taskReliability/ModelView.vue
+++ b/web/src/views/modules/taskReliability/ModelView.vue
@@ -8,7 +8,7 @@
</el-form>
<div
style="border: 1px solid #EAEBEE;border-radius: 6px;box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);height: calc(100vh - 233px);">
- <div id="containerImg"></div>
+ <div id="containerImg1"></div>
</div>
<config-node ref="configNode" v-show="type === 'node'"/>
<config-edge ref="configEdge" v-show="type === 'edge'"/>
@@ -332,7 +332,7 @@
async initDigram() {
this.timer = setHartBeat(10, 240);
this.graph = new Graph({
- container: document.getElementById('containerImg'),
+ container: document.getElementById('containerImg1'),
width: document.documentElement.clientWidth,
height: document.documentElement.clientHeight - 240,
// async: true,
@@ -1309,9 +1309,9 @@
</script>
<style>
- #containerImg {
+ #containerImg1 {
display: flex;
- border: 1px solid #dfe3e8;
+ /*border: 1px solid #dfe3e8;*/
height: 400px;
width: 100% !important;
}
--
Gitblit v1.9.1