From 53bc8cc8fd330d5e2a4a3698967548a0b74a395a Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期五, 23 十月 2026 18:09:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/CNAS/resourceDemand/device/component/management.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/management.vue b/src/views/CNAS/resourceDemand/device/component/management.vue
index 0db1429..c7841f3 100644
--- a/src/views/CNAS/resourceDemand/device/component/management.vue
+++ b/src/views/CNAS/resourceDemand/device/component/management.vue
@@ -72,7 +72,7 @@
<el-form-item label="浠櫒鍚嶇О:" required prop="deviceName">
<el-input :disabled="isUp" v-model="formData.deviceName" size="small"></el-input>
</el-form-item>
- <el-form-item label="浠櫒鍚嶇ОEN:">
+ <el-form-item label="浠櫒鍚嶇О:">
<el-input :disabled="isUp" v-model="formData.enDeviceName" size="small"></el-input>
</el-form-item>
</div>
@@ -276,7 +276,7 @@
<el-form-item label="浠櫒鍚嶇О:" required>
<el-input v-model="formData2.deviceName" size="small"></el-input>
</el-form-item>
- <el-form-item label="浠櫒鍚嶇ОEN:">
+ <el-form-item label="浠櫒鍚嶇О:">
<el-input v-model="formData2.enDeviceName" size="small"></el-input>
</el-form-item>
</div>
@@ -560,6 +560,8 @@
{
name: "鏁伴噰閰嶇疆",
type: "text",
+ // 鏁伴噰鍔熻兘灏氭湭瀹炵幇锛屾殏鏃跺鎵�鏈夌敤鎴烽殣钘�
+ showHide: () => false,
clickFun: (row) => {
this.handleConfig(row);
},
@@ -831,6 +833,8 @@
this.formData[key] = `${this.formData[key]} 00:00:00`
}
})
+ // 鎵撳紑寮圭獥鏃舵寜宸叉湁鐨勬渶杩戞棩鏈熷拰鍛ㄦ湡閲嶇畻涓嬫鏃ユ湡锛岄伩鍏嶈閲嶆柊閫夋嫨鏃ユ湡鎵嶈绠�
+ this.calcNextDate(this.formData)
},
beforeUpload(file) {
if (file.size > 1024 * 1024 * 10) {
--
Gitblit v1.9.3