jinlin
2024-12-10 a8ce806c8a81f685fa9fafaa453820197ced9961
Merge remote-tracking branch 'origin/master'
2个文件已修改
11 ■■■■ 已修改文件
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/SimulatAssessService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/modules/taskReliability/ModelView.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
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;
  }