From b7bec91182c6dadb7fb588c23b64aa9740767667 Mon Sep 17 00:00:00 2001
From: KindSeven <2845382437@qq.com>
Date: Mon, 16 Sep 2024 03:19:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=8C=E6=88=90=E4=BA=86=E8=AF=A6?=
 =?UTF-8?q?=E7=BB=86=E4=B8=AD=E7=94=B5=E8=AF=9D=E6=A0=8F=E7=9A=84=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task-management/all-work-order/index.vue  |  6 ++--
 .../task-management/components/WorkDialog.vue | 34 ++++++++++++++-----
 .../historical-work-order/index.vue           |  6 ++--
 .../pending-work-order/index.vue              |  6 ++--
 vite.config.js                                |  6 ++--
 5 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/src/views/task-management/all-work-order/index.vue b/src/views/task-management/all-work-order/index.vue
index d992840..2585564 100644
--- a/src/views/task-management/all-work-order/index.vue
+++ b/src/views/task-management/all-work-order/index.vue
@@ -276,13 +276,14 @@ const handleClose = async (row) => {
   )
     .then(async () => {
       await orderdClose(row.orderNumber)
-      router.push('/task/management/all-work-order');
+      tableIns.value.refresh()
       ElMessage({
         type: 'success',
         message: '关闭成功',
       })
     })
     .catch(() => {
+      // tableIns.value.refresh()
       ElMessage({
         type: 'info',
         message: '关闭失败',
@@ -303,13 +304,14 @@ const handleDelete = async (row) => {
   )
     .then(async () => {
       await orderdDetele(row.orderNumber)
-      router.push('/task/management/all-work-order');
+      tableIns.value.refresh()
       ElMessage({
         type: 'success',
         message: '删除成功',
       })
     })
     .catch(() => {
+      // tableIns.value.refresh()
       ElMessage({
         type: 'info',
         message: '删除失败',
diff --git a/src/views/task-management/components/WorkDialog.vue b/src/views/task-management/components/WorkDialog.vue
index 9e9c34b..6228256 100644
--- a/src/views/task-management/components/WorkDialog.vue
+++ b/src/views/task-management/components/WorkDialog.vue
@@ -213,15 +213,15 @@ defineExpose({
                                                 <div class="custom-card">
                                                     <div style="font-weight: bold">{{ activity.createTime }}</div>
                                                     <div v-for="(info, index) in activity.data" :key="index">
-                                                        <div>
+                                                        <div class="timeline-row">
                                                             <span :style="{ color: '#a8abb2' }">{{ info.callIdNumber
                                                                 }}</span>
-                                                            <PointTag dictType="call_status" :value="info.callState" />
-                                                            <span :style="{
+                                                            <PointTag dictType="call_status" :value="info.callState" class="tag"/>
+                                                            <!-- <span :style="{
                                                                 color: info.callState === '通话中' ? '#6cc23a' : '#409eff'
-                                                            }">{{ info.callState }}</span>
+                                                            }">{{ info.callState }}</span> -->
                                                             <span class="span-3th" :style="{ color: '#a8abb2' }">{{
-                                                                info.answer_time }}</span>
+                                                                info.answer_time ||'00 : 00'}}</span>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -319,6 +319,26 @@ defineExpose({
 
 }
 
+.main-content .timeline-row{
+    // border: 1px solid #000;
+    display: flex;
+    // justify-content: space-between;
+    // border: 1px solid #000;
+    
+}
+.main-content .tag{
+    align-items: center;
+    // background-color: red;
+    margin-left: 30px;
+}
+.main-content .span-3th{
+    // flex-grow: 1;
+    // margin-right:;
+    flex: 1;
+   text-align: right;
+   margin-right: 100px;
+
+}
 .custom-card {
     width: 100%;
     font-size: 16px;
@@ -330,8 +350,4 @@ defineExpose({
     margin: 2px;
 
 }
-
-.custom-card .span-3th {
-    float: right;
-}
 </style>
diff --git a/src/views/task-management/historical-work-order/index.vue b/src/views/task-management/historical-work-order/index.vue
index f70207c..11e1d16 100644
--- a/src/views/task-management/historical-work-order/index.vue
+++ b/src/views/task-management/historical-work-order/index.vue
@@ -278,13 +278,14 @@ const handleClose = async (row) => {
   )
     .then(async () => {
       await orderdClose(row.orderNumber)
-      router.push('/task/management/historical-work-order');
+      tableIns.value.refresh()
       ElMessage({
         type: 'success',
         message: '关闭成功',
       })
     })
     .catch(() => {
+      // tableIns.value.refresh()
       ElMessage({
         type: 'info',
         message: '关闭失败',
@@ -305,13 +306,14 @@ const handleDelete = async (row) => {
   )
     .then(async () => {
       await orderdDetele(row.orderNumber)
-      router.push('/task/management/historical-work-order');
+      tableIns.value.refresh()
       ElMessage({
         type: 'success',
         message: '删除成功',
       })
     })
     .catch(() => {
+      // tableIns.value.refresh()
       ElMessage({
         type: 'info',
         message: '删除失败',
diff --git a/src/views/task-management/pending-work-order/index.vue b/src/views/task-management/pending-work-order/index.vue
index 2e916b3..c617ff7 100644
--- a/src/views/task-management/pending-work-order/index.vue
+++ b/src/views/task-management/pending-work-order/index.vue
@@ -278,13 +278,14 @@ const handleClose = async (row) => {
   )
     .then(async () => {
       await orderdClose(row.orderNumber)
-      router.push('/task/management/pending-work-order');
+      tableIns.value.refresh()
       ElMessage({
         type: 'success',
         message: '关闭成功',
       })
     })
     .catch(() => {
+      // tableIns.value.refresh()
       ElMessage({
         type: 'info',
         message: '关闭失败',
@@ -305,13 +306,14 @@ const handleDelete = async (row) => {
   )
     .then(async () => {
       await orderdDetele(row.orderNumber)
-      router.push('/task/management/pending-work-order');
+      tableIns.value.refresh()
       ElMessage({
         type: 'success',
         message: '删除成功',
       })
     })
     .catch(() => {
+      // tableIns.value.refresh()
       ElMessage({
         type: 'info',
         message: '删除失败',
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",