From 81aa7eb50b1ceb3a12d44f26a5340b1c245624d4 Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Fri, 20 Sep 2024 14:34:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/base/warnAlert.js | 18 +++ src/components/TableModel/index.vue | 1 + src/components/TableModelTwo/index.vue | 4 +- .../edgeInsert/components/form-insert-all.vue | 6 +- .../components/form-insert-approve.vue | 4 +- src/views/base/edgeInsert/config-all.js | 8 +- src/views/base/edgeInsert/config.js | 11 +- .../warnAlert/components/form-warnAlert.vue | 117 ++++++++++++++++++ src/views/base/warnAlert/config.js | 36 ++++++ src/views/base/warnAlert/index.vue | 108 ++++++++++++++++ 10 files changed, 293 insertions(+), 20 deletions(-) create mode 100644 src/api/base/warnAlert.js create mode 100644 src/views/base/warnAlert/components/form-warnAlert.vue create mode 100644 src/views/base/warnAlert/config.js create mode 100644 src/views/base/warnAlert/index.vue diff --git a/src/api/base/warnAlert.js b/src/api/base/warnAlert.js new file mode 100644 index 0000000..3255910 --- /dev/null +++ b/src/api/base/warnAlert.js @@ -0,0 +1,18 @@ +/** + * 预警告警页面 API + */ +import request from '@/utils/request' +/** 预警告警列表查询 */ +export const queryWarnAlertListApi = (data) => { + return request.get('/base/tbDevAttribute/list', { + params: data + }) +} + +/** 预警告警列表查询 */ +export const handleWarnAlertApi = (data) => { + // return request.post('/base/tbDevAttribute/handle',data) + return request.post('/base/tbDevAttribute/handle', data) +} + + diff --git a/src/components/TableModel/index.vue b/src/components/TableModel/index.vue index 1acb3ce..2c1d577 100644 --- a/src/components/TableModel/index.vue +++ b/src/components/TableModel/index.vue @@ -64,6 +64,7 @@ style="width: 240px" value-format="yyyy-MM-dd" type="date" + :placeholder="`请输入${item.f_label}`" /> - + @@ -319,7 +319,7 @@ export default { let res = await approveEdgeDeviceApi(this.projectParams) if(res.code === 200) { this.$modal.msgSuccess('操作成功') - this.$emit('closeDialogApprove', true) + this.$emit('closeDialogAll', true) } } @@ -333,7 +333,7 @@ export default { let res = await approveEdgeDeviceApi(this.projectParams) if(res.code === 200) { this.$modal.msgSuccess('操作成功') - this.$emit('closeDialogApprove', true) + this.$emit('closeDialogAll', true) } } }) diff --git a/src/views/base/edgeInsert/components/form-insert-approve.vue b/src/views/base/edgeInsert/components/form-insert-approve.vue index b9641c0..f6a5e30 100644 --- a/src/views/base/edgeInsert/components/form-insert-approve.vue +++ b/src/views/base/edgeInsert/components/form-insert-approve.vue @@ -75,8 +75,8 @@ > - - + + diff --git a/src/views/base/edgeInsert/config-all.js b/src/views/base/edgeInsert/config-all.js index c79fc01..500ac42 100644 --- a/src/views/base/edgeInsert/config-all.js +++ b/src/views/base/edgeInsert/config-all.js @@ -1,10 +1,4 @@ -export const formLabelAll = [ - { f_label: '边代名称', f_model: 'departName', f_type: 'ipt' }, - { f_label: '边代编号', f_model: 'departName', f_type: 'ipt' }, - { f_label: '工程名称', f_model: 'headUser', f_type: 'ipt' }, - { f_label: '杆塔编号', f_model: 'headUser', f_type: 'ipt' }, - { f_label: '绑定时间', f_model: 'headUser', f_type: 'date' }, - ] + export const columnsListAll = [ { t_props: 'departName', t_label: '申请项目部', }, { t_props: 'proName', t_label: '工程名称' }, diff --git a/src/views/base/edgeInsert/config.js b/src/views/base/edgeInsert/config.js index 5b89e2d..2dd0fd5 100644 --- a/src/views/base/edgeInsert/config.js +++ b/src/views/base/edgeInsert/config.js @@ -1,9 +1,8 @@ export const formLabel = [ - { f_label: '边代名称', f_model: 'departName', f_type: 'ipt' }, - { f_label: '边代编号', f_model: 'departName', f_type: 'ipt' }, - { f_label: '工程名称', f_model: 'headUser', f_type: 'ipt' }, - { f_label: '杆塔编号', f_model: 'headUser', f_type: 'ipt' }, - { f_label: '绑定时间', f_model: 'headUser', f_type: 'date' }, + { f_label: '项目部名称', f_model: 'departName', f_type: 'ipt' }, + { f_label: '工程名称', f_model: 'proName', f_type: 'ipt' }, + { f_label: '申请人', f_model: 'relUser', f_type: 'ipt' }, + { f_label: '申请时间', f_model: 'auditStatus', f_type: 'date', }, ] export const columnsList = [ { t_props: 'departName', t_label: '申请项目部', }, @@ -12,7 +11,7 @@ export const columnsList = [ { t_props: 'relUser', t_label: '申请人', }, { t_props: 'relPhone', t_label: '联系方式', t_slot: 'relPhone' }, { t_props: 'createTime', t_label: '申请时间', }, - { t_props: 'auditStatus', t_label: '申请状态', t_slot: 'auditStatus' }, + { t_props: 'auditStatus', t_label: '审核状态', t_slot: 'auditStatus' }, ] export const dialogConfig = { diff --git a/src/views/base/warnAlert/components/form-warnAlert.vue b/src/views/base/warnAlert/components/form-warnAlert.vue new file mode 100644 index 0000000..b62d0c9 --- /dev/null +++ b/src/views/base/warnAlert/components/form-warnAlert.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/src/views/base/warnAlert/config.js b/src/views/base/warnAlert/config.js new file mode 100644 index 0000000..c70ad8e --- /dev/null +++ b/src/views/base/warnAlert/config.js @@ -0,0 +1,36 @@ +import { + queryDeviceTypeApi + } from '@/api/base/device' + + export const queryDeviceTypes = () => { + queryDeviceTypeApi({'dictType':'dev_type'}).then(res => { + formLabel[1].f_selList = res.data.map(item => { + return { + label: item.dictLabel, + value: item.dictCode + } + }) + }).catch(err => {}) + } +export const formLabel = [ + { f_label: '设备名称', f_model: 'devName', f_type: 'ipt' }, + { f_label: '设备类型', f_model: 'devType', f_type: 'sel',f_selList: [] }, + { f_label: '预警日期', f_model: 'startTime', f_type: 'dateRange' }, + +] + +export const columnsList = [ + { t_props: 'devTypeName', t_label: '预警设备类型' }, + { t_props: 'devName', t_label: '预警设备名称', }, + { t_props: 'devCode', t_label: '预警设备编号', }, + { t_props: 'warnName', t_label: '预警内容', t_slot: 'warnName' }, + { t_props: 'jcTime', t_label: '预警时间', }, + { t_props: 'status', t_label: '状态', }, + { t_props: 'remarks', t_label: '预警处置',t_slot: 'remarks'}, +] + +export const dialogConfig = { + outerWidth: '40%', + outerTitle: '', + outerVisible: false, +}; diff --git a/src/views/base/warnAlert/index.vue b/src/views/base/warnAlert/index.vue new file mode 100644 index 0000000..80623b9 --- /dev/null +++ b/src/views/base/warnAlert/index.vue @@ -0,0 +1,108 @@ + + +