From c0e3f24edd2ef47339c676ff3dc6fdc06b3c387e Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 18 十月 2024 10:42:40 +0800
Subject: [PATCH] 1）修改bug：可靠性预计参数配置，可靠性分布类型下拉框缺少威布尔分布； 2）细化可靠性仿真评估报错信息。
---
web/src/views/modules/basicInfo/XhProductModel.vue | 67 +++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 17 deletions(-)
diff --git a/web/src/views/modules/basicInfo/XhProductModel.vue b/web/src/views/modules/basicInfo/XhProductModel.vue
index c5155b1..3673ff5 100644
--- a/web/src/views/modules/basicInfo/XhProductModel.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel.vue
@@ -12,7 +12,7 @@
<zt-table-wraper ref="tableObj" defaultNotQuery="true" query-url="/basicInfo/XhProductModel/page"
delete-url="/basicInfo/XhProductModel/ "
:paging='false'
- v-slot="{ table }">
+ v-slot="{ table }" @refreshMethod="refreshData('tree')">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
<el-input v-model="dataForm.name" placeholder="璇疯緭鍏ュ悕绉�" clearable></el-input>
@@ -20,7 +20,7 @@
<el-form-item>
<zt-button v-if="productType && productType!=='10'" type="query" @click="table.query()"/>
<zt-button v-if="productType && productType!=='10'" type="add" @click="add()"/>
- <zt-button v-if="productType==='1'" size="small" type="primary" @click="exportProduct()">瀵煎嚭妯℃澘
+ <zt-button v-if="productType==='1'" size="small" type="primary" @click="exportProduct()">涓嬭浇妯℃澘
</zt-button>
<zt-button v-if="productType==='3'" type="primary" @click="addCell()">鏂板铏氬崟鍏�</zt-button>
<zt-button v-if="productType && productType!=='10'" type="delete" @click="table.deleteHandle()"/>
@@ -30,7 +30,9 @@
row-key="id"
@selection-change="table.selectionChangeHandle"
:header-cell-style="{'text-align':'center'}">
+ <el-table-column type="selection" width="40" align="center"/>
<el-table-column prop="name" label="鍚嶇О"/>
+ <el-table-column v-if="productType==='3'|| productType==='4'" prop="equipType" label="璁惧绫诲瀷"/>
<zt-table-column-dict prop="productType" label="鑺傜偣绫诲瀷" dict="product"/>
<el-table-column prop="operatImg" label="杩愯鍥剧墖" align="center">
<template v-slot="{ row }">
@@ -38,18 +40,21 @@
</template>
</el-table-column>
<el-table-column prop="sort" label="鎺掑簭" width="100px" align="center"/>
- <zt-table-column-handle :table="table" width="180px">
+ <zt-table-column-handle :table="table" width="180px" >
<template v-slot="{ row }">
<zt-table-button v-if="productType==='1'" size="small" type="primary"
@click="importData(row)">瀵煎叆
+ </zt-table-button>
+ <zt-table-button v-if="productType==='1'" size="small" type="primary"
+ @click="exportData(row)">瀵煎嚭
</zt-table-button>
</template>
</zt-table-column-handle>
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
- <add-or-update @refreshDataList="refreshData" ref="AddOrUpdate"/>
- <select-ty-model @refreshDataList="refreshData" ref="SelectTyModel"/>
- <product-import @refreshDataList="refreshData" ref="ProductImport"/>
+ <add-or-update @refreshDataList="refreshData('product')" ref="AddOrUpdate"/>
+ <select-ty-model @refreshDataList="refreshData('tree')" ref="SelectTyModel"/>
+ <product-import @refreshDataList="refreshData('import')" ref="ProductImport"/>
</zt-table-wraper>
</div>
</el-col>
@@ -69,7 +74,8 @@
data() {
return {
url: `${window.SITE_CONFIG['apiURL']}/sysPictureBase/getSvgImage?token=${Cookies.get('token')}&id=`,
- productType: '',
+ shipId: '',
+ namePath:'',
dataForm: {
name: '',
type: '',
@@ -85,48 +91,75 @@
AddOrUpdate,
SelectTyModel
},
+ mounted() {
+ this.$refs.ProductModelTree.getProductList()
+ },
methods: {
add() {
this.dataForm.type = this.productType
+
if (this.dataForm.type !== '1') {
- this.$refs.SelectTyModel.$refs.dialog.init(null, {type: this.dataForm.type, id: this.dataForm.pid})
+ this.$refs.SelectTyModel.$refs.dialog.init(null, {
+ type: this.dataForm.type,
+ id: this.dataForm.pid,
+ shipId: this.shipId,
+ namePath: this.namePath
+ })
} else {
this.$refs.AddOrUpdate.$refs.dialog.init(null, {id: null, type: 'zt', pid: this.dataForm.pid})
}
},
addCell() {
- this.$refs.AddOrUpdate.$refs.dialog.init(null, {type: 10, pid: this.dataForm.pid})
+ this.$refs.AddOrUpdate.$refs.dialog.init(null, {
+ type: 10, pid: this.dataForm.pid, shipId: this.shipId
+ })
},
cellStyle({column}) {
if (column.label === '鍚嶇О') {
return 'text-align: left !important;'
}
},
- refreshData() {
- this.$refs.tableObj.query()
- this.$refs.ProductModelTree.getProductList()
+ refreshData(param) {
+ if (param === 'import') {
+ this.$refs.tableObj.query()
+ this.$refs.ProductModelTree.getProductList()
+ } else if (param === 'tree') {
+ this.$refs.ProductModelTree.getProductList()
+ } else {
+ this.$refs.tableObj.query()
+ }
},
onProductSelected(data) {
- console.log(data, 'onProductSelected')
+ this.shipId = data.shipId
this.dataForm.pid = data.id
this.dataForm.type = data.productType
this.productType = data.productType
+ this.namePath = data.namePath
+ console.log(data.namePath,'data.namePath')
if (data.productType !== '10') {
this.$refs.tableObj.query()
+ }else{
+ this.$alert("铏氬崟鍏冧笉鍙煡鐪�")
}
- console.log(data.productType, ' data.productType')
- console.log(this.productType, ' data.productType')
},
importData(row) {
this.$refs.ProductImport.$refs.dialog.init(row)
+ },
+ async exportData(row) {
+ let params = {
+ shipId:row.id
+ }
+ let res = await this.$http.get(`/basicInfo/XhProductModel/exportData`,{params:params})
+
+
},
exportProduct() {
window.location.href = './浜у搧缁撴瀯鏍戝鍏ユā鏉�.xlsx'
},
onDefault(defaultId) {
this.dataForm.pid = defaultId
- this.dataForm.type = 2
- this.productType = 2
+ this.dataForm.type = '1'
+ this.productType = '1'
this.$refs.tableObj.query()
},
}
--
Gitblit v1.9.1