From d443433fa03a966b6674091bebe469b8c2483bb0 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 29 十一月 2024 16:51:39 +0800
Subject: [PATCH] fix:1129 端口调整成必填；增加区域的图片如果已经定义返回定义的图片
---
src/components/equ-add-form.vue | 6 +++---
src/components/add-area-item.vue | 30 +++++++++++++++++++++++++++++-
2 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/src/components/add-area-item.vue b/src/components/add-area-item.vue
index 626f48a..187fe7d 100644
--- a/src/components/add-area-item.vue
+++ b/src/components/add-area-item.vue
@@ -9,7 +9,7 @@
<div class="flex m-t-2rem">
<div class="label require">区域编号:</div>
- <el-select v-model="areacode" placeholder="请选择区域编号" width="28rem">
+ <el-select v-model="areacode" placeholder="请选择区域编号" width="28rem" @change="handleAreaCodeChange">
<el-option
v-for="item in areaCodes"
:key="item.id"
@@ -238,6 +238,34 @@
this.areaCodes = res.cabinetList || [];
});
},
+ handleAreaCodeChange(selectedAreaCode) {
+ const selectedArea = this.areaCodes.find(area => area.id === selectedAreaCode);
+ if (selectedArea && selectedArea.areaConfigNum !== undefined) {
+ this.areaConfigNum = selectedArea.areaConfigNum;
+ } else {
+ this.areaConfigNum = 500; // 使用默认值
+ }
+ if (selectedArea && selectedArea.areaBackGroudName !== undefined && selectedArea.areaBackGroudURL !== undefined) {
+ // 检查返回的数据是否为空
+ if (selectedArea.areaBackGroudName && selectedArea.areaBackGroudURL) {
+ var fileInfo2 = {
+ name: selectedArea.areaBackGroudName,
+ };
+ // 创建一个新的数组并替换旧的数组
+ this.fileList2 = [fileInfo2];
+ console.log("this.fileList2[0]", this.fileList2[0]);
+ this.areaBackGroudURL = selectedArea.areaBackGroudURL;
+ } else {
+ // 如果返回的数据为空，清空 fileList2
+ this.fileList2 = [];
+ console.log("No background info available");
+ }
+ } else {
+ // 如果 selectedArea 不存在或没有背景信息，清空 fileList2
+ this.fileList2 = [];
+ console.log("No background info available");
+ }
+ },
},
watch: {},
diff --git a/src/components/equ-add-form.vue b/src/components/equ-add-form.vue
index d9de8c2..8613c6b 100644
--- a/src/components/equ-add-form.vue
+++ b/src/components/equ-add-form.vue
@@ -86,7 +86,7 @@
/>
</div>
<div class="flex m-t-2rem">
- <div class="label ">端口:</div>
+ <div class="label require">端口:</div>
<input
class="value input"
v-model="port"
@@ -222,11 +222,11 @@
},
async submit() {
//todo 提交设备
- if (!this.isValidIP(this.ipAddress)) {
+ if (this.ipAddress && !this.isValidIP(this.ipAddress)) {
this.$message.warning("请输入有效的IP地址");
return;
}
- if (!this.name || !this.selectcode || !this.cabinetName || !this.networkPort) {
+ if (!this.name || !this.selectcode || !this.cabinetName || !this.networkPort || !this.port ) {
this.$message.warning("数据未填写完整");
return;
}
--
Gitblit v1.9.3