From 9fdb8bef649c8bba6ea97330d0e509fade235417 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 23 十月 2024 10:39:24 +0800
Subject: [PATCH] 关于修改可靠性产品重复

---
 web/src/views/modules/taskReliability/SimulatAssess.vue                                              |   14 +++++++++-----
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java      |    1 +
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssess.java |    4 ++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java
index fecdf9a..c97b23e 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java
@@ -60,6 +60,7 @@
 	private Integer sort;
 
 	@ApiModelProperty(value = "鍚岀被璁惧鏁伴噺")
+	@TableField(exist = false)
 	private Integer sameSbNum;
 
 
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssess.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssess.java
index c45cf74..061828e 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssess.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssess.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.zt.common.constant.Bool;
 import com.zt.common.entity.BusiEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -44,6 +45,9 @@
 	@TableField(exist = false)
 	private Double taskDuration;
 
+	@TableField(exist = false)
+	private Boolean repairDiracFlag;
+
 	@ApiModelProperty(value = "浼犵粰绠楁硶搴撶殑xml")
 	private String xml;
 
diff --git a/web/src/views/modules/taskReliability/SimulatAssess.vue b/web/src/views/modules/taskReliability/SimulatAssess.vue
index a864ee6..915cb2e 100644
--- a/web/src/views/modules/taskReliability/SimulatAssess.vue
+++ b/web/src/views/modules/taskReliability/SimulatAssess.vue
@@ -8,17 +8,20 @@
         <zt-form-item label="鎬讳綋浠诲姟" prop="taskModelId">
           <zt-select v-model="dataForm.taskModelId" :datas="taskList" @change="onTaskSelected"/>
         </zt-form-item>
-        <zt-form-item label="鏃堕棿鍒嗙墖" prop="samplPeriod">
-          <el-input type="number" :min="1" v-model="dataForm.samplPeriod">
+        <zt-form-item label="鏃堕棿鍒嗙墖" prop="samplPeriod" >
+          <el-input type="number" :min="1" v-model="dataForm.samplPeriod" style="width: 150px;vertical-align: baseline;">
             <template slot="append">鍒嗛挓</template>
           </el-input>
         </zt-form-item>
-        <zt-form-item label="浠跨湡娆℃暟" prop="simulatFrequency">
-          <el-input type="number" :min="1" v-model="dataForm.simulatFrequency">
+        <zt-form-item label="浠跨湡娆℃暟" prop="simulatFrequency" >
+          <el-input type="number" :min="1" v-model="dataForm.simulatFrequency" style="width: 150px;vertical-align: baseline;">
             <template slot="append">娆℃暟</template>
           </el-input>
         </zt-form-item>
-        <zt-form-item>
+        <el-form-item prop="repairDiracFlag" label-width="150px" style="margin-left: 20px">
+          <el-checkbox v-model="dataForm.repairDiracFlag">鍙慨璁惧鍙潬搴︿负1</el-checkbox>
+        </el-form-item>
+        <zt-form-item style="margin-left: 20px">
           <zt-button @click="analyze()">浠跨湡鍒嗘瀽</zt-button>
         </zt-form-item>
       </el-form>
@@ -81,6 +84,7 @@
           samplPeriod: '10',
           simulatFrequency: 500,
           simulatTime: '',
+          repairDiracFlag: false
         },
         dialogVisible: false,
         modelCheckResult: [],

--
Gitblit v1.9.1