From 150576686b456ac21f6a687a16ee26eb5eb80c07 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 19 八月 2024 14:48:39 +0800
Subject: [PATCH] 修改

---
 web/src/views/modules/taskReliability/SchemeCompar.vue |  150 +++++++++++++++++++++++--------------------------
 1 files changed, 71 insertions(+), 79 deletions(-)

diff --git a/web/src/views/modules/taskReliability/SchemeCompar.vue b/web/src/views/modules/taskReliability/SchemeCompar.vue
index bc088de..ffada1d 100644
--- a/web/src/views/modules/taskReliability/SchemeCompar.vue
+++ b/web/src/views/modules/taskReliability/SchemeCompar.vue
@@ -2,72 +2,72 @@
   <div class="fa-card-a">
     <el-row :gutter="5">
       <el-form :inline="true" :model="dataForm" ref="dataForm" :disabled="dataForm.disabled">
-          <zt-form-item label="浜у搧鑺傜偣" prop="productId" width="100px">
-            <zt-select v-model="dataForm.productId" :datas="productList" @change="onProductSelected"/>
-          </zt-form-item>
-          <zt-form-item label="鍙潬鎬ф柟妗�" prop="taskModelId" width="500px">
-            <zt-select style="width: 400px" v-model="dataForm.taskModelId" :datas="schemeList"
-                       @change="onTaskSelected" :multiple="true"/>
-          </zt-form-item>
-          <zt-form-item>
-            <zt-button @click="compair()">鏂规瀵规瘮</zt-button>
-          </zt-form-item>
-        </el-form>
-          <el-col :span="4">
-            <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" :productId="dataForm.productId"/>
+        <zt-form-item label="浜у搧鑺傜偣" prop="productId" width="100px">
+          <zt-select v-model="dataForm.productId" :datas="productList" @change="onProductSelected"/>
+        </zt-form-item>
+        <zt-form-item label="鍙潬鎬ф柟妗�" prop="taskModelId" width="500px">
+          <zt-select style="width: 400px" v-model="dataForm.taskModelId" :datas="schemeList"
+                     @change="onTaskSelected" :multiple="true"/>
+        </zt-form-item>
+        <zt-form-item>
+          <zt-button @click="compair()">鏂规瀵规瘮</zt-button>
+        </zt-form-item>
+      </el-form>
+      <el-col :span="4">
+        <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" :productId="dataForm.productId"/>
+        </div>
+      </el-col>
+      <el-col :span="20">
+        <div class="fa-card-a" style="position: relative;height: calc(100vh - 230px)">
+          <div v-if="isShow">
+            <el-button v-if="isZk" type="info" size="small" icon="el-icon-caret-bottom"
+                       style="position: absolute;right: 10%;top: 10%;z-index: 1" @click="zk()"></el-button>
+            <el-button v-if="!isZk" type="info" size="small" icon="el-icon-caret-right"
+                       style="position: absolute;right: 10%;top: 10%;z-index: 1" @click="zk()"></el-button>
+            <div v-if="isZk" style="position: absolute;right: 10%;top: 15%">
+              <el-table :data="tableData" border style="width: 500px">
+                <el-table-column
+                  prop="name"
+                  label="鏂规鍚嶇О"
+                >
+                </el-table-column>
+                <el-table-column
+                  prop="mtbf"
+                  label="MTBF"
+                  width="100px"
+                  align="right">
+                  <template slot-scope="scope">
+                    <span>{{  keepNumber(scope.row.mtbf) }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="mttr"
+                  label="MTTR"
+                  width="100px"
+                  align="right">
+                  <template slot-scope="scope">
+                    <span>{{  keepNumber(scope.row.mttr) }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="msr"
+                  label="MSR"
+                  width="100px"
+                  align="right">
+                  <template slot-scope="scope">
+                    <span>{{  keepNumber(scope.row.mttr) }}</span>
+                  </template>
+                </el-table-column>
+              </el-table>
             </div>
-          </el-col>
-          <el-col :span="20">
-            <div class="fa-card-a" style="position: relative;height: calc(100vh - 230px)">
-              <div v-if="isShow">
-                <el-button v-if="isZk" type="info" size="small" icon="el-icon-caret-bottom"
-                           style="position: absolute;right: 10%;top: 10%;z-index: 1" @click="zk()"></el-button>
-                <el-button v-if="!isZk" type="info" size="small" icon="el-icon-caret-right"
-                           style="position: absolute;right: 10%;top: 10%;z-index: 1" @click="zk()"></el-button>
-                <div v-if="isZk" style="position: absolute;right: 10%;top: 15%">
-                  <el-table :data="tableData" border style="width: 500px">
-                    <el-table-column
-                      prop="name"
-                      label="鏂规鍚嶇О"
-                    >
-                    </el-table-column>
-                    <el-table-column
-                      prop="mtbf"
-                      label="MTBF"
-                      width="100px"
-                      align="right">
-                      <template slot-scope="scope">
-                        <span>{{  keepNumber(scope.row.mtbf) }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column
-                      prop="mttr"
-                      label="MTTR"
-                      width="100px"
-                      align="right">
-                      <template slot-scope="scope">
-                        <span>{{  keepNumber(scope.row.mttr) }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column
-                      prop="msr"
-                      label="MSR"
-                      width="100px"
-                      align="right">
-                      <template slot-scope="scope">
-                        <span>{{  keepNumber(scope.row.mttr) }}</span>
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                </div>
-              </div>
-              <div :disabled="isShow">
-                <div class="echart" id="myChart" :style="myChartStyle"></div>
-              </div>
-            </div>
-          </el-col>
+          </div>
+          <div :disabled="isShow">
+            <div class="echart" id="myChart" :style="myChartStyle"></div>
+          </div>
+        </div>
+      </el-col>
     </el-row>
   </div>
 </template>
@@ -115,21 +115,14 @@
     },
 
     methods: {
-      async onTreeSelected(data) {
+      onTreeSelected(data) {
         if (this.dataForm.taskModelId.length > 0) {
           console.log(this.dataForm.taskModelId)
           console.log(data, 'onProductSelected')
           this.dataForm.showProductId = data.id
-          let params = {
-            taskList: this.dataForm.taskModelId,
-            showProductId: this.dataForm.showProductId
-          }
-          console.log(this.dataForm.taskModelId, 'this.dataForm.taskModelId')
-          let res = await this.$http.get('/taskReliability/SimulatAssess/SchemeCompar', {params: params})
-          console.log(res.data, "res")
-          this.xDataList = res.data.xdataList
-          this.seriesList = res.data.curveList
-          this.tableData = res.data.dataList
+          this.$nextTick(() => {
+            this.compair()
+          })
         }
       },
       // 鑾峰彇淇℃伅
@@ -167,7 +160,7 @@
       async compair() {
         let params = {
           taskList: this.dataForm.taskModelId,
-          showProductId: null
+          showProductId: this.dataForm.showProductId
         }
         console.log(this.dataForm.taskModelId, 'this.dataForm.taskModelId')
         let res = await this.$http.get('/taskReliability/SimulatAssess/SchemeCompar', {params: params})
@@ -176,7 +169,6 @@
         this.seriesList = res.data.curveList
         this.tableData = res.data.dataList
 
-
         this.isShow = true
         this.option = {
           xAxis: {
@@ -184,7 +176,7 @@
             name: '浠跨湡鎬绘椂闀�',
             type: 'category',
             axisLabel: {
-              formatter: function(value) {
+              formatter: function (value) {
                 // 灏� X 杞村埢搴﹀�兼牸寮忓寲涓轰繚鐣欎袱浣嶅皬鏁扮殑瀛楃涓�
                 return parseFloat(value).toFixed(2);
               }

--
Gitblit v1.9.1