From 48dcf2c7f01de5078f6a7f94dbc59400100e9ab6 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 23 十月 2024 11:05:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 web/src/views/modules/taskReliability/SimulatAssess.vue |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

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