From 89d5a25d8461fe6a8f2fb9ce00abe5db72b01e53 Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Thu, 17 Aug 2023 08:53:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/model/alert.js | 71 ++++ src/views/model/alert/index.vue | 587 +++++++++++++++++++++++++++ src/views/model/alert/paramalert.vue | 379 +++++++++++++++++ src/views/model/params/index.vue | 40 +- 4 files changed, 1067 insertions(+), 10 deletions(-) create mode 100644 src/api/model/alert.js create mode 100644 src/views/model/alert/index.vue create mode 100644 src/views/model/alert/paramalert.vue diff --git a/src/api/model/alert.js b/src/api/model/alert.js new file mode 100644 index 0000000..7d14fe0 --- /dev/null +++ b/src/api/model/alert.js @@ -0,0 +1,71 @@ +import request from '@/utils/request' + +// 查询设备告警列表 +export function listAlert(query) { + return request({ + url: '/model/dcBusiAlertDevcie/list', + method: 'get', + params: query + }) +} + +// 查询设备告警详细 +export function getAlert(id) { + return request({ + url: '/model/dcBusiAlertDevcie/' + id, + method: 'get' + }) +} + +// 新增设备告警 +export function addAlert(data) { + return request({ + url: '/model/dcBusiAlertDevcie', + method: 'post', + data: data + }) +} + +// 修改设备告警 +export function updateAlert(data) { + return request({ + url: '/model/dcBusiAlertDevcie', + method: 'put', + data: data + }) +} + +// 删除设备告警 +export function delAlert(id) { + return request({ + url: '/model/dcBusiAlertDevcie/' + id, + method: 'delete' + }) +} + +// 导出设备告警 +export function exportAlert(query) { + return request({ + url: '/${baseUrl}/export', + method: 'get', + params: query + }) +} + +// 查询警告列表 +export function getAlertTableInfo(query) { + return request({ + url: '/model/dcBusiAlertDevcie/alertDeviceInfo', + method: 'post', + params: query + }) +} + +// 查询未添加警告设备列表 +export function getNoAlertDevice(query) { + return request({ + url: '/model/dcBusiAlertDevcie/noAlertDevice', + method: 'post', + params: query + }) +} diff --git a/src/views/model/alert/index.vue b/src/views/model/alert/index.vue new file mode 100644 index 0000000..e9aef0d --- /dev/null +++ b/src/views/model/alert/index.vue @@ -0,0 +1,587 @@ + + + diff --git a/src/views/model/alert/paramalert.vue b/src/views/model/alert/paramalert.vue new file mode 100644 index 0000000..fbbd9be --- /dev/null +++ b/src/views/model/alert/paramalert.vue @@ -0,0 +1,379 @@ + + + diff --git a/src/views/model/params/index.vue b/src/views/model/params/index.vue index fa6d2bc..f0be379 100644 --- a/src/views/model/params/index.vue +++ b/src/views/model/params/index.vue @@ -219,8 +219,8 @@ - - + + @@ -230,7 +230,7 @@ - + - + @@ -308,12 +308,12 @@ - + - + { form.value = response.data; + paramModelDisabled.value = true; + partionDisabled.value = true; open.value = true; title.value = "修改设备参数明细"; }); @@ -602,14 +609,18 @@ function getParamModelName(id){ } function checkedParamModel(val){ - let paramClassCodeSeleted = ""; paramClassList.value.forEach(item=>{ if(item.id == val){ - paramClassCodeSeleted = item.paramClassCode; + paramClassCodeSeleted.value = item.paramClassCode; + if(form.value.partion !== undefined && form.value.partion !== null && form.value.partion !== ""){ + form.value.paramCode = form.value.partion+deviceCode+paramClassCodeSeleted.value; + form.value.globalCode = deviceUuid + "-" + form.value.partion + deviceCode + paramClassCodeSeleted.value; + }else{ + hintMessage.value = "请选择分区"; + } + return; } }) - form.value.paramCode = deviceCode+"-"+paramClassCodeSeleted; - form.value.globalCode = deviceUuid +"-"+ deviceCode +"-"+paramClassCodeSeleted; } function toggleCollapse() { @@ -621,6 +632,15 @@ function toggleCollapse() { } } +function partionChange(val){ + if(paramClassCodeSeleted.value !== ""){ + form.value.paramCode = form.value.partion+deviceCode+paramClassCodeSeleted.value; + form.value.globalCode = deviceUuid + "-" + form.value.partion + deviceCode + paramClassCodeSeleted.value; + }else{ + hintMessage.value = "请选择参数模版"; + } +} + getList(); getParamModel(); From 9b633e8de32df6940cf873671545828bbb8e96f6 Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Thu, 17 Aug 2023 09:03:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=9D=A5=E6=BA=90id=E4=B8=8D=E8=83=BD=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/model/device/index.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/views/model/device/index.vue b/src/views/model/device/index.vue index ff925c2..64893ad 100644 --- a/src/views/model/device/index.vue +++ b/src/views/model/device/index.vue @@ -272,13 +272,12 @@ - + @@ -678,7 +677,7 @@ function selectDept(val){ } function deviceSourceChange(val){ - form.value.deviceSourceId=val.deviceSourceId; + form.value.deviceSourceId=val; } getDeptTree();