From 19beea5d5dc165efb0feca7c4c0a296819010178 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 04 十二月 2024 11:16:17 +0800
Subject: [PATCH] 修改bug：传给仿真算法包的modelId重复。（将工况ID改为阶段模型ID）
---
web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue | 73 +++++++++++++++++++++++-------------
1 files changed, 47 insertions(+), 26 deletions(-)
diff --git a/web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue b/web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue
index e0f2b52..397b3a9 100644
--- a/web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel-AddOrUpdate.vue
@@ -1,22 +1,25 @@
<template>
- <zt-dialog ref="dialog" @confirm="formSubmit">
+ <zt-dialog ref="dialog" @confirm="formSubmit" :hasConfirm="true">
<el-form :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="120px">
- <zt-form-item label="涓婄骇绯荤粺" prop="pid" v-if="isTree">
+ <zt-form-item label="涓婄骇鑺傜偣" prop="pid" v-if="isShow">
<zt-combo-tree v-model="dataForm.pid" :datas="productList"/>
</zt-form-item>
<zt-form-item label="鍚嶇О" prop="name" rules="required">
<el-input v-model="dataForm.name"></el-input>
</zt-form-item>
+ <zt-form-item v-if="dataForm.productType==='5'||dataForm.productType===5" prop="equipType" label="璁惧绫诲瀷">
+ <el-input v-model="dataForm.equipType"></el-input>
+ </zt-form-item>
<zt-form-item label="鑺傜偣绫诲瀷" prop="productType" rules="required">
- <zt-dict v-model="dataForm.productType" dict="product" @input="getDefaultImg"
+ <zt-dict v-model="dataForm.productType" dict="product" @input="changeType"
:disabled="disabled"></zt-dict>
</zt-form-item>
- <zt-form-item label="杩愯鐘舵�佸浘" prop="operatImg" v-if="isShow">
+ <zt-form-item v-if="dataForm.productType!=='1'" label="杩愯鐘舵�佸浘" prop="operatImg">
<el-input v-model="dataForm.operatImgName" @focus="selectPicture()"></el-input>
<el-image v-if="dataForm.operatImg" :src="url+dataForm.operatImg" style="height: 50px;width: 50px"></el-image>
</zt-form-item>
<zt-form-item label="鎺掑簭" prop="sort">
- <el-input v-model="dataForm.sort" :readonly="readonly"></el-input>
+ <el-input v-model="dataForm.sort" readonly="false"></el-input>
</zt-form-item>
</el-form>
<PictureSelect ref="pictureSelect" @setPicture="openAddWin">
@@ -32,8 +35,7 @@
data() {
return {
disabled: false,
- url: `${window.SITE_CONFIG['apiURL']}/sysPictureBase/getProductImg?token=${Cookies.get('token')}&id=`,
- isTree: false,
+ url: `${window.SITE_CONFIG['apiURL']}/sysPictureBase/getSvgImage?token=${Cookies.get('token')}&id=`,
isShow: true,
fileId: '',
productList: [],
@@ -41,10 +43,13 @@
id: '',
pid: '',
name: '',
+ shipId: '',
productType: '',
operatImg: '',
operatImgName: '',
sort: '',
+ equipType: '',
+ namePath:'',
status: ''
}
}
@@ -54,24 +59,45 @@
},
methods: {
init(id, params) {
- if (params.type === 'tree') {
- this.isTree = true
+ console.log(params)
+ if (params.shipId) {
+ this.dataForm.shipId = params.shipId
+ }
+ if (params.type === 'xh') {
this.isShow = false
- this.getProductList()
+ this.dataForm.pid = null
+ this.dataForm.productType = '1'
+ this.getDefaultImg(this.dataForm.productType)
+ } else if (params.type === 'zt') {
+ this.dataForm.pid = params.pid
+ this.dataForm.productType = '2'
+ this.getDefaultImg(this.dataForm.productType)
} else {
this.dataForm.pid = params.pid
- this.dataForm.productType = params.type
- }
- if (this.dataForm.productType === 10 && id == null) {
+ this.dataForm.productType = parseInt(params.productType)
+ this.dataForm.namePath= params.namePath
this.getDefaultImg(this.dataForm.productType)
}
- this.disabled = !!id;
+ if (this.dataForm.productType === '10' && id == null) {
+ this.isShow = false
+ this.getDefaultImg(this.dataForm.productType)
+ }
+ this.getProductList()
},
// 鑾峰彇绯荤粺鍒楄〃
async getProductList() {
- let res = await this.$http.get('/basicInfo/XhProductModel/getProductList')
+ let params = {
+ productType: this.dataForm.productType,
+ shipId: this.dataForm.shipId
+ }
+ let res = await this.$http.get('/basicInfo/XhProductModel/getProductList', {params: params})
this.productList = res.data
console.log(this.productList, 'getProductList')
+ },
+ changeType(selected) {
+ this.dataForm.productType = selected
+ this.getDefaultImg(selected)
+ this.getProductList()
},
async getDefaultImg(selected) {
console.log(selected, 'async getDefaultImg')
@@ -79,8 +105,10 @@
productType: selected
}
let res = await this.$http.get(`/sysPictureBase/getDefaultImg`, {params: params})
- this.dataForm.operatImgName = res.data.name
- this.dataForm.operatImg = res.data.id
+ if (res.data) {
+ this.dataForm.operatImgName = res.data.name
+ this.dataForm.operatImg = res.data.id
+ }
},
selectPicture() {
this.$refs.pictureSelect.$refs.dialog.init(this.dataForm.productType)
@@ -101,18 +129,12 @@
// 琛ㄥ崟鎻愪氦
async formSubmit() {
let flag = true
- if (this.isTree) {
- if (this.dataForm.productType !== '5' || this.dataForm.productType !== '4') {
- this.$alert("涓嶆敮鎸佹柊澧炴鑺傜偣")
- flag = false
- }
- } else {
- if (this.dataForm.productType === '5' || this.dataForm.productType === '4') {
+ if (this.isShow) {
+ if (this.dataForm.productType === '1') {
this.$alert("涓嶆敮鎸佹柊澧炴鑺傜偣")
flag = false
}
}
-
if (!flag) {
return
}
@@ -121,7 +143,6 @@
await this.$tip.success()
this.$refs.dialog.close()
this.$emit('refreshDataList')
- this.map.clear()
}
}
}
--
Gitblit v1.9.1