From 0091dd076ed7d6dfb06fa820dabd9cf5e738514c Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期四, 07 十一月 2024 17:15:13 +0800
Subject: [PATCH] 仿真评估检查模型时，总体工况模型里未使用的节点，不检查其模型是否存在。
---
web/src/views/modules/taskReliability/ModelRbd.vue | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/web/src/views/modules/taskReliability/ModelRbd.vue b/web/src/views/modules/taskReliability/ModelRbd.vue
index 78293e4..62e621e 100644
--- a/web/src/views/modules/taskReliability/ModelRbd.vue
+++ b/web/src/views/modules/taskReliability/ModelRbd.vue
@@ -1,13 +1,13 @@
<template>
<div>
- <el-row :gutter="20">
+ <el-row :gutter="5">
<el-col :span="5">
- <div class="fa-card-a">
- <product-model-tree @on-selected="onProductSelected"/>
+ <div class="fa-card-a" style="margin-right: 5px;height: calc(100vh - 123px)">
+ <product-model-tree ref="ProductModelTree" @on-selected="onProductSelected" @on-default="onDefault" showXdy="true" :isShow="false"/>
</div>
</el-col>
<el-col :span="19">
- <div class="mod-taskReliability-modelRbd}">
+ <div class="mod-taskReliability-modelRbd fa-card-a" style="margin-left: 5px;">
<zt-table-wraper ref="tableObj" defaultNotQuery="true" query-url="/taskReliability/ModelRbd/page"
delete-url="/taskReliability/ModelRbd/"
:paging='false'
@@ -20,19 +20,20 @@
<el-input v-model="dataForm.modelTag" placeholder="璇疯緭鍏ユā鍨嬫爣璇�" clearable></el-input>
</el-form-item>
<el-form-item>
- <zt-button type="query" @click="table.query()"/>
- <zt-button type="add" @click="add()"/>
- <zt-button type="delete" @click="table.deleteHandle()"/>
+ <zt-button v-if="dataForm.productId" type="query" @click="table.query()"/>
+ <zt-button v-if="dataForm.productId" type="add" @click="add()"/>
+ <zt-button v-if="dataForm.productId" type="delete" @click="table.deleteHandle()"/>
</el-form-item>
</el-form>
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:30}"
- border @selection-change="table.selectionChangeHandle">
+ border @selection-change="table.selectionChangeHandle"
+ :header-cell-style="{'text-align':'center'}">
<el-table-column type="selection" width="40" align="center"/>
<el-table-column prop="modelName" label="妯″瀷鍚嶇О"/>
<el-table-column prop="modelTag" label="妯″瀷鏍囪瘑"/>
- <el-table-column prop="citedNum" label="琚紩鐢ㄦ暟"/>
+ <el-table-column prop="quoteNum" label="琚紩鐢ㄦ暟" align="center"/>
<el-table-column prop="modelState" label="妯″瀷鐘舵��" align="center"/>
- <el-table-column prop="modelDataState" label="妯″瀷鏁版嵁鐘舵��" align="center"/>
+ <!-- <el-table-column prop="modelDataState" label="妯″瀷鏁版嵁鐘舵��" align="center"/>-->
<el-table-column prop="remark" label="澶囨敞"/>
<zt-table-column-handle :table="table"
delete-perm="taskReliability::delete" :has-view="false" width="180px">
@@ -43,8 +44,8 @@
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<add-or-update @refreshDataList="table.query" ref="AddOrUpdate"/>
- <el-dialog v-dialogDrag title="妯″瀷璁捐" top="1vh" width='95%' :visible.sync="dialogVisible2" v-if="dialogVisible2">
- <RBDEditImg ref="rbdEditImg"></RBDEditImg>
+ <el-dialog v-dialogDrag :title="title" top="1vh" width='95%' :visible.sync="dialogVisible2" v-if="dialogVisible2">
+ <RBDEditImg ref="rbdEditImg" @refreshDataList="table.query"></RBDEditImg>
</el-dialog>
</zt-table-wraper>
</div>
@@ -62,16 +63,18 @@
data() {
return {
dialogVisible2: false,
+ title:'',
dataForm: {
modelName: '',
modelState:'',
productId: '',
modelTag: '',
+ shipId: '',
}
}
},
mounted() {
-
+ this.$refs.ProductModelTree.getProductList()
},
components: {
ProductModelTree,
@@ -80,15 +83,21 @@
},
methods: {
add() {
- this.$refs.AddOrUpdate.$refs.dialog.init(null, this.dataForm.productId)
+ this.$refs.AddOrUpdate.$refs.dialog.init(null, {productId:this.dataForm.productId,shipId:this.dataForm.shipId})
},
onProductSelected(data) {
this.dataForm.productId = data.id
+ this.dataForm.shipId = data.shipId
console.log(data, 'onProductSelected(data)')
+ this.$refs.tableObj.query()
+ },
+ onDefault(defaultId){
+ this.dataForm.productId = defaultId
this.$refs.tableObj.query()
},
drawRBD(row) {
this.dialogVisible2 = true
+ this.title=row.modelName + '妯″瀷璁捐'
this.$nextTick(() => {
this.$refs.rbdEditImg.init(row)
})
--
Gitblit v1.9.1