diff --git a/packages/screen/src/views/RiskWarning/Dialog/hazardPointSituationDialog.vue b/packages/screen/src/views/RiskWarning/Dialog/hazardPointSituationDialog.vue index 188205b..f16dc0f 100644 --- a/packages/screen/src/views/RiskWarning/Dialog/hazardPointSituationDialog.vue +++ b/packages/screen/src/views/RiskWarning/Dialog/hazardPointSituationDialog.vue @@ -329,11 +329,18 @@ const previewPhoto = (index) => { // 视频通话 const handleVideo = (item, type) => { console.log('视频通话:', item) + let textType = '' + if (props.title.includes('涉灾隐患点')) { + textType = '涉灾隐患点' + } else if (props.title.includes('路段')) { + textType = '路段' + } let videoParams = { ...item, id: hazardData.value.id, type: type, role: getRolefn(type), + textType: textType, } openVideoConference(videoParams) // emit('video', { @@ -345,11 +352,18 @@ const handleVideo = (item, type) => { // 语音通话 const handleVoice = (item, type) => { console.log('语音通话:', item) + let textType = '' + if (props.title.includes('涉灾隐患点')) { + textType = '涉灾隐患点' + } else if (props.title.includes('路段')) { + textType = '路段' + } let voiceParams = { ...item, id: hazardData.value.id, type: type, role: getRolefn(type), + textType: textType, } openVoiceConference(voiceParams) // emit('voice', { @@ -361,11 +375,18 @@ const handleVoice = (item, type) => { // 拨打电话 const handleCall = (item, type) => { console.log('拨打电话:', item) + let textType = '' + if (props.title.includes('涉灾隐患点')) { + textType = '涉灾隐患点' + } else if (props.title.includes('路段')) { + textType = '路段' + } emit('call', { ...item, id: hazardData.value.id, type: type, role: getRolefn(type), + textType: textType, }) } const getRolefn = (item) => { diff --git a/packages/screen/src/views/RiskWarning/Dialog/responseSituationDiaLog.vue b/packages/screen/src/views/RiskWarning/Dialog/responseSituationDiaLog.vue index c28103c..a5ef52d 100644 --- a/packages/screen/src/views/RiskWarning/Dialog/responseSituationDiaLog.vue +++ b/packages/screen/src/views/RiskWarning/Dialog/responseSituationDiaLog.vue @@ -110,7 +110,7 @@ const stats = ref({ // 表格列配置 const tableColumns = ref([ - { prop: 'id', label: '序号', width: '' }, + { prop: 'index', label: '序号', width: '' }, { prop: 'countyName', label: '区县/镇街', width: '' }, { prop: 'name', label: '姓名', width: '' }, { prop: 'phone', label: '电话', width: '' }, @@ -162,9 +162,10 @@ const fetchData = async () => { if (res.total > 0 && res.data) { const data = res.data tableData.value = data.map((item, index) => ({ - id: currentPage.value * pageSize.value - (pageSize.value - index - 1), + index: currentPage.value * pageSize.value - (pageSize.value - index - 1), countyName: item.countyName || '-', name: item.name || '-', + id: item.id || '', phone: item.phone || '-', schedulingCount: item.schedulingCount || '-', schedulingLastTime: item.schedulingLastTime || '-', @@ -188,6 +189,7 @@ const handleView = (item) => { type: '护路员', role: '路长', text: '拨打视频电话', + textType: '农村公路', }) } @@ -199,6 +201,7 @@ const handleVoice = (item) => { type: '', role: '路长', text: '拨打语音电话', + textType: '农村公路', }) } @@ -210,6 +213,7 @@ const handleCall = (item) => { type: '护路员', role: '路长', text: '拨打电话', + textType: '农村公路', }) } diff --git a/packages/screen/src/views/RiskWarning/component/index.js b/packages/screen/src/views/RiskWarning/component/index.js index ad8e0dd..dc940ab 100644 --- a/packages/screen/src/views/RiskWarning/component/index.js +++ b/packages/screen/src/views/RiskWarning/component/index.js @@ -216,8 +216,9 @@ export const openVideoConference = async (item) => { userName: item.name, userPhone: item.phone, id: item.id, - type: item.type, - role: item.role, + x_role: item.role, + x_type: item.type, + type: item.textType, userId: userId, text: '打开视频会议', } @@ -259,8 +260,9 @@ export const openVoiceConference = async (item) => { userName: item.name, userPhone: item.phone, id: item.id, - role: item.role, - type: item.type, + x_role: item.role, + x_type: item.type, + type: item.textType, userId: userId, text: '打开语音通话', } @@ -288,8 +290,9 @@ export const opencallConference = async (item) => { userName: item.name, userPhone: item.phone, id: item.id, - role: item.role, - type: item.type, + x_role: item.role, + x_type: item.type, + type: item.textType, userId: '', text: '拨打电话', }