diff --git a/src/components/DialogTemplate/index.vue b/src/components/DialogTemplate/index.vue index 8c061579..34f7e7b3 100644 --- a/src/components/DialogTemplate/index.vue +++ b/src/components/DialogTemplate/index.vue @@ -28,7 +28,6 @@ export default { }, methods: { close() { - console.log('close0--') this.$emit('close') } }, diff --git a/src/views/iot/ota/index.vue b/src/views/iot/ota/index.vue index 9bcbb6e9..54f3a4ef 100644 --- a/src/views/iot/ota/index.vue +++ b/src/views/iot/ota/index.vue @@ -429,7 +429,11 @@ export default { }, ], otaVersion: [ - { required: true, message: "版本不能为空", trigger: "blur" }, + { + required: true, + validator: this.chenking_otaVersion, + trigger: ["change",'blur'], + }, ], otaUrl: [ { required: false, message: " 升级地址不能为空", trigger: "blur" }, @@ -444,6 +448,16 @@ export default { this.getList(); }, methods: { + chenking_otaVersion(rule, value, callback){ + const regex = /^\d+(\.\d+)*$/; + if (!this.form.otaVersion) { + callback(new Error('版本不能为空')) + } else if(!regex.test(this.form.otaVersion)) { + callback(new Error('版本格式不正确: x.x.x.x (如1.0.05.121)')) + } else { + callback(); + } + }, beforeAvatarUpload(file) { console.log('oat-upload-file--', file, file.type === 'application/octet-stream'); const isBin = file.type === 'application/octet-stream'; diff --git a/src/views/profile/DeviceDetailsView/BatchUpgradeRate.vue b/src/views/profile/DeviceDetailsView/BatchUpgradeRate.vue index 5a6814e9..1c27740f 100644 --- a/src/views/profile/DeviceDetailsView/BatchUpgradeRate.vue +++ b/src/views/profile/DeviceDetailsView/BatchUpgradeRate.vue @@ -44,12 +44,19 @@ :stroke-width="24" :percentage="scope.row.upgradeProgress" :status="upgradeStatusType(scope.row, 'upgradeStatus')"> + {{upgradeStatusTagTiltle(scope.row, 'upgradeStatus')}} - + + +