From 877f9d4211d4dc7a8c4e976b3dc88a07f1ad4ae3 Mon Sep 17 00:00:00 2001
From: engigu <sayheya@qq.com>
Date: Sat, 20 Jan 2024 13:57:57 +0800
Subject: [PATCH] chroe: adjust ins page

---
 web/src/util/commonUtils.js                      |  6 ++++++
 .../tabsTools/sendTasks/view/addTaskPopUp.vue    | 14 +++++++-------
 .../tabsTools/sendTasks/view/editTaskPopUp.vue   | 16 ++++++++--------
 web/src/views/tabsTools/sendWays/sendWays.vue    | 11 ++++++++---
 4 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/web/src/util/commonUtils.js b/web/src/util/commonUtils.js
index aed9411..2f8c9d3 100644
--- a/web/src/util/commonUtils.js
+++ b/web/src/util/commonUtils.js
@@ -1,5 +1,7 @@
 
 
+import { CONSTANT } from '@/constant'
+
 class CommonUtils {
 
   static formatInsConfigDisplay = (scope) => {
@@ -15,6 +17,10 @@ class CommonUtils {
     }
   }
 
+  static formatWayName = (type) => {
+    return CONSTANT.WAYS_DATA_MAP[type].label;
+  }
+
 }
 
 export { CommonUtils };
diff --git a/web/src/views/tabsTools/sendTasks/view/addTaskPopUp.vue b/web/src/views/tabsTools/sendTasks/view/addTaskPopUp.vue
index 331cb3b..43a14b0 100644
--- a/web/src/views/tabsTools/sendTasks/view/addTaskPopUp.vue
+++ b/web/src/views/tabsTools/sendTasks/view/addTaskPopUp.vue
@@ -59,14 +59,14 @@
         <el-table :data="insTableData" empty-text="发信实例为空" style="width: 100%" max-height="300"
           :row-style="insRowStyle()">
           <el-table-column prop="way_name" label="渠道名" />
-          <el-table-column prop="way_type" label="渠道+内容类型">
+          <el-table-column prop="way_type" label="渠道+内容类型" width="140px">
             <template #default="scope">
-              {{ scope.row.way_type }}+{{ scope.row.content_type }}
+              {{ CommonUtils.formatWayName(scope.row.way_type) }}+{{ scope.row.content_type }}
             </template>
           </el-table-column>
           <el-table-column prop="way_type" label="额外信息">
             <template #default="scope">
-              {{ formatExtraInfo(scope) }}
+              {{ CommonUtils.formatInsConfigDisplay(scope) }}
             </template>
           </el-table-column>
           <el-table-column fixed="right" label="操作" width="60px">
@@ -201,13 +201,13 @@ export default defineComponent({
       }
     }
 
-    const formatExtraInfo = (scope) => {
-      return CommonUtils.formatInsConfigDisplay(scope);
-    }
+    // const formatExtraInfo = (scope) => {
+    //   return CommonUtils.formatInsConfigDisplay(scope);
+    // }
 
     return {
       ...toRefs(state), handleCancer, handleSubmit,
-      searchID, formatExtraInfo, CONSTANT,
+      searchID, CONSTANT, CommonUtils,
       clickStore, insRowStyle
     };
   },
diff --git a/web/src/views/tabsTools/sendTasks/view/editTaskPopUp.vue b/web/src/views/tabsTools/sendTasks/view/editTaskPopUp.vue
index 35beeca..6398e5a 100644
--- a/web/src/views/tabsTools/sendTasks/view/editTaskPopUp.vue
+++ b/web/src/views/tabsTools/sendTasks/view/editTaskPopUp.vue
@@ -61,14 +61,14 @@
         <el-table :data="insTableData" empty-text="发信实例为空" style="width: 100%" max-height="300"
           :row-style="insRowStyle()">
           <el-table-column prop="way_name" label="渠道名" />
-          <el-table-column prop="way_type" label="渠道+内容类型" width="120px">
+          <el-table-column prop="way_type" label="渠道+内容类型" width="140px">
             <template #default="scope">
-              {{ scope.row.way_type }}+{{ scope.row.content_type }}
+              {{ CommonUtils.formatWayName(scope.row.way_type) }}+{{ scope.row.content_type }}
             </template>
           </el-table-column>
           <el-table-column prop="way_type" label="额外信息">
             <template #default="scope">
-              {{ formatExtraInfo(scope) }}
+              {{ CommonUtils.formatInsConfigDisplay(scope) }}
             </template>
           </el-table-column>
           <el-table-column label="状态" prop="status" width="60px">
@@ -188,9 +188,9 @@ export default defineComponent({
       }
     }
 
-    const formatExtraInfo = (scope) => {
-      return CommonUtils.formatInsConfigDisplay(scope);
-    }
+    // const formatExtraInfo = (scope) => {
+    //   return CommonUtils.formatInsConfigDisplay(scope);
+    // }
 
     const searchID = async () => {
       const rsp = await request.get('/sendways/get', { params: { id: state.searchWayID } });
@@ -242,8 +242,8 @@ export default defineComponent({
     }
 
     return {
-      ...toRefs(state), handleCancer, handleAddSubmit, handleEditTask, CONSTANT,
-      searchID, handleDelete, insRowStyle, formatExtraInfo, updateInsEnableStatus
+      ...toRefs(state), handleCancer, handleAddSubmit, handleEditTask, CONSTANT, CommonUtils,
+      searchID, handleDelete, insRowStyle, updateInsEnableStatus
     };
   },
 });
diff --git a/web/src/views/tabsTools/sendWays/sendWays.vue b/web/src/views/tabsTools/sendWays/sendWays.vue
index 613b0df..565155f 100644
--- a/web/src/views/tabsTools/sendWays/sendWays.vue
+++ b/web/src/views/tabsTools/sendWays/sendWays.vue
@@ -19,7 +19,7 @@
       <hr />
       <div ref="refContainer">
         <el-table :data="tableData" stripe empty-text="发信渠道为空" :row-style="rowStyle()">
-          <el-table-column label="ID" >
+          <el-table-column label="ID">
             <template #default="scope">
               {{ scope.row.id }}
               <el-icon>
@@ -28,7 +28,11 @@
             </template>
           </el-table-column>
           <el-table-column label="渠道名" prop="name" />
-          <el-table-column label="发信渠道" prop="type" />
+          <el-table-column label="发信渠道" prop="type">
+            <template #default="scope">
+              {{ CommonUtils.formatWayName(scope.row.type) }}
+            </template>
+          </el-table-column>
           <el-table-column label="创建时间" prop="created_on" />
           <el-table-column fixed="right" label="操作" width="100px">
             <template #default="scope">
@@ -63,6 +67,7 @@ import { CopyDocument } from '@element-plus/icons-vue'
 import { copyToClipboard } from '@/util/clipboard.js';
 import tableDeleteButton from '@/views/common/tableDeleteButton.vue'
 import { CONSTANT } from '@/constant'
+import { CommonUtils } from "@/util/commonUtils.js";
 
 export default {
   components: {
@@ -145,7 +150,7 @@ export default {
 
     return {
       ...toRefs(state), handleEdit, handleDelete,
-      clickAdd, rowStyle, handPageChange, filterFunc, copyToClipboard
+      clickAdd, rowStyle, handPageChange, filterFunc, copyToClipboard, CommonUtils
     };
   }
 }