From 3a4536445096cdb80d586a67df3c00ab4a0faecb Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 22 七月 2024 16:46:38 +0800
Subject: [PATCH] 修改

---
 web/src/views/modules/taskReliability/SimulatAssess.vue |   34 ++++++++++++++++++++++------------
 1 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/web/src/views/modules/taskReliability/SimulatAssess.vue b/web/src/views/modules/taskReliability/SimulatAssess.vue
index cd7588f..327cb12 100644
--- a/web/src/views/modules/taskReliability/SimulatAssess.vue
+++ b/web/src/views/modules/taskReliability/SimulatAssess.vue
@@ -11,6 +11,11 @@
               <zt-form-item label="鎬讳綋浠诲姟" prop="task">
                 <zt-select v-model="dataForm.task" :datas="taskList" @change="onTaskSelected"/>
               </zt-form-item>
+             <!-- <zt-form-item label="浠诲姟鏃堕暱" prop="simulatTime">
+                <el-input type="number" :min="1" v-model="dataForm.simulatTime">
+                  <template slot="append">灏忔椂</template>
+                </el-input>
+              </zt-form-item>-->
               <zt-form-item label="鏁版嵁绫诲瀷" prop="dataType">
                 <zt-dict v-model="dataForm.dataType" dict="dataType"></zt-dict>
               </zt-form-item>
@@ -29,7 +34,7 @@
               </zt-form-item>
               <zt-form-item>
                 <zt-button @click="analyze()">浠跨湡鍒嗘瀽</zt-button>
-                <zt-button>鍒嗘瀽缁撴灉</zt-button>
+                <zt-button @click="getresult()">鍒嗘瀽缁撴灉</zt-button>
               </zt-form-item>
             </el-form>
           </div>
@@ -38,7 +43,7 @@
       <el-col :span="18">
         <div class="fa-card-a">
           <SimulatCurve ref="SimulatCurve"></SimulatCurve>
-          <SimulatData></SimulatData>
+          <SimulatData ref="SimulatData"></SimulatData>
         </div>
       </el-col>
     </el-row>
@@ -64,6 +69,7 @@
           isRepair: '',
           samplPeriod: '',
           simulatFrequency: '',
+          simulatTime:''
         }
       }
     },
@@ -98,24 +104,25 @@
         console.log(res.data)
         this.taskList = res.data
       },
+      getresult(){
+        this.$refs.SimulatData.init();
+      },
       async analyze() {
-        let res = await this.$http.post('/taskReliability/SimulatAssess/analyze', this.dataForm)
+       /* let res = await this.$http.post('/taskReliability/SimulatAssess/analyze', this.dataForm)
         if (res.success) {
-          console.log(res.data, 'analyze')
           let stopPolling = false
           if (!stopPolling) {
             let timer = setInterval(async () => {
               let res2 = await this.$http.get(`/taskReliability/SimulatAssess/${res.data}`)
-              console.log(res2.data, 'setInterval')
               if (res2.data) {
                 if (res2.data.code === '0' || res2.data.errorMsg === '0') {
                   stopPolling = true
                   // 涓杞
                   clearInterval(timer)
-                  alert('宸茶幏鍙�')
-                  this.$refs.SimulatCurve.initEcharts(res2.data.curveData);
+                  alert('宸茶幏鍙�')*/
+                  this.$refs.SimulatCurve.initEcharts();
                   // 娓呴櫎瀹氭椂鍣�
-                } else {
+        /*        } else {
                   stopPolling = true
                   // 涓杞
                   clearInterval(timer)
@@ -125,22 +132,22 @@
             }, 400)
           }
 
-        }
+        }*/
       }
     }
   }
 </script>
 <style>
   .mod-taskReliability-simulatAssess {
-    height: calc(100vh - 165px);
+    height: calc(100vh - 175px);
   }
 
   .mod-taskReliability-simulatAssess .el-form-item__label {
-    line-height: calc((100vh - 165px) / 7);
+    line-height: calc((100vh - 175px) / 7);
   }
 
   .mod-taskReliability-simulatAssess .el-form-item__content {
-    line-height: calc((100vh - 165px) / 7);
+    line-height: calc((100vh - 175px) / 7);
   }
 
   .mod-taskReliability-simulatAssess .el-form-item__content > .el-input-group--append {
@@ -150,4 +157,7 @@
   div.el-col.el-col-17 {
     background: white;
   }
+  div.el-select-dropdown.el-popper{
+    /*top: calc((100vh - 155px) / 4) !important;*/
+  }
 </style>

--
Gitblit v1.9.1