From 413eae5cb4d5fe78fc25258bf7b5e3b53740b1f9 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 24 七月 2024 11:08:01 +0800
Subject: [PATCH] 1）新增仿真时模型及参数完整性检查 2）增加调用算法库后端接口
---
web/src/views/modules/basicInfo/XhProductModel.vue | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/web/src/views/modules/basicInfo/XhProductModel.vue b/web/src/views/modules/basicInfo/XhProductModel.vue
index 640b5b5..c5155b1 100644
--- a/web/src/views/modules/basicInfo/XhProductModel.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel.vue
@@ -3,7 +3,8 @@
<el-row :gutter="5">
<el-col :span="5">
<div class="fa-card-a" style="margin-right: 5px;height: calc(100vh - 123px)">
- <product-model-tree @on-selected="onProductSelected" showXdy="true" ref="ProductModelTree"/>
+ <product-model-tree @on-selected="onProductSelected" @on-default="onDefault" showXdy="true"
+ ref="ProductModelTree"/>
</div>
</el-col>
<el-col :span="19">
@@ -19,6 +20,8 @@
<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>
<zt-button v-if="productType==='3'" type="primary" @click="addCell()">鏂板铏氬崟鍏�</zt-button>
<zt-button v-if="productType && productType!=='10'" type="delete" @click="table.deleteHandle()"/>
</el-form-item>
@@ -26,7 +29,7 @@
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:30}"
row-key="id"
@selection-change="table.selectionChangeHandle"
- >
+ :header-cell-style="{'text-align':'center'}">
<el-table-column prop="name" label="鍚嶇О"/>
<zt-table-column-dict prop="productType" label="鑺傜偣绫诲瀷" dict="product"/>
<el-table-column prop="operatImg" label="杩愯鍥剧墖" align="center">
@@ -34,10 +37,10 @@
<el-image v-if="row.operatImg" :src="url+row.operatImg" style="height: 50px;width: 50px"></el-image>
</template>
</el-table-column>
- <el-table-column prop="sort" label="鎺掑簭" width="100px"/>
+ <el-table-column prop="sort" label="鎺掑簭" width="100px" align="center"/>
<zt-table-column-handle :table="table" width="180px">
<template v-slot="{ row }">
- <zt-table-button v-if="productType==='5'" size="small" type="primary"
+ <zt-table-button v-if="productType==='1'" size="small" type="primary"
@click="importData(row)">瀵煎叆
</zt-table-button>
</template>
@@ -46,7 +49,7 @@
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<add-or-update @refreshDataList="refreshData" ref="AddOrUpdate"/>
<select-ty-model @refreshDataList="refreshData" ref="SelectTyModel"/>
- <product-import @refreshDataList="refreshData" ref="ProductImport" />
+ <product-import @refreshDataList="refreshData" ref="ProductImport"/>
</zt-table-wraper>
</div>
</el-col>
@@ -85,15 +88,7 @@
methods: {
add() {
this.dataForm.type = this.productType
- if (this.dataForm.type !== '5') {
- if (this.dataForm.type !== '3') {
- this.dataForm.type = this.dataForm.type - 1
- } else if (this.dataForm.type === '3') {
- this.dataForm.type = this.dataForm.type - 2
- } else if (this.dataForm.type === '0') {
- this.$alert("褰撳墠鑺傜偣涓嶅彲鏂板瀛愯妭鐐癸紝璇烽噸鏂拌缃�")
- return
- }
+ if (this.dataForm.type !== '1') {
this.$refs.SelectTyModel.$refs.dialog.init(null, {type: this.dataForm.type, id: this.dataForm.pid})
} else {
this.$refs.AddOrUpdate.$refs.dialog.init(null, {id: null, type: 'zt', pid: this.dataForm.pid})
@@ -112,17 +107,28 @@
this.$refs.ProductModelTree.getProductList()
},
onProductSelected(data) {
- console.log(data)
+ console.log(data, 'onProductSelected')
this.dataForm.pid = data.id
this.dataForm.type = data.productType
this.productType = data.productType
if (data.productType !== '10') {
this.$refs.tableObj.query()
}
+ console.log(data.productType, ' data.productType')
+ console.log(this.productType, ' data.productType')
},
importData(row) {
- this.$refs.ProductImport.$refs.dialog.init(row.id)
- }
+ this.$refs.ProductImport.$refs.dialog.init(row)
+ },
+ exportProduct() {
+ window.location.href = './浜у搧缁撴瀯鏍戝鍏ユā鏉�.xlsx'
+ },
+ onDefault(defaultId) {
+ this.dataForm.pid = defaultId
+ this.dataForm.type = 2
+ this.productType = 2
+ this.$refs.tableObj.query()
+ },
}
}
</script>
--
Gitblit v1.9.1