From 3d72db70fcb406e02b283c4b624e8282ed301422 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期一, 14 十月 2024 10:09:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 web/src/views/modules/taskReliability/SimulatHistory.vue |   39 ++++++++++++++++++---------------------
 1 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/web/src/views/modules/taskReliability/SimulatHistory.vue b/web/src/views/modules/taskReliability/SimulatHistory.vue
index c6bc234..842b32a 100644
--- a/web/src/views/modules/taskReliability/SimulatHistory.vue
+++ b/web/src/views/modules/taskReliability/SimulatHistory.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="fa-card-a">
     <el-row :gutter="5">
-      <div class="mod-taskReliability-simulatAssess">
         <el-form :inline="true" :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="80px">
           <zt-form-item label="浜у搧鑺傜偣" prop="productId">
             <zt-select v-model="dataForm.productId" :datas="productList" @change="onProductSelected"/>
@@ -12,31 +11,27 @@
           <zt-form-item label="浠跨湡璁板綍" prop="simulatHis">
             <zt-select v-model="dataForm.id" :datas="simulatList" @change="onSimulatSelected"/>
           </zt-form-item>
-          <zt-form-item label="閲囨牱鍛ㄦ湡" prop="samplPeriod">
+          <zt-form-item label="鏃堕棿鍒嗙墖" prop="samplPeriod">
             <el-input v-model="dataForm.samplPeriod" readonly="false">
+              <template slot="append">鍒嗛挓</template>
             </el-input>
           </zt-form-item>
           <zt-form-item label="浠跨湡娆℃暟" prop="simulatFrequency">
-            <el-input v-model="dataForm.simulatFrequency" readonly="false" >
+            <el-input v-model="dataForm.simulatFrequency" readonly="false">
             </el-input>
           </zt-form-item>
         </el-form>
-        <div>
           <el-col :span="4">
-            <div style="margin-right: 5px;height: calc(88vh - 100px)" v-if="isSelect">
+            <div style="margin-right: 5px;height: calc(100vh - 230px)" v-if="isSelect">
               <product-model-tree @on-selected="onTreeSelected" showXdy="false"
-                                  ref="ProductModelTree" :isShow="false" basic="4"/>
+                                  ref="ProductModelTree" :isShow="false" basic="5" :productId="dataForm.productId"/>
             </div>
           </el-col>
           <el-col :span="20">
-            <div style="margin-top: 20px">
-              <div>
+            <div class="fa-card-a" style="height: calc(100vh - 230px)">
                 <SimulatCurve ref="SimulatCurve"></SimulatCurve>
-              </div>
             </div>
           </el-col>
-        </div>
-      </div>
     </el-row>
   </div>
 </template>
@@ -57,7 +52,7 @@
         taskList: [],
         dataForm: {
           id: '',
-          taskDuration:'',
+          taskDuration: '',
           pid: '',
           productId: '',
           showProductId: '',
@@ -81,6 +76,7 @@
       async getProductList() {
         let res = await this.$http.get('/basicInfo/XhProductModel/getTaskProductList')
         this.productList = res.data
+        this.onProductSelected(this.productList[0])
       },
       async getTaskList() {
         let params = {
@@ -92,7 +88,6 @@
       },
       async getSimulatList() {
         let params = {
-          productId: this.dataForm.productId,
           taskModelId: this.dataForm.taskModelId
         }
         let res = await this.$http.get('/taskReliability/SimulatAssess/getSimulatList', {params: params})
@@ -100,7 +95,7 @@
         this.simulatList = res.data
       },
       onTreeSelected(data) {
-        if (this.dataForm.id){
+        if (this.dataForm.id) {
           console.log(data, 'onProductSelected')
           this.dataForm.showProductId = data.id
           this.$refs.SimulatCurve.getProductEcharts(this.dataForm);
@@ -113,6 +108,9 @@
         this.dataForm.productId = data.id
         this.getTaskList()
         this.dataForm.taskModelId = ''
+        this.$nextTick(() => {
+          this.$refs.ProductModelTree.getProductList()
+        })
       },
       onTaskSelected(data) {
         console.log(data, ' onProductSelected(data)')
@@ -120,22 +118,21 @@
         this.getSimulatList()
         this.dataForm.id = ''
       },
-      onSimulatSelected(data) {
+      async onSimulatSelected(data) {
         this.dataForm.id = data.id
         this.dataForm.samplPeriod = data.samplPeriod
-        this.getSimulatParams()
-        this.$refs.SimulatCurve.initEcharts(this.dataForm)
-      },
-      async getSimulatParams() {
         let params = {
           id: this.dataForm.id,
           taskModelId: this.dataForm.taskModelId
         }
         let res = await this.$http.get('/taskReliability/SimulatAssess/getSimulatParams', {params: params})
         console.log(res.data.samplPeriod)
-        this.dataForm.taskDuration = res.data.taskDuration
+        this.dataForm.samplPeriod = res.data.samplPeriod
         this.dataForm.simulatFrequency = res.data.simulatFrequency
-      }
+        this.$nextTick(() => {
+          this.$refs.SimulatCurve.initEcharts(this.dataForm)
+        })
+      },
     }
   }
 </script>

--
Gitblit v1.9.1