From 595e9216ec5bd471069593460f04d9bfd4318bea Mon Sep 17 00:00:00 2001 From: KindSeven <2845382437@qq.com> Date: Mon, 16 Sep 2024 21:46:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E4=BA=86?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=8C=89=E5=A4=84=E7=90=86=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/task-management/all-work-order/index.vue | 4 +++- src/views/task-management/components/WorkDialog.vue | 4 +++- src/views/task-management/historical-work-order/index.vue | 2 +- src/views/task-management/pending-work-order/index.vue | 2 +- vite.config.js | 6 +++--- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/views/task-management/all-work-order/index.vue b/src/views/task-management/all-work-order/index.vue index 8df0912..8b5d480 100644 --- a/src/views/task-management/all-work-order/index.vue +++ b/src/views/task-management/all-work-order/index.vue @@ -91,7 +91,7 @@ const searchConfig = reactive([ component: 'el-date-picker', }, { label: '处理时间', - prop: 'te', + prop: 'processedTime', props: { placeholder: '请选择', clearable: true, @@ -258,6 +258,8 @@ const headBtnClick = (key) => { } const handleDetail = (row) => { + // console.log(row); + workDialogRef.value.open(row) rowData.value = row } diff --git a/src/views/task-management/components/WorkDialog.vue b/src/views/task-management/components/WorkDialog.vue index 6228256..92e428a 100644 --- a/src/views/task-management/components/WorkDialog.vue +++ b/src/views/task-management/components/WorkDialog.vue @@ -79,6 +79,8 @@ watch(() => props.rowData, (newRowData) => { item.data.sort((a, b) => b.answer_time- a.answer_time) opsCallList.value.push(item) }) + console.log(opsCallList.value); + //工单时间线 orderContent.value = [] // console.log(orderData.value); @@ -221,7 +223,7 @@ defineExpose({ color: info.callState === '通话中' ? '#6cc23a' : '#409eff' }">{{ info.callState }} --> {{ - info.answer_time ||'00 : 00'}} + info.answer_time ||'未接通'}} diff --git a/src/views/task-management/historical-work-order/index.vue b/src/views/task-management/historical-work-order/index.vue index 436aa20..30ee23a 100644 --- a/src/views/task-management/historical-work-order/index.vue +++ b/src/views/task-management/historical-work-order/index.vue @@ -92,7 +92,7 @@ const searchConfig = reactive([ component: 'el-date-picker', }, { label: '处理时间', - prop: 'te', + prop: 'processedTime', props: { placeholder: '请选择', clearable: true, diff --git a/src/views/task-management/pending-work-order/index.vue b/src/views/task-management/pending-work-order/index.vue index 457f5ef..4e9befb 100644 --- a/src/views/task-management/pending-work-order/index.vue +++ b/src/views/task-management/pending-work-order/index.vue @@ -92,7 +92,7 @@ const searchConfig = reactive([ component: 'el-date-picker', }, { label: '处理时间', - prop: 'te', + prop: 'processedTime', props: { placeholder: '请选择', clearable: true, diff --git a/vite.config.js b/vite.config.js index a3ab326..3ba2d72 100644 --- a/vite.config.js +++ b/vite.config.js @@ -76,10 +76,10 @@ export default defineConfig({ // rewrite: (path) => path.replace(/^\/api/, ""), // }, "/api": { - // target: "http://frp.feashow.cn:31800/", - target: "http://112.19.165.99:20002/", + target: "http://frp.feashow.cn:31800/", + // target: "http://112.19.165.99:20002/", changeOrigin: true, - // rewrite: (path) => path.replace(/^\/api/, ""), + rewrite: (path) => path.replace(/^\/api/, ""), }, // "/socket": { // target: "ws://frp.feashow.cn:8081/ws", From 1cb6697cc6f45bfaf35d0d84d7b3708a5a93e64b Mon Sep 17 00:00:00 2001 From: KindSeven <2845382437@qq.com> Date: Mon, 16 Sep 2024 21:48:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=8D=E5=8E=9F=E4=BA=86vite.config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vite.config.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vite.config.js b/vite.config.js index 3ba2d72..a3ab326 100644 --- a/vite.config.js +++ b/vite.config.js @@ -76,10 +76,10 @@ export default defineConfig({ // rewrite: (path) => path.replace(/^\/api/, ""), // }, "/api": { - target: "http://frp.feashow.cn:31800/", - // target: "http://112.19.165.99:20002/", + // target: "http://frp.feashow.cn:31800/", + target: "http://112.19.165.99:20002/", changeOrigin: true, - rewrite: (path) => path.replace(/^\/api/, ""), + // rewrite: (path) => path.replace(/^\/api/, ""), }, // "/socket": { // target: "ws://frp.feashow.cn:8081/ws",