From a0095b4054eb6473a777f8de38a262003bdd1893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?= <43331987+JiaLiBai@users.noreply.github.com> Date: Wed, 31 Dec 2025 17:15:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?pcs=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B,?= =?UTF-8?q?=E6=96=B0=E5=A2=9Epcs=E8=AE=BE=E5=A4=87=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=80=89=E9=A1=B9,=E7=AD=96=E7=95=A5=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ems/dzjk/clpz/xftg/AddTemplate.vue | 22 - src/views/ems/site/sblb/AddDevice.vue | 475 ++++++++++++------- 2 files changed, 309 insertions(+), 188 deletions(-) diff --git a/src/views/ems/dzjk/clpz/xftg/AddTemplate.vue b/src/views/ems/dzjk/clpz/xftg/AddTemplate.vue index 4a5b282..c8f8dd1 100644 --- a/src/views/ems/dzjk/clpz/xftg/AddTemplate.vue +++ b/src/views/ems/dzjk/clpz/xftg/AddTemplate.vue @@ -262,28 +262,6 @@ export default { saveDialog() { this.$refs.addTempForm.validate(valid => { if (!valid) return - //校验时间选择范围是否冲突 - let status = true - this.tableData.forEach((outer, outerIndex) => { - const {startTime, endTime} = outer - const outerStart = parseInt(startTime), outerEnd = parseInt(endTime) - if (outerStart > outerEnd) { - status = false - } else { - this.tableData.forEach((inner, innerIndex) => { - if (innerIndex !== outerIndex) { - const {startTime: innerStartTime, endTime: innerEndTime} = inner - const innerStart = parseInt(innerStartTime), innerEnd = parseInt(innerEndTime) - if ((innerStart < outerStart && innerEnd > outerEnd) || !((innerStart < outerStart && innerEnd <= outerStart) || (innerStart >= outerEnd && innerEnd > outerEnd))) { - status = false - } - } - }) - } - }) - if (!status) { - return this.$message.error('时间选择范围冲突'); - } const {templateName, sdcLimit, sdcDown, sdcUp} = this.formData const {siteId, updateStrategyId} = this.$home const {tableData} = this diff --git a/src/views/ems/site/sblb/AddDevice.vue b/src/views/ems/site/sblb/AddDevice.vue index 0f84776..b3c6f0d 100644 --- a/src/views/ems/site/sblb/AddDevice.vue +++ b/src/views/ems/site/sblb/AddDevice.vue @@ -1,90 +1,136 @@