From 6bae24b32e3196f5e01d4a9fed62a4e51528b809 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期一, 19 八月 2024 08:58:28 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/taskReliability/SimulatHistory.vue | 10 +----
web/src/views/modules/taskReliability/SchemeCompar.vue | 10 +---
web/src/views/modules/taskReliability/SimulatAssess.vue | 54 ++++++++++++---------------
web/src/views/modules/taskReliability/SimulatCurve.vue | 4 +-
4 files changed, 31 insertions(+), 47 deletions(-)
diff --git a/web/src/views/modules/taskReliability/SchemeCompar.vue b/web/src/views/modules/taskReliability/SchemeCompar.vue
index 9666b44..bc088de 100644
--- a/web/src/views/modules/taskReliability/SchemeCompar.vue
+++ b/web/src/views/modules/taskReliability/SchemeCompar.vue
@@ -1,8 +1,7 @@
<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">
+ <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>
@@ -14,15 +13,14 @@
<zt-button @click="compair()">鏂规瀵规瘮</zt-button>
</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" :productId="dataForm.productId"/>
</div>
</el-col>
<el-col :span="20">
- <div style="margin-top: 20px;position: relative;height: 600px">
+ <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>
@@ -70,8 +68,6 @@
</div>
</div>
</el-col>
- </div>
- </div>
</el-row>
</div>
</template>
diff --git a/web/src/views/modules/taskReliability/SimulatAssess.vue b/web/src/views/modules/taskReliability/SimulatAssess.vue
index ebf7cdb..7697123 100644
--- a/web/src/views/modules/taskReliability/SimulatAssess.vue
+++ b/web/src/views/modules/taskReliability/SimulatAssess.vue
@@ -1,45 +1,39 @@
<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"/>
- </zt-form-item>
- <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">
- <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">
- <template slot="append">娆℃暟</template>
- </el-input>
- </zt-form-item>
- <zt-form-item>
- <zt-button @click="analyze()">浠跨湡鍒嗘瀽</zt-button>
- </zt-form-item>
- </el-form>
- <el-progress v-if="isShow" :percentage="percentage"></el-progress>
- <div>
+ <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"/>
+ </zt-form-item>
+ <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">
+ <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">
+ <template slot="append">娆℃暟</template>
+ </el-input>
+ </zt-form-item>
+ <zt-form-item>
+ <zt-button @click="analyze()">浠跨湡鍒嗘瀽</zt-button>
+ </zt-form-item>
+ </el-form>
+ <el-progress v-if="isShow" :percentage="percentage"></el-progress>
<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" :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>
diff --git a/web/src/views/modules/taskReliability/SimulatCurve.vue b/web/src/views/modules/taskReliability/SimulatCurve.vue
index 5b31c66..1ca6d67 100644
--- a/web/src/views/modules/taskReliability/SimulatCurve.vue
+++ b/web/src/views/modules/taskReliability/SimulatCurve.vue
@@ -17,7 +17,7 @@
mtbf: '',
msr: '',
myChart: {},
- myChartStyle: {float: "left", width: "100%", height: "600px"}, //鍥捐〃鏍峰紡
+ myChartStyle: {float: "left", width: "100%", height: "680px"}, //鍥捐〃鏍峰紡
option: {}
}
},
@@ -48,7 +48,7 @@
padding: 0,//[5,10] | [ 5,6, 7, 8] ,鏍囬鍐呰竟璺�
left: 'center',//'5' | '5%'锛宼itle 缁勪欢绂诲鍣ㄥ乏渚х殑璺濈
right: 'auto',//'title 缁勪欢绂诲鍣ㄥ彸渚х殑璺濈
- top: 'auto',//title 缁勪欢绂诲鍣ㄤ笂渚х殑璺濈
+ top: '20',//title 缁勪欢绂诲鍣ㄤ笂渚х殑璺濈
bottom: 'auto',//title 缁勪欢绂诲鍣ㄤ笅渚х殑璺濈
},
xAxis: {
diff --git a/web/src/views/modules/taskReliability/SimulatHistory.vue b/web/src/views/modules/taskReliability/SimulatHistory.vue
index f4c6bbd..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"/>
@@ -22,22 +21,17 @@
</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="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>
--
Gitblit v1.9.1