From 76dfeb3d0d27ffd13a0d6d23c4d5cae736a5f8b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=B7=E5=86=89=E5=86=89?= Date: Thu, 29 Jan 2026 18:04:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=85=B3=E8=81=94=E5=80=BC=E6=98=BE=E9=9A=90=E6=97=B6?= =?UTF-8?q?=E6=B8=85=E9=99=A4=E6=A0=A1=E9=AA=8C=E6=8F=90=E7=A4=BA=E3=80=81?= =?UTF-8?q?=E7=BD=91=E5=8D=A1=E6=B5=81=E9=87=8F=E5=9B=BE=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1、消息推送表单关联值显隐时清除校验提示 2、优化自定义下拉中下拉框状态切换的内容展示 3、出省流量统计为空时，添加暂无数据提示 4、优化并修改bug --- src/components/customModule/selectModule.vue | 29 ++++++++++++------- src/views/resource/messagePush/details.vue | 11 +++++-- .../monitorBoard/monitorBoardView.vue | 5 ++-- src/views/resource/serverRegister/details.vue | 6 ++-- .../resource/serverRegister/flowForm.vue | 11 +++++-- 5 files changed, 43 insertions(+), 19 deletions(-) diff --git a/src/components/customModule/selectModule.vue b/src/components/customModule/selectModule.vue index 84669cd..ed2b9af 100644 --- a/src/components/customModule/selectModule.vue +++ b/src/components/customModule/selectModule.vue @@ -166,6 +166,7 @@ type: String, default: '100%' }, + // 是否多选 multiple: { type: Boolean, default: false @@ -346,6 +347,10 @@ // 选项点击事件 handleOptionClick(value) { + // 如果选中的选项为正在编辑的选项，则阻止选中 + if (this.editingItem && this.editingItem === value) { + return; + } if (this.multiple) { if (this.editingItem) { return; @@ -375,17 +380,18 @@ // 开始编辑 startEdit(item) { - this.editingItem = item.value; - this.tempEditValue = item.label; - - // // 下一个tick聚焦到输入框 - this.$nextTick(() => { - if (this.$refs.editInputRef) { - if (this.$refs.editInputRef.length > 0) { - this.$refs.editInputRef[0].focus(); + setTimeout(() => { + this.editingItem = item.value; + this.tempEditValue = item.label; + // // 下一个tick聚焦到输入框 + this.$nextTick(() => { + if (this.$refs.editInputRef) { + if (this.$refs.editInputRef.length > 0) { + this.$refs.editInputRef[0].focus(); + } } - } - }); + }); + },300); }, // 取消编辑 @@ -732,4 +738,7 @@ line-height: 35px!important; border: none!important; } + ::v-deep .el-input__suffix .el-icon-circle-check { + display: none!important; + } diff --git a/src/views/resource/messagePush/details.vue b/src/views/resource/messagePush/details.vue index c525633..d6aac5b 100644 --- a/src/views/resource/messagePush/details.vue +++ b/src/views/resource/messagePush/details.vue @@ -1,6 +1,6 @@ @@ -80,6 +80,7 @@ }); break; case 'pushMethod': + this.ruleForm = Object.assign({}, this.ruleForm, this.$refs.formRef.$refs.ruleForm.model); if (dataVal === '1') { this.formList[0].controls.pushAddress['hidden'] = false; this.formList[0].controls.contactPhones['required'] = false; @@ -87,8 +88,14 @@ this.formList[0].controls.pushAddress['hidden'] = true; this.formList[0].controls.contactPhones['required'] = true; } + // 1. 获取表单引用 + const formRef = this.$refs.formRef; + // 2. 先清除所有表单校验 + if (formRef && formRef.$refs.ruleForm) { + formRef.$refs.ruleForm.clearValidate(); // 清除校验提示 + } // 强制更新表单 - this.$set(this.ruleForm, 'updateFormVal', Date.now()); + // this.$set(this.ruleForm, 'updateFormVal', Date.now()); break; case 'cancel': this.$router.push("/resource/messagePush"); diff --git a/src/views/resource/monitorBoard/monitorBoardView.vue b/src/views/resource/monitorBoard/monitorBoardView.vue index 0dcf63e..9728f07 100644 --- a/src/views/resource/monitorBoard/monitorBoardView.vue +++ b/src/views/resource/monitorBoard/monitorBoardView.vue @@ -347,7 +347,6 @@ fnConfigName(groupId) { monitorConfigList({groupId: groupId}).then(res => { if (res && res.data) { - this.configModel = ''; this.configNameList = res && res.data; let index = 0; res && res.data.forEach(item => { @@ -357,8 +356,8 @@ }); if (index === 0 && this.configNameList.length > 0) { this.configModel = this.configNameList[0].id; - this.fnChartView(); } + this.fnChartView(); } }); }, @@ -398,6 +397,7 @@ delMonitorConfig(this.reserveForm.id).then(res => { this.reserveForm = {}; this.lineDataParams = {}; + this.configModel = ''; this.fnConfigName(this.groupData); }); }).catch(() => {}); @@ -415,6 +415,7 @@ // 分组 fnGroupChange(val) { // this.groupData + this.configModel = ''; this.fnConfigName(val); }, addMonitor() { diff --git a/src/views/resource/serverRegister/details.vue b/src/views/resource/serverRegister/details.vue index 73298c2..80e4bda 100644 --- a/src/views/resource/serverRegister/details.vue +++ b/src/views/resource/serverRegister/details.vue @@ -129,7 +129,7 @@ {name: '带宽', num: 0, unit: 'Mbps', imgUrl: bandWImg}, {name: 'CPU', num: 0, unit: '核', imgUrl: cpuImg}, {name: '内存', num: 0, unit: 'G', imgUrl: memoryImg}, - {name: '磁盘容量', num: 0, unit: 'GB', imgUrl: diskSizeImg}, + {name: '磁盘容量(HDD)', num: 0, unit: 'GB', imgUrl: diskSizeImg}, ], activeName: '网卡流量监控', echartList: {}, @@ -547,7 +547,9 @@ // 网卡流量监控 async fnNetChartList(keyVal, time, interCardName, onlyInterCard) { if (onlyInterCard) { - this.mapDataList[keyVal]['网卡信息'].echartList = [this.mapDataList[keyVal]['网卡信息'].echartList[0]]; + if (!this.interCartList[interCardName].businessFlag) { + this.mapDataList[keyVal]['网卡信息'].echartList = [this.mapDataList[keyVal]['网卡信息'].echartList[0],this.mapDataList[keyVal]['网卡信息'].echartList[1]]; + } if (await this.getNetEcharts(time, keyVal, '网卡信息', interCardName)) { if (await this.getNetPingDropCharts(time, keyVal, '网卡信息', interCardName)) { if (this.interCartList[interCardName].businessFlag) { diff --git a/src/views/resource/serverRegister/flowForm.vue b/src/views/resource/serverRegister/flowForm.vue index b2df1e3..a55c6ad 100644 --- a/src/views/resource/serverRegister/flowForm.vue +++ b/src/views/resource/serverRegister/flowForm.vue @@ -30,9 +30,14 @@
出省流量统计 -
-
- 
{{item.description}}
+
+ +
+ 
{{item.description}}
+
+ +
+ 暂无数据