From 48dcf2c7f01de5078f6a7f94dbc59400100e9ab6 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 23 十月 2024 11:05:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/basicInfo/TyProductModel-AddOrUpdate.vue | 101 ++++++++++++++++++++++++--------------------------
1 files changed, 49 insertions(+), 52 deletions(-)
diff --git a/web/src/views/modules/basicInfo/TyProductModel-AddOrUpdate.vue b/web/src/views/modules/basicInfo/TyProductModel-AddOrUpdate.vue
index 8904e43..ea08f92 100644
--- a/web/src/views/modules/basicInfo/TyProductModel-AddOrUpdate.vue
+++ b/web/src/views/modules/basicInfo/TyProductModel-AddOrUpdate.vue
@@ -1,14 +1,14 @@
<template>
- <zt-dialog ref="dialog" @confirm="formSubmit" append-to-body>
+ <zt-dialog ref="dialog" append-to-body @confirm="formSubmit" :hasConfirm="true">
<el-form :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="120px">
- <zt-form-item label="涓婄骇绯荤粺" prop="pid" >
- <zt-select v-model="dataForm.pid" placeholder=" " :datas="productList"/>
+ <zt-form-item label="涓婄骇鑺傜偣" prop="pid">
+ <zt-select v-model="dataForm.pid" placeholder=" " :datas="productList" @input="selectDefaultProduct"/>
</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 label="鑺傜偣绫诲瀷" prop="nodeType" rules="required">
- <zt-dict v-model="dataForm.nodeType" dict="product"></zt-dict>
+ <zt-dict v-model="dataForm.nodeType" dict="product" @input="getDefaultImg"></zt-dict>
</zt-form-item>
<zt-form-item label="鍩烘湰璁＄畻" prop="baseCompute">
<zt-dict v-model="dataForm.baseCompute" dict="is_or_not" placeholder="鍩烘湰璁＄畻"></zt-dict>
@@ -22,14 +22,9 @@
<zt-form-item label="缁翠慨鍒嗗竷" prop="repairDistrib">
<zt-dict v-model="dataForm.repairDistrib" dict="RepairDistribType" placeholder="璇烽�夋嫨缁翠慨鍒嗗竷绫诲瀷"></zt-dict>
</zt-form-item>
- <zt-form-item label="杩愯鐘舵�佸浘" prop="operationalStatus">
- <el-input v-model="dataForm.operationalStatus" @focus="selectPicture('operational')" :readonly="readonly"></el-input>
- </zt-form-item>
- <zt-form-item label="寰呮満鐘舵�佸浘" prop="standbyState">
- <el-input v-model="dataForm.standbyState" @focus="selectPicture('standby')" :readonly="readonly"></el-input>
- </zt-form-item>
- <zt-form-item label="鏁呴殰鐘舵�佸浘" prop="faultState">
- <el-input v-model="dataForm.faultState" @focus="selectPicture('fault')" :readonly="readonly"></el-input>
+ <zt-form-item label="杩愯鍥剧墖" prop="operatImg">
+ <el-input v-model="dataForm.operatImgName" @focus="selectPicture()" :readonly="readonly"></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>
@@ -42,13 +37,15 @@
<script>
import PictureSelect from "@/views/modules/basicInfo/SelectPicture";
+ import Cookies from "js-cookie";
export default {
+ name: 'TyProductModel',
data() {
return {
- map: new Map(),
- fileId:'',
- productList:[],
+ url: `${window.SITE_CONFIG['apiURL']}/sysPictureBase/getSvgImage?token=${Cookies.get('token')}&id=`,
+ fileId: '',
+ productList: [],
dataForm: {
id: '',
pid: '',
@@ -58,56 +55,44 @@
taskCompute: '',
reliabDistrib: '',
repairDistrib: '',
- operationalStatus:'',
- standbyState:'',
- faultState:'',
+ operatImg: '',
+ operatImgName: '',
sort: '',
}
}
},
- components:{
+ components: {
PictureSelect
},
methods: {
init() {
this.getProductList()
},
+ selectDefaultProduct() {
+ this.dataForm.nodeType = 5
+ this.getDefaultImg(this.dataForm.nodeType)
+ },
// 鑾峰彇绯荤粺鍒楄〃
async getProductList() {
let res = await this.$http.get('/basicInfo/TyProductModel/getProductList')
this.productList = res.data
- console.log(this.productList,'getProductList')
+ console.log(this.productList, 'getProductList')
},
- selectPicture(type){
- this.$refs.pictureSelect.$refs.dialog.init(type)
+ selectPicture() {
+ this.$refs.pictureSelect.$refs.dialog.init(this.dataForm.nodeType)
},
- openAddWin(row,type){
- console.log(type,'openAddWin(row)')
- if (type==='operational'){
- this.dataForm.operationalStatus = row.name
- for (let key in row.accessoryMap) {
- let id = /_zt_oss_id=(\d+)/.exec(key)
- this.fileId = id ? id[1] : ''
- }
- this.map.set(this.dataForm.operationalStatus,this.fileId);
- console.log(this.map,'openAddWin(row)')
- }else if(type==='standby'){
- this.dataForm.standbyState = row.name
- for (let key in row.accessoryMap) {
- let id = /_zt_oss_id=(\d+)/.exec(key)
- this.fileId = id ? id[1] : ''
- }
- this.map.set(this.dataForm.standbyState,this.fileId);
- console.log(this.map,'openAddWin(row)')
- }else if(type==='fault'){
- this.dataForm.faultState = row.name
- for (let key in row.accessoryMap) {
- let id = /_zt_oss_id=(\d+)/.exec(key)
- this.fileId = id ? id[1] : ''
- }
- this.map.set(this.dataForm.faultState,this.fileId);
- console.log(this.map,'openAddWin(row)')
+ openAddWin(row) {
+ this.dataForm.operatImgName = row.name
+ this.dataForm.operatImg = row.id
+ console.log(row, 'openAddWin(row)')
+ },
+ async getDefaultImg(selected) {
+ let params = {
+ productType: selected
}
+ let res = await this.$http.get(`/sysPictureBase/getDefaultImg`, {params: params})
+ this.dataForm.operatImgName = res.data.name
+ this.dataForm.operatImg = res.data.id
},
// 鑾峰彇淇℃伅
async getInfo() {
@@ -116,13 +101,25 @@
...this.dataForm,
...res.data
}
- console.log(this.map,'getInfo')
+ if (this.dataForm.pid == null) {
+ this.dataForm.pid = ''
+ }
+ if (this.dataForm.baseCompute == null) {
+ this.dataForm.baseCompute = ''
+ }
+ if (this.dataForm.taskCompute == null) {
+ this.dataForm.taskCompute = ''
+ }
+ if (this.dataForm.reliabDistrib == null) {
+ this.dataForm.reliabDistrib = ''
+ }
+ if (this.dataForm.repairDistrib == null) {
+ this.dataForm.repairDistrib = ''
+ }
+ console.log(this.dataForm, 'this.dataForm')
},
// 琛ㄥ崟鎻愪氦
async formSubmit() {
- this.dataForm.operationalStatus = this.map.get(this.dataForm.operationalStatus)
- this.dataForm.standbyState = this.map.get(this.dataForm.standbyState)
- this.dataForm.faultState = this.map.get(this.dataForm.faultState)
let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/basicInfo/TyProductModel/', this.dataForm)
if (res.success) {
await this.$tip.success()
--
Gitblit v1.9.1