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({
{{ activity.createTime }}
-
+
{{ info.callIdNumber
}}
-
-
+
{{
- info.answer_time }}
+ info.answer_time ||'00 : 00'}}
@@ -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;
-}
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",