From 6c60c48c61a2a5466557865df1be0a3c1265c873 Mon Sep 17 00:00:00 2001
From: KindSeven <2845382437@qq.com>
Date: Sun, 15 Sep 2024 22:11:26 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat:=E5=A4=84=E7=90=86=E4=BA=86=E7=94=B5?=
 =?UTF-8?q?=E8=AF=9D=E8=AF=A6=E7=BB=86=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   2 +
 src/components/infoLiveCall/index.vue         |   2 +-
 src/components/liveCall/LiveCallItem.vue      |   2 +-
 src/views/home/index.vue                      |   4 +-
 .../task-management/components/WorkDialog.vue | 104 +++++++++++-------
 .../historical-work-order/index.vue           |   2 +-
 .../pending-work-order/index.vue              |   2 +-
 vite.config.js                                |   6 +-
 8 files changed, 77 insertions(+), 47 deletions(-)

diff --git a/.gitignore b/.gitignore
index b737b8e..02cfede 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,8 @@ dist
 dist-ssr
 coverage
 *.local
+vite.config.js
+package-lock.json
 
 /cypress/videos/
 /cypress/screenshots/
diff --git a/src/components/infoLiveCall/index.vue b/src/components/infoLiveCall/index.vue
index 771230c..ecea1bf 100644
--- a/src/components/infoLiveCall/index.vue
+++ b/src/components/infoLiveCall/index.vue
@@ -25,6 +25,6 @@ defineExpose({
 
 <style>
 .box{
-    height: 65vh;
+    height: 68vh;
 }
 </style>
diff --git a/src/components/liveCall/LiveCallItem.vue b/src/components/liveCall/LiveCallItem.vue
index 9759e09..b0f225c 100644
--- a/src/components/liveCall/LiveCallItem.vue
+++ b/src/components/liveCall/LiveCallItem.vue
@@ -192,7 +192,7 @@ const initWebSocket = () => {
 <style lang="scss" scoped>
 .live-call {
   width: 48%;
-  height: 47.5vh;
+  height: 47vh;
   margin-bottom: 20px;
   overflow: hidden;
   border: 1px solid #d5d4d4;
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index ea5d158..ad9369a 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -14,7 +14,7 @@
 
 <script setup lang="jsx">
 import LiveCall from '@/components/liveCall/index.vue'
-import Voice from '@/components/voice/index.vue'
+import Voice from '@/components/Voice/index.vue'
 import infoLiveCall from '@/components/infoLiveCall/index.vue'
 const infoLiveCallRef=ref()
 const voiceRef=ref()
@@ -97,7 +97,7 @@ const tableConfig = reactive({
       label: '操作',
       align: 'center',
       fixed: 'right',
-      // width: 150,
+      width: 200,
       showOverflowTooltip: false,
       currentRender: ({ row, index }) => {
         // console.log(row);
diff --git a/src/views/task-management/components/WorkDialog.vue b/src/views/task-management/components/WorkDialog.vue
index 165c60c..6714d0d 100644
--- a/src/views/task-management/components/WorkDialog.vue
+++ b/src/views/task-management/components/WorkDialog.vue
@@ -13,8 +13,9 @@ const dialogVisible = ref(false);
 const props = defineProps({
     rowData: Object
 })
-let dataDetails = ref();
 let opsCallList = ref([]);
+// let mergedData = ref([]);
+
 const open = (row) => {
     dialogVisible.value = true;
 };
@@ -32,21 +33,48 @@ watch(() => props.rowData, (newRowData) => {
     if (newRowData) {
         // console.log(getData(newRowData));
         getData(newRowData).then((data) => {
-            // console.log(data.data);
-            dataDetails = data.data.opsCallList
+            const dataDetails = data.data.opsCallList
             // console.log(dataDetails);
-            // opsCallList = dataDetails.opsCallList
-            dataDetails.forEach(item => {
-                // console.log(item);      
-                opsCallList.value.push(item)
+            const theData=[{createTime:'',data:[]}]
+
+            dataDetails.forEach(for1data => {                
+                theData.forEach(for2data => { 
+                    if(for1data.createTime!==for2data.createTime){
+                        console.log(for2data);
+                        for2data.createTime=for1data.createTime
+                        // for2data.data.push(for1data)
+                        theData.push({createTime:for1data.createTime,data:[]})
+                    }else{
+                        for2data.data.push(for1data)
+                        return;
+                    }
+                })
             });
-            // console.log(opsCallList);
+            theData.pop()
+            // console.log(theData);
+            theData.forEach(item => {
+                opsCallList.value.push(item)
+            })
+            console.log(opsCallList.value);
+
+
+            // dataDetails.forEach(item => {
+            //     // console.log(item);      
+            //     opsCallList.value.push(item)
+            // });
+
+            // console.log(mergedData.value);
+
         })
     }
 }, {
     immediate: true // 立即执行一次，以便在rowData初始值非空时也能触发
 });
 // getData()
+function omitCreateTime(item) {
+    const { createTime, ...rest } = item;
+    return rest;
+}
 
 
 
@@ -82,22 +110,22 @@ const test2 = [
         size: "large",
     }
 ];
-const data = [
-    {
-        number: '17628661307',
-        state: '通话中',
-        time: '18 : 32',
-    },
-    {
-        number: '17628661307',
-        state: '已接通',
-        time: '18 : 32',
-    },
-    {
-        number: '17628661307',
-        state: '已接通',
-        time: '18 : 32',
-    }]
+// const data = [
+//     {
+//         number: '17628661307',
+//         state: '通话中',
+//         time: '18 : 32',
+//     },
+//     {
+//         number: '17628661307',
+//         state: '已接通',
+//         time: '18 : 32',
+//     },
+//     {
+//         number: '17628661307',
+//         state: '已接通',
+//         time: '18 : 32',
+//     }]
 defineExpose({
     open,
 });
@@ -107,7 +135,7 @@ defineExpose({
 </script>
 
 <template>
-    <el-dialog v-model="dialogVisible" :show-close=true title="工单详情" width="80%" overflow: auto>
+    <el-dialog v-model="dialogVisible" :show-close=true title="工单详情" width="80%">
         <div class="common-layout">
             <el-container>
                 <el-header class="header"><span>工单号：</span>
@@ -140,7 +168,7 @@ defineExpose({
                             <div>
                                 <div>工单内容：</div>
                                 <div class="textBox">
-                                    <el-scrollbar >
+                                    <el-scrollbar>
                                         <div class="text">{{ rowData.orderContent }}</div>
                                     </el-scrollbar>
                                 </div>
@@ -148,7 +176,7 @@ defineExpose({
                             <div>
                                 <div>处理内容：</div>
                                 <div class="textBox">
-                                    <el-scrollbar >
+                                    <el-scrollbar>
                                         <div class="text">{{ rowData.processedContent }}</div>
                                     </el-scrollbar>
                                 </div>
@@ -157,7 +185,7 @@ defineExpose({
                             <div>
                                 <div>录音信息：</div>
                                 <div class="textBox">
-                                    <el-scrollbar >
+                                    <el-scrollbar>
                                         <div class="text">{{ rowData.recordUrl }}</div>
                                     </el-scrollbar>
                                 </div>
@@ -175,17 +203,17 @@ defineExpose({
                                                 :size="activity.size">
                                                 <div class="custom-card">
                                                     <div>{{ activity.createTime }}</div>
-                                                    <!-- <div v-for="(info, index) in data" :key="index"> -->
-                                                    <div>
-                                                        <span :style="{ color: '#a8abb2' }">{{ activity.callIdNumber
-                                                            }}</span>
-                                                        <span :style="{
-                                                            color: activity.callState === '通话中' ? '#6cc23a' : '#409eff'
-                                                        }">{{ activity.callState }}</span>
-                                                        <span class="span-3th" :style="{ color: '#a8abb2' }">{{
-                                                            activity.answer_time }}</span>
+                                                    <div v-for="(info, index) in activity.data" :key="index">
+                                                        <div>
+                                                            <span :style="{ color: '#a8abb2' }">{{ info.callIdNumber
+                                                                }}</span>
+                                                            <span :style="{
+                                                                color: info.callState === '通话中' ? '#6cc23a' : '#409eff'
+                                                            }">{{ info.callState }}</span>
+                                                            <span class="span-3th" :style="{ color: '#a8abb2' }">{{
+                                                                info.answer_time }}</span>
+                                                        </div>
                                                     </div>
-                                                    <!-- </div> -->
                                                 </div>
                                             </el-timeline-item>
                                         </el-timeline>
diff --git a/src/views/task-management/historical-work-order/index.vue b/src/views/task-management/historical-work-order/index.vue
index 8f5a797..55a0c0d 100644
--- a/src/views/task-management/historical-work-order/index.vue
+++ b/src/views/task-management/historical-work-order/index.vue
@@ -233,7 +233,7 @@ const tableConfig = reactive({
     }
   ],
   api: '/order/list',
-  params: {},
+  params: {state:"1",name:"已处理"},
   btns: [
     // {name: '新增', key: 'add', color: '#DED0B2', auth: auths.report},
   ]
diff --git a/src/views/task-management/pending-work-order/index.vue b/src/views/task-management/pending-work-order/index.vue
index 8f5a797..549fc6c 100644
--- a/src/views/task-management/pending-work-order/index.vue
+++ b/src/views/task-management/pending-work-order/index.vue
@@ -233,7 +233,7 @@ const tableConfig = reactive({
     }
   ],
   api: '/order/list',
-  params: {},
+  params: {state:"0",name:"待处理"},
   btns: [
     // {name: '新增', key: 'add', color: '#DED0B2', auth: auths.report},
   ]
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 c08f9dd7eb4b460e90b7815c29967e7c3564d270 Mon Sep 17 00:00:00 2001
From: KindSeven <2845382437@qq.com>
Date: Sun, 15 Sep 2024 22:19:54 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feat:=E5=AE=9E=E9=AA=8C=E5=BF=BD=E7=95=A5?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 02cfede..47065f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,8 +13,10 @@ dist
 dist-ssr
 coverage
 *.local
-vite.config.js
-package-lock.json
+
+/vite.config.js
+/package-lock.json
+/.gitignore
 
 /cypress/videos/
 /cypress/screenshots/

From 307ea2282ac09ba88aef3d914d206c332abe509e Mon Sep 17 00:00:00 2001
From: KindSeven <2845382437@qq.com>
Date: Sun, 15 Sep 2024 22:30:10 +0800
Subject: [PATCH 3/4] update .gitignore

---
 .gitignore     | 32 ------------------
 vite.config.js | 91 --------------------------------------------------
 2 files changed, 123 deletions(-)
 delete mode 100644 .gitignore
 delete mode 100644 vite.config.js

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 47065f2..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-lerna-debug.log*
-
-node_modules
-.DS_Store
-dist
-dist-ssr
-coverage
-*.local
-
-/vite.config.js
-/package-lock.json
-/.gitignore
-
-/cypress/videos/
-/cypress/screenshots/
-
-# Editor directories and files
-.vscode
-!.vscode/extensions.json
-.idea
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
diff --git a/vite.config.js b/vite.config.js
deleted file mode 100644
index 3ba2d72..0000000
--- a/vite.config.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import {fileURLToPath, URL} from "node:url";
-import {defineConfig} from "vite";
-import AutoImport from "unplugin-auto-import/vite";
-import Components from "unplugin-vue-components/vite";
-import {ElementPlusResolver} from "unplugin-vue-components/resolvers";
-import Icons from "unplugin-icons/vite";
-import IconsResolver from "unplugin-icons/resolver";
-import vue from "@vitejs/plugin-vue";
-import vueJsx from "@vitejs/plugin-vue-jsx";
-import Inspect from "vite-plugin-inspect";
-import viteSvgIcons from "vite-plugin-svg-icons";
-import path from "path";
-// https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [
-    vue(),
-    vueJsx(),
-    AutoImport({
-      //自动导入vue相关函数
-      imports: ["vue", "vue-router"],
-
-      resolvers: [
-        ElementPlusResolver(),
-        //自动导入图标组件
-        IconsResolver({
-          prefix: "Icon",
-        }),
-      ],
-    }),
-    Components({
-      dirs: ["src/components", "src/fvcomponents"],
-      resolvers: [
-        // 自动注册图标组件
-        IconsResolver({
-          enabledCollections: ["ep"],
-        }),
-        //自动导入组件
-        ElementPlusResolver(),
-      ],
-    }),
-    Icons({
-      autoInstall: true,
-    }),
-    viteSvgIcons({
-      // 指定需要缓存的图标文件夹
-      iconDirs: [path.resolve(__dirname, "src/assets/svg")],
-      // 指定symbolId格式
-      symbolId: "icon-[dir]-[name]",
-    }),
-    Inspect(),
-  ],
-  resolve: {
-    alias: {
-      "@": fileURLToPath(new URL("./src", import.meta.url)),
-    },
-  },
-  build: {
-    minify: "esbuild",
-    terserOptions: {
-      compress: {
-        drop_console: false, // 生产环境移除log
-        drop_debugger: false, // 生产环境禁用debugger
-      },
-    },
-  },
-  server: {
-    host: "0.0.0.0",
-    port: 8888,
-    strictPort: false,
-    open: true,
-    proxy: {
-      // "/api/custom/": {
-      //   target: "http://clay.frp.feashow.cn",
-      //   // target: "http://10.7.127.57:8000",
-      //   changeOrigin: true,
-      //   rewrite: (path) => path.replace(/^\/api/, ""),
-      // },
-      "/api": {
-        target: "http://frp.feashow.cn:31800/",
-        // target: "http://112.19.165.99:20002/",
-        changeOrigin: true,
-        rewrite: (path) => path.replace(/^\/api/, ""),
-      },
-      // "/socket": {
-      //   target: "ws://frp.feashow.cn:8081/ws",
-      //   changeOrigin: true,
-      //   rewrite: (path) => path.replace(/^\/api/, ""),
-      // }
-    },
-  },
-});

From 704462b2a19086b9a5aebf19487c05e4f363d709 Mon Sep 17 00:00:00 2001
From: KindSeven <2845382437@qq.com>
Date: Sun, 15 Sep 2024 22:50:48 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=A4=8D=E5=8E=9F=E4=BA=86=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4vite=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task-management/components/WorkDialog.vue |  2 +-
 vite.config.js                                | 91 +++++++++++++++++++
 2 files changed, 92 insertions(+), 1 deletion(-)
 create mode 100644 vite.config.js

diff --git a/src/views/task-management/components/WorkDialog.vue b/src/views/task-management/components/WorkDialog.vue
index 6714d0d..1d7059e 100644
--- a/src/views/task-management/components/WorkDialog.vue
+++ b/src/views/task-management/components/WorkDialog.vue
@@ -21,7 +21,7 @@ const open = (row) => {
 };
 
 const getData = async () => {
-    console.log(123);
+    // console.log(123);
     const data = await orderGetDetails(props.rowData.orderNumber)
 
     // console.log("111", data);
diff --git a/vite.config.js b/vite.config.js
new file mode 100644
index 0000000..a3ab326
--- /dev/null
+++ b/vite.config.js
@@ -0,0 +1,91 @@
+import {fileURLToPath, URL} from "node:url";
+import {defineConfig} from "vite";
+import AutoImport from "unplugin-auto-import/vite";
+import Components from "unplugin-vue-components/vite";
+import {ElementPlusResolver} from "unplugin-vue-components/resolvers";
+import Icons from "unplugin-icons/vite";
+import IconsResolver from "unplugin-icons/resolver";
+import vue from "@vitejs/plugin-vue";
+import vueJsx from "@vitejs/plugin-vue-jsx";
+import Inspect from "vite-plugin-inspect";
+import viteSvgIcons from "vite-plugin-svg-icons";
+import path from "path";
+// https://vitejs.dev/config/
+export default defineConfig({
+  plugins: [
+    vue(),
+    vueJsx(),
+    AutoImport({
+      //自动导入vue相关函数
+      imports: ["vue", "vue-router"],
+
+      resolvers: [
+        ElementPlusResolver(),
+        //自动导入图标组件
+        IconsResolver({
+          prefix: "Icon",
+        }),
+      ],
+    }),
+    Components({
+      dirs: ["src/components", "src/fvcomponents"],
+      resolvers: [
+        // 自动注册图标组件
+        IconsResolver({
+          enabledCollections: ["ep"],
+        }),
+        //自动导入组件
+        ElementPlusResolver(),
+      ],
+    }),
+    Icons({
+      autoInstall: true,
+    }),
+    viteSvgIcons({
+      // 指定需要缓存的图标文件夹
+      iconDirs: [path.resolve(__dirname, "src/assets/svg")],
+      // 指定symbolId格式
+      symbolId: "icon-[dir]-[name]",
+    }),
+    Inspect(),
+  ],
+  resolve: {
+    alias: {
+      "@": fileURLToPath(new URL("./src", import.meta.url)),
+    },
+  },
+  build: {
+    minify: "esbuild",
+    terserOptions: {
+      compress: {
+        drop_console: false, // 生产环境移除log
+        drop_debugger: false, // 生产环境禁用debugger
+      },
+    },
+  },
+  server: {
+    host: "0.0.0.0",
+    port: 8888,
+    strictPort: false,
+    open: true,
+    proxy: {
+      // "/api/custom/": {
+      //   target: "http://clay.frp.feashow.cn",
+      //   // target: "http://10.7.127.57:8000",
+      //   changeOrigin: true,
+      //   rewrite: (path) => path.replace(/^\/api/, ""),
+      // },
+      "/api": {
+        // target: "http://frp.feashow.cn:31800/",
+        target: "http://112.19.165.99:20002/",
+        changeOrigin: true,
+        // rewrite: (path) => path.replace(/^\/api/, ""),
+      },
+      // "/socket": {
+      //   target: "ws://frp.feashow.cn:8081/ws",
+      //   changeOrigin: true,
+      //   rewrite: (path) => path.replace(/^\/api/, ""),
+      // }
+    },
+  },
+});