diff --git a/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/index.vue b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/index.vue index c1110b4c..8af3f02e 100644 --- a/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/index.vue +++ b/src/packages/components/CustomComponents/AlarmDiagram/RealTimeEvent/index.vue @@ -38,8 +38,8 @@
查询结果为空
- - + + @@ -328,17 +328,23 @@ const getData = () => { }) } -const modalObj = reactive({ - show: false, - data: {} -}) +// const modalObj = reactive({ +// show: false, +// data: {} +// }) const clickItem = (i:number) => { - const obj = tableData[i] - modalObj.show = true - Object.assign(modalObj, { - show: true, - data: obj + postMessageToParent({ + type: 'openRealTimeEventDetail', + currentAlarm: tableData[i], }) + + // 自己写的详情 + // const obj = tableData[i] + // modalObj.show = true + // Object.assign(modalObj, { + // show: true, + // data: obj + // }) } const originStore = useOriginStore() @@ -377,66 +383,87 @@ watch(() => select1.value.join('&&') + select2.value.join('&&'), (v) => { getData() }) -const modalV1Obj = reactive({ - show: false, - data: { - // confirm_people_id: user.id, - confirm_people: user.name, - is_misreport: false, - remark: '', - reconfirmation_time_str: null, - }, - // batch 批量 single 单个 - type: 'batch', - singleIds: [], -}) +// const modalV1Obj = reactive({ +// show: false, +// data: { +// // confirm_people_id: user.id, +// confirm_people: user.name, +// is_misreport: false, +// remark: '', +// reconfirmation_time_str: null, +// }, +// // batch 批量 single 单个 +// type: 'batch', +// singleIds: [], +// }) const clickBatch = () => { if(!tableData.filter(_ => _.checked).length) { window['$message'].warning('请先选择数据') return } - Object.assign(modalV1Obj, { - show: true, - data: { - // confirm_people_id: user.id, - confirm_people: user.name, - is_misreport: false, - remark: '', - reconfirmation_time_str: null, - }, - type: 'batch', - singleIds: [] - }) -} -const clickSingle = (id: number) => { - Object.assign(modalV1Obj, { - show: true, - data: { - // confirm_people_id: user.id, - confirm_people: user.name, - is_misreport: false, - remark: '', - reconfirmation_time_str: null, - }, - type: 'single', - singleIds: [id] + let selectIds = tableData.filter(_ => _.checked && _.confirm_status !== 'ok').map(_ => _.id) + if(!selectIds.length) return + postMessageToParent({ + type: 'openRealTimeEventDialog', + multipleConfirm: true, + selectIds, }) + // Object.assign(modalV1Obj, { + // show: true, + // data: { + // // confirm_people_id: user.id, + // confirm_people: user.name, + // is_misreport: false, + // remark: '', + // reconfirmation_time_str: null, + // }, + // type: 'batch', + // singleIds: [] + // }) } -const confirm = () => { - const obj = { - id: null, - ids: modalV1Obj.type === 'batch' ? tableData.filter(_ => _.checked).map(_ => _.id) : modalV1Obj.singleIds, - confirm_status: "ok", - ...modalV1Obj.data - } - publicInterface('/dcim/dems/devie_active_alarm', 'confirms', obj).then(res => { - window['$message'].success('操作成功') - checkAll.value = false +getMessageByParent('', (e) => { + if(e.data.type === 'openRealTimeEventDialog_confirmed' && e.data.page === 'customLargeScreen') { + console.log('openRealTimeEventDialog_confirmed') getData() + } +}) +const clickSingle = (id: number) => { + postMessageToParent({ + type: 'openRealTimeEventDialog', + multipleConfirm: false, + selectIds: [id], }) + + // 自己写的弹窗 + // Object.assign(modalV1Obj, { + // show: true, + // data: { + // // confirm_people_id: user.id, + // confirm_people: user.name, + // is_misreport: false, + // remark: '', + // reconfirmation_time_str: null, + // }, + // type: 'single', + // singleIds: [id] + // }) } +// const confirm = () => { +// const obj = { +// id: null, +// ids: modalV1Obj.type === 'batch' ? tableData.filter(_ => _.checked).map(_ => _.id) : modalV1Obj.singleIds, +// confirm_status: "ok", +// ...modalV1Obj.data +// } +// publicInterface('/dcim/dems/devie_active_alarm', 'confirms', obj).then(res => { +// window['$message'].success('操作成功') +// checkAll.value = false +// getData() +// }) +// } + const jumpTo = (row:any) => { if (row.space && row.space.space_type !== 'device') { publicInterface('/dcim/space_page', 'get', { space_id: row.space_id, order: 'sort,id asc' }).then(res => { diff --git a/src/packages/components/Tables/Tables/TableScrollBoard/index.vue b/src/packages/components/Tables/Tables/TableScrollBoard/index.vue index 934e6d36..d8be6100 100644 --- a/src/packages/components/Tables/Tables/TableScrollBoard/index.vue +++ b/src/packages/components/Tables/Tables/TableScrollBoard/index.vue @@ -271,6 +271,7 @@ const calcRowsData = () => { if(statusIndex <= item.ceils.length) { let v = item.ceils[statusIndex] let obj = statusOption.find((_: any) => _.value === v.toString()) || {label: ''} + console.log(obj) if(obj.remark) { item.ceils[statusIndex] = `${obj.label}` }