From 1e4433c2a924a741f409bec5ce717810d97b2185 Mon Sep 17 00:00:00 2001 From: dj <1042039504@qq.com> Date: Sun, 24 Nov 2024 22:02:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=92=8C=E8=AF=A6=E6=83=85=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/liveCall/index.vue | 3 +- src/views/home/index.vue | 16 ++-- .../task-management/all-work-order/index.vue | 71 ++++++++++------- .../task-management/components/WorkDialog.vue | 10 ++- .../historical-work-order/index.vue | 77 ++++++++++++------- .../pending-work-order/index.vue | 77 ++++++++++++------- 6 files changed, 155 insertions(+), 99 deletions(-) diff --git a/src/components/liveCall/index.vue b/src/components/liveCall/index.vue index 79a18b1..917bae2 100644 --- a/src/components/liveCall/index.vue +++ b/src/components/liveCall/index.vue @@ -92,7 +92,8 @@ const handleShowDeadLine=(recordObj,data)=>{ const initWebSocket = () => { try { // const wsUrl=setWsUrl(`/ws/text/${token}`) - const wsUrl = `ws://frp.feashow.cn:31800/ws/text/${token}` + // const wsUrl = `ws://frp.feashow.cn:31800/ws/text/${token}` + const wsUrl = `ws://192.168.1.71:88/ws/text/${token}` // const wsUrl = `ws://112.19.165.99:20002/api/ws/text/${token}` socket = new WebSocket(wsUrl) // 2. ws.send()给服务器发送信息 diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 0884930..03e4e9a 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -70,12 +70,12 @@ const tableConfig = reactive({ label: '处理人', align: 'center' }, - { - prop: 'knotter', - // prop: 'destinationName', - label: '关单人', - align: 'center' - }, + // { + // prop: 'knotter', + // // prop: 'destinationName', + // label: '关单人', + // align: 'center' + // }, { prop: 'destinationName', // prop: 'workOrderNumber', @@ -189,8 +189,8 @@ const handleLogout = () => { const initWebSocket = () => { try { // const wsUrl=setWsUrl(`/ws/text/${token}`) - const wsUrl = `ws://frp.feashow.cn:31800/ws/history/${token}` - // const wsUrl = `ws://112.19.165.99:20002/api/ws/text/${token}` + // const wsUrl = `ws://frp.feashow.cn:31800/ws/history/${token}` + const wsUrl = `ws://192.168.1.71:88/ws/history/${token}` socket = new WebSocket(wsUrl) // 2. ws.send()给服务器发送信息 //连接发生错误的回调方法 diff --git a/src/views/task-management/all-work-order/index.vue b/src/views/task-management/all-work-order/index.vue index a4592a3..464f91f 100644 --- a/src/views/task-management/all-work-order/index.vue +++ b/src/views/task-management/all-work-order/index.vue @@ -43,16 +43,18 @@ const searchConfig = reactive([ checkStrictly: true }, component: 'el-input', - }, { - label: '工单名称', - prop: 'orderName', - props: { - placeholder: '请输入工单名查询', - clearable: true, - checkStrictly: true - }, - component: 'el-input', - }, { + }, + // { + // label: '工单名称', + // prop: 'orderName', + // props: { + // placeholder: '请输入工单名查询', + // clearable: true, + // checkStrictly: true + // }, + // component: 'el-input', + // }, + { label: '工单状态', prop: 'orderState', props: { @@ -71,16 +73,17 @@ const searchConfig = reactive([ checkStrictly: true }, component: 'el-input', - }, { - label: '关单人', - prop: 'knotter', - props: { - placeholder: '请输入关单人查询', - clearable: true, - checkStrictly: true - }, - component: 'el-input', }, + // { + // label: '关单人', + // prop: 'knotter', + // props: { + // placeholder: '请输入关单人查询', + // clearable: true, + // checkStrictly: true + // }, + // component: 'el-input', + // }, { label: '创建时间', prop: 'createdTime', @@ -133,15 +136,27 @@ const tableConfig = reactive({ align: 'center', width: 200 }, + // { + // prop: 'orderName', + // label: '工单名称', + // align: 'center', + // width: 200 + // }, { - prop: 'orderName', - label: '工单名称', + prop: 'orderContent', + label: '工单内容', + align: 'center', + width: 250 + }, + { + prop: 'alarmUnit', + label: '拨打单位', align: 'center', width: 200 }, { - prop: 'orderContent', - label: '工单内容', + prop: 'alarmObject', + label: '拨打对象', align: 'center', width: 200 }, @@ -208,11 +223,11 @@ const tableConfig = reactive({ align: 'center', width: 200 }, - { - prop: 'knotter', - label: '关单人', - align: 'center' - }, + // { + // prop: 'knotter', + // label: '关单人', + // align: 'center' + // }, { prop: 'oper', label: '操作', diff --git a/src/views/task-management/components/WorkDialog.vue b/src/views/task-management/components/WorkDialog.vue index 04f6e3f..72df075 100644 --- a/src/views/task-management/components/WorkDialog.vue +++ b/src/views/task-management/components/WorkDialog.vue @@ -179,12 +179,14 @@ const inputOrderTime = (item, index) => { } const inputOrderContent = (contentState) => { + console.log('contentState',contentState) contentState.map((item, index) => { inputOrderTime(item, index) - }) - contentState.forEach(item => { orderContent.value.push(item) }) + // contentState.forEach(item => { + // orderContent.value.push(item) + // }) } const openRecord = () => { @@ -241,8 +243,8 @@ defineExpose({ 处理人：{{ rowData.operationUser || '--' }}
- 工单名称：{{ rowData.orderName || '--' }} - 关单人：{{ rowData.knotter || '--' }} + 拨打单位：{{ rowData.alarmUnit || '--' }} + 拨打对象：{{ rowData.alarmObject || '--' }}
diff --git a/src/views/task-management/historical-work-order/index.vue b/src/views/task-management/historical-work-order/index.vue index 6929265..ff783a8 100644 --- a/src/views/task-management/historical-work-order/index.vue +++ b/src/views/task-management/historical-work-order/index.vue @@ -45,16 +45,18 @@ const searchConfig = reactive([ checkStrictly: true }, component: 'el-input', - }, { - label: '工单名称', - prop: 'orderName', - props: { - placeholder: '请输入工单名查询', - clearable: true, - checkStrictly: true - }, - component: 'el-input', - }, { + }, + // { + // label: '工单名称', + // prop: 'orderName', + // props: { + // placeholder: '请输入工单名查询', + // clearable: true, + // checkStrictly: true + // }, + // component: 'el-input', + // }, + { label: '处理人', prop: 'operationUser', props: { @@ -63,16 +65,17 @@ const searchConfig = reactive([ checkStrictly: true }, component: 'el-input', - }, { - label: '关单人', - prop: 'knotter', - props: { - placeholder: '请输入关单人查询', - clearable: true, - checkStrictly: true - }, - component: 'el-input', }, + // { + // label: '关单人', + // prop: 'knotter', + // props: { + // placeholder: '请输入关单人查询', + // clearable: true, + // checkStrictly: true + // }, + // component: 'el-input', + // }, { label: '创建时间', prop: 'createdTime', @@ -125,15 +128,27 @@ const tableConfig = reactive({ align: 'center', width: 200 }, + // { + // prop: 'orderName', + // label: '工单名称', + // align: 'center', + // width: 200 + // }, { - prop: 'orderName', - label: '工单名称', + prop: 'orderContent', + label: '工单内容', + align: 'center', + width: 250 + }, + { + prop: 'alarmUnit', + label: '拨打单位', align: 'center', width: 200 }, { - prop: 'orderContent', - label: '工单内容', + prop: 'alarmObject', + label: '拨打对象', align: 'center', width: 200 }, @@ -193,11 +208,11 @@ const tableConfig = reactive({ align: 'center', width: 200 }, - { - prop: 'knotter', - label: '关单人', - align: 'center' - }, + // { + // prop: 'knotter', + // label: '关单人', + // align: 'center' + // }, { prop: 'oper', label: '操作', @@ -275,7 +290,11 @@ const handleClose = async (row) => { } ) .then(async () => { - const info = await orderdClose(row.orderNumber) + const info = await orderdClose({ + orderNumber: row.orderNumber, + alarmObject: row.alarmObject, + alarmUnit: row.alarmUnit + }) // console.log(info); if (info.code === 1000) { tableIns.value.refresh() diff --git a/src/views/task-management/pending-work-order/index.vue b/src/views/task-management/pending-work-order/index.vue index 61840d1..2adb788 100644 --- a/src/views/task-management/pending-work-order/index.vue +++ b/src/views/task-management/pending-work-order/index.vue @@ -45,16 +45,18 @@ const searchConfig = reactive([ checkStrictly: true }, component: 'el-input', - }, { - label: '工单名称', - prop: 'orderName', - props: { - placeholder: '请输入工单名查询', - clearable: true, - checkStrictly: true - }, - component: 'el-input', - }, { + }, + // { + // label: '工单名称', + // prop: 'orderName', + // props: { + // placeholder: '请输入工单名查询', + // clearable: true, + // checkStrictly: true + // }, + // component: 'el-input', + // }, + { label: '处理人', prop: 'operationUser', props: { @@ -63,16 +65,17 @@ const searchConfig = reactive([ checkStrictly: true }, component: 'el-input', - }, { - label: '关单人', - prop: 'knotter', - props: { - placeholder: '请输入关单人查询', - clearable: true, - checkStrictly: true - }, - component: 'el-input', }, + // { + // label: '关单人', + // prop: 'knotter', + // props: { + // placeholder: '请输入关单人查询', + // clearable: true, + // checkStrictly: true + // }, + // component: 'el-input', + // }, { label: '创建时间', prop: 'createdTime', @@ -125,15 +128,27 @@ const tableConfig = reactive({ align: 'center', width: 200 }, + // { + // prop: 'orderName', + // label: '工单名称', + // align: 'center', + // width: 200 + // }, { - prop: 'orderName', - label: '工单名称', + prop: 'orderContent', + label: '工单内容', + align: 'center', + width: 250 + }, + { + prop: 'alarmUnit', + label: '拨打单位', align: 'center', width: 200 }, { - prop: 'orderContent', - label: '工单内容', + prop: 'alarmObject', + label: '拨打对象', align: 'center', width: 200 }, @@ -193,11 +208,11 @@ const tableConfig = reactive({ align: 'center', width: 200 }, - { - prop: 'knotter', - label: '关单人', - align: 'center' - }, + // { + // prop: 'knotter', + // label: '关单人', + // align: 'center' + // }, { prop: 'oper', label: '操作', @@ -275,7 +290,11 @@ const handleClose = async (row) => { } ) .then(async () => { - const info = await orderdClose(row.orderNumber) + const info = await orderdClose({ + orderNumber: row.orderNumber, + alarmObject: row.alarmObject, + alarmUnit: row.alarmUnit + }) // console.log(info); if (info.code === 1000) { tableIns.value.refresh()