From 3c2e46fef0e866901cbb5de889166b6fda748e5d Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期二, 22 十月 2024 14:39:09 +0800
Subject: [PATCH] 同类设备有多个的修改
---
web/src/views/modules/taskReliability/SimulatAssess.vue | 100 ++++++++++++++++++++++++++++++-------------------
1 files changed, 61 insertions(+), 39 deletions(-)
diff --git a/web/src/views/modules/taskReliability/SimulatAssess.vue b/web/src/views/modules/taskReliability/SimulatAssess.vue
index de4b44c..e957d47 100644
--- a/web/src/views/modules/taskReliability/SimulatAssess.vue
+++ b/web/src/views/modules/taskReliability/SimulatAssess.vue
@@ -1,46 +1,57 @@
<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"/>
+ 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>
+ <el-dialog :close-on-click-modal="false" :visible.sync="dialogVisible" title="妯″瀷妫�鏌�" width="60%" @close="dialogVisible = false">
+ <el-tag type="danger">妯″瀷瀹氫箟/鍙傛暟閰嶇疆閲屽瓨鍦ㄤ互涓嬮棶棰橈細</el-tag>
+ <el-table :data="modelCheckResult" height="100px" v-adaptive="{bottomOffset:30}"
+ :header-cell-style="{'text-align':'center'}">
+ <el-table-column prop="category" label="妫�鏌ョ粨鏋�" align="center" width="150"/>
+ <el-table-column prop="taskName" label="浠诲姟鍚嶇О" align="center"/>
+ <el-table-column prop="taskPhaseName" label="浠诲姟闃舵鍚嶇О" align="center"/>
+ <el-table-column prop="gkName" label="宸ュ喌鍚嶇О" align="center"/>
+ <el-table-column prop="nodeName" label="鑺傜偣鍚嶇О" align="center"/>
+ <el-table-column prop="modelName" label="妯″瀷鍚嶇О" align="center"/>
+ <el-table-column prop="deviceName" label="璁惧鍚嶇О" align="center"/>
+ <el-table-column prop="paramName" label="鍙傛暟鍚嶇О" align="center"/>
+ </el-table>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="dialogVisible = false">鍏� 闂�</el-button>
+ </div>
+ </el-dialog>
</div>
</template>
@@ -67,10 +78,12 @@
showProductId: '',
taskModelId: '',
dataType: 'fz',
- samplPeriod: '',
- simulatFrequency: '',
- simulatTime: ''
- }
+ samplPeriod: '10',
+ simulatFrequency: 500,
+ simulatTime: '',
+ },
+ dialogVisible: false,
+ modelCheckResult: [],
}
},
mounted() {
@@ -102,6 +115,9 @@
console.log(data, ' onProductSelected(data)')
this.dataForm.productId = data.id
this.getTaskList()
+ this.$nextTick(() => {
+ this.$refs.ProductModelTree.getProductList()
+ })
},
onTaskSelected(data) {
console.log(data, ' onProductSelected(data)')
@@ -110,6 +126,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 = {
@@ -120,12 +137,9 @@
this.taskList = res.data
},
getStroke() {
- //console.log('getStroke:',this.progress.start,"锛�",this.progress.speed)
if (this.percentage < 100) {
- //console.log('getStroke2')
this.$http.get(`/taskReliability/SimulatAssess/getCalcProgress?taskId=${this.dataForm.id}`).then(
res => {
- // console.log(res.data, 'res.data')
if (res.data) {
this.percentage = parseFloat(res.data)
}
@@ -137,12 +151,20 @@
}
},
async analyze() {
+ this.dialogVisible = false
+ this.modelCheckResult = []
this.isShow = true
let result = await this.$http.get(`/basicInfo/TyProductModel/getUuid`)
this.dataForm.id = result.data
let res = await this.$http.post('/taskReliability/SimulatAssess/analyze', this.dataForm)
if (res.success) {
- this.timers = window.setInterval(this.getStroke, 1000)
+ console.log(res.data)
+ if (res.data != null && res.data.length > 0) {
+ this.modelCheckResult = res.data
+ this.dialogVisible = true
+ } else {
+ this.timers = window.setInterval(this.getStroke, 1000)
+ }
}
}
}
--
Gitblit v1.9.1