From 8b8a6a8bd54349f18cf9ffbd1702f80938f9448b Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 16 Sep 2024 21:18:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat=20:=20=E8=AF=9D=E5=8A=A1=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/phone-traffic-config/index.js         |  36 ++
 .../phone-traffic-config/index.vue            | 339 ++++++++++++++----
 2 files changed, 312 insertions(+), 63 deletions(-)
 create mode 100644 src/api/phone-traffic-config/index.js

diff --git a/src/api/phone-traffic-config/index.js b/src/api/phone-traffic-config/index.js
new file mode 100644
index 0000000..9c53096
--- /dev/null
+++ b/src/api/phone-traffic-config/index.js
@@ -0,0 +1,36 @@
+import request from '@/utils/request.js'
+
+// 获取参数配置表详情
+export const getConfigDetails = (configId,extraConfigType) => {
+    return request({
+        url: `/extra/config/${configId}/${extraConfigType}`,
+        method: 'get'
+    })
+}
+
+// 新增参数配置表
+export const addConfig = (data) => {
+    return request({
+        url: '/extra/config',
+        method: 'post',
+        data
+    })
+}
+
+// 修改参数配置表
+export const editConfig = (data) => {
+    return request({
+        url: '/extra/config',
+        method: 'put',
+        data
+    })
+}
+
+// 删除参数配置表
+export const delConfig =(configIdList,extraConfigType) => {
+    return request({
+        url: `/extra/config/${configIdList}/${extraConfigType}`,
+        method: 'delete'
+    })
+}
+
diff --git a/src/views/phone-traffic-management/phone-traffic-config/index.vue b/src/views/phone-traffic-management/phone-traffic-config/index.vue
index 0180f05..a3aad88 100644
--- a/src/views/phone-traffic-management/phone-traffic-config/index.vue
+++ b/src/views/phone-traffic-management/phone-traffic-config/index.vue
@@ -1,72 +1,142 @@
 <template>
-  <fvSearchForm :searchConfig="searchConfig" @search="search">
-  </fvSearchForm>
-  <fvTable ref="tableIns" :tableConfig="tableConfig" :data="mockData" @headBtnClick="headBtnClick"></fvTable>
+  <fvSearchForm :searchConfig="searchConfig" @search="searchPhoneTraffic"></fvSearchForm>
+  <fvTable ref="tableIns" :tableConfig="phoneTrafficTableConfig"  @headBtnClick="headBtnClick" @selectionChange="selectionChange"></fvTable>
+  <fvFormDialog ref="formDialogRef" :title="dialogTitle" :dialogType="dialogType"
+                :form-schema="formSchema" :form-rules="formRules"
+                @dialogSubmit="handleSubmitAddressBook"></fvFormDialog>
 </template>
 
 <script setup lang="jsx">
 import { shallowRef } from 'vue';
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
+import {ElMessage, ElMessageBox} from "element-plus";
+import {addConfig, delConfig, editConfig, getConfigDetails} from "@/api/phone-traffic-config";
 const router = useRouter()
 const tableIns = ref()
-const mockData = ref([
-  {
-    workOrderNumber: 1211,
-    workOrderTime: '2022-02-09 00 : 12',
-    state: 0,
-    callState: 0
-  },
-  {
-    workOrderNumber: 232,
-    state: 1,
-    callState: 1
-  }
-])
+const formDialogRef = ref()
+const extraConfigType = ref(0)
+const contactIds = ref("");
+const dialogTitle = ref("");
+const dialogType = ref("");
+const formRules = reactive({
+  configName: [
+    {required: true, message: "参数名称不能为空", trigger: "blur"},
+  ],
+  configKey: [
+    {required: true, message: "参数键名不能为空", trigger: "blur"},
+  ],
+  configValue: [
+    {required: true, message: "参数键值不能为空", trigger: "blur"},
+  ],
+  configType: [
+    {required: true, message: "系统内置不能为空", trigger: "change"},
+  ],
+});
+const formSchema = computed(() => {
+  return [
+    {
+      label: '参数名称',
+      prop: 'configName',
+      component: 'el-input',
+      colProps: {
+        span: 24
+      },
+      props: {
+        placeholder: '请输入参数名称',
+        clearable: true,
+      }
+    },
+    {
+      label: '参数键名',
+      prop: 'configKey',
+      component: 'el-input',
+      colProps: {
+        span: 24
+      },
+      props: {
+        placeholder: '请输入参数键名',
+        clearable: true,
+      }
+    },
+    {
+      label: '参数键值',
+      prop: 'configValue',
+      component: 'el-input',
+      colProps: {
+        span: 24
+      },
+      props: {
+        placeholder: '请输入参数键值',
+        clearable: true,
+      }
+    },
+    {
+      label: '系统内置',
+      prop: 'configType',
+      component: shallowRef(fvSelect),
+      colProps: {
+        span: 24
+      },
+      props: {
+        placeholder: '请选择系统内置',
+        cacheKey: 'yes_no',
+        clearable: true,
+        filterable: true,
+      }
+    },
+    {
+      label: '备注',
+      prop: 'remark',
+      component: 'el-input',
+      colProps: {
+        span: 24
+      },
+      props: {
+        placeholder: '请输入备注',
+        clearable: true,
+      },
+    }
+  ]
+})
 const searchConfig = reactive([
   {
-    label: '配置ID',
-    prop: 'requirementName',
+    label: '参数名称',
+    prop: 'configName',
     props: {
-      placeholder: '请输入配置ID查询',
+      placeholder: '请输入参数名称查询',
       clearable: true,
       checkStrictly: true
     },
     component: 'el-input',
   },
   {
-    label: '名称',
-    prop: 'requirementName',
+    label: '参数键名',
+    prop: 'configKey',
     props: {
-      placeholder: '请输入名称查询',
+      placeholder: '请输入参数键名查询',
       clearable: true,
       checkStrictly: true
     },
     component: 'el-input',
   },
   {
-    label: '状态',
-    prop: 'requirementName',
+    label: '系统内置',
+    prop: 'configType',
     props: {
-      placeholder: '请选择状态查询',
-      cacheKey: 'work_order_status',
+      placeholder: '请选择系统内置查询',
+      cacheKey: 'yes_no',
       clearable: true,
       filterable: true,
     },
     component: shallowRef(fvSelect),
-  },
-  {
-    label: '创建日期',
-    prop: 'requirementName',
-    props: {
-      placeholder: '请选择',
-      clearable: true,
-      checkStrictly: true
-    },
-    component: 'el-date-picker',
   }
 ])
-const tableConfig = reactive({
+const phoneTrafficTableConfig = reactive({
   columns: [
+    {
+      type: 'selection',
+      prop: 'selection'
+    },
     {
       prop: 'index',
       type: 'index',
@@ -75,62 +145,205 @@ const tableConfig = reactive({
       width: 80,
     },
     {
-      prop: 'workOrderNumber',
-      label: '配置ID',
+      prop: 'configName',
+      label: '参数名称',
       align: 'center'
     },
     {
-      prop: 'workOrderNumber',
-      label: '名称',
+      prop: 'configKey',
+      label: '参数键名',
       align: 'center'
     },
     {
-      prop: 'workOrderNumber',
-      label: '类型',
+      prop: 'configValue',
+      label: '参数键值',
       align: 'center'
     },
     {
-      prop: 'workOrderNumber',
-      label: '内容',
-      align: 'center'
-    },
-    {
-      prop: 'state',
-      label: '状态',
+      prop: 'configType',
+      label: '系统内置',
       align: 'center',
-      showOverflowTooltip: false,
       currentRender: ({ row, index }) => {
-        if (row.state !== null) {
-          return (<Tag dictType={'work_order_status'} value={row.state} />)
+        if (row.configType !== null) {
+          return (<Tag dictType={'yes_no'} value={row.configType} />)
         } else {
           return '--'
         }
       }
     },
-    {
-      prop: 'workOrderTime',
-      label: '创建时间',
-      align: 'center',
-      width: 200
-    },
+    // {
+    //   prop: 'workOrderTime',
+    //   label: '创建时间',
+    //   align: 'center',
+    //   width: 200
+    // },
     {
       prop: 'remark',
       label: '备注',
       align: 'center',
-      width: 200
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      fixed: 'right',
+      width: 150,
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        let btn = []
+        btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
+        btn.push({label: '删除', func: () => handleSingleDelete(row), type: 'danger'})
+        return (
+            <div style={{width: '100%'}}>
+              {
+                btn.map(item => (
+                    <el-button
+                        type={item.type}
+                        // v-perm={item.prem}
+                        onClick={() => item.func()}
+                        link
+                    >
+                      {item.label}
+                    </el-button>
+                ))
+              }
+            </div>
+        )
+      }
     }
   ],
-  api: '',
-  params: {},
+  api: '/extra/config',
+  params: {
+    extraConfigType:extraConfigType.value
+  },
   btns: [
-    {name: '新增', key: 'add',type:'primary',icon:'Plus'},
+    {name: '新增', key: 'add',type:'primary'},
+    {name: '删除', key: 'delete', type: 'danger'},
   ]
 })
+const searchPhoneTraffic = (val) => {
+  let obj = {...val}
+  if (obj.dateValue) {
+    obj.startTime = obj.dateValue[0]
+    obj.endTime = obj.dateValue[1]
+    delete obj.dateValue
+  }
+  phoneTrafficTableConfig.params = obj
+  tableIns.value.refresh()
+}
+
 const headBtnClick = (key) => {
   switch (key) {
     case 'add':
       handleAdd()
       break;
+    case 'delete':
+      handleMoreDelete()
+      break;
+  }
+}
+
+const handleAdd = () => {
+  formDialogRef.value.openOrCloseDialog(true)
+  dialogTitle.value = "新增话务配置";
+  dialogType.value = "add";
+  nextTick(() => {
+    formDialogRef.value.getFormInstance().setValues({})
+    // 清空校验
+    formDialogRef.value.getFormInstance().clearValidate()
+    formDialogRef.value.getFormInstance().resetFields()
+  })
+}
+const handleEdit = (row) => {
+  formDialogRef.value.openOrCloseDialog(true)
+  getDetail(row)
+  dialogTitle.value = "编辑话务配置";
+  dialogType.value = "edit";
+}
+const getDetail = (row) => {
+  getConfigDetails(row.configId,extraConfigType.value).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg)
+      nextTick(() => {
+        formDialogRef.value.getFormInstance().setValues(res.data)
+        // 清空校验
+        formDialogRef.value.getFormInstance().clearValidate()
+      })
+    } else {
+    }
+  })
+}
+
+const selectionChange = (selection) => {
+  if (selection.length !== 0) {
+    contactIds.value = selection.map(item => item.configId).join()
+  } else {
+    contactIds.value=''
+  }
+}
+const deleteContactMethod = (configId) => {
+  delConfig(configId,extraConfigType.value).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg)
+      tableIns.value.refresh()
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
+}
+const handleMoreDelete = () => {
+  if(contactIds.value){
+    ElMessageBox.confirm(`确认删除选择的话务配置吗?`, '系统提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }).then(() => {
+      deleteContactMethod(contactIds.value)
+    })
+  }else{
+    ElMessage.warning("请选择要删除的话务配置")
+  }
+}
+const handleSingleDelete = (row) => {
+  ElMessageBox.confirm(`确认删除参数名称为${row.configName}的话务配置吗?`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    deleteContactMethod(row.configId)
+  })
+}
+
+//提交
+const handleSubmitAddressBook = async (formInstance) => {
+  if (!formInstance) return;
+  let validate = await formInstance.validate()
+  if (!validate.isValidate) return;
+  let params={
+    ...formInstance.getValues(),
+    configType:parseInt(formInstance.getValues().configType),
+    extraConfigType:extraConfigType.value
+  }
+  if (dialogType.value === "add") {
+    addConfig(params).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success(res.msg);
+        tableIns.value.refresh()
+        formDialogRef.value.openOrCloseDialog(false)
+      } else {
+        ElMessage.error(res.msg);
+      }
+    });
+  } else {
+    editConfig(params).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success(res.msg);
+        tableIns.value.refresh()
+        formDialogRef.value.openOrCloseDialog(false)
+      } else {
+        ElMessage.error(res.msg);
+      }
+    });
   }
 }
 </script>

From 8811172d1ee27cb191c9a6cedfc99d6ae37cbab4 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Mon, 16 Sep 2024 21:25:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E8=AF=9D?=
 =?UTF-8?q?=E5=8A=A1=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/liveCall/index.vue                           | 6 +++---
 .../phone-traffic-management/phone-traffic-config/index.vue | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/liveCall/index.vue b/src/components/liveCall/index.vue
index 9c49219..f2fd824 100644
--- a/src/components/liveCall/index.vue
+++ b/src/components/liveCall/index.vue
@@ -122,13 +122,13 @@ const initWebSocket = () => {
         console.log("服务器返回的信息: ", data);
         if(data.type=='1'){
             recordLeftObj.value.content.push(data.content)
-          console.info("🚀 ~method:onmessage -----", recordLeftObj.value)
+          // console.info("🚀 ~method:onmessage -----", recordLeftObj.value)
           nextTick(() => {
             scrollToBottom(recordLeftRef.value)
           })
         }else {
             recordRightObj.value.content.push(data.content)
-          console.info("🚀 ~method:onmessage -----", recordRightObj.value)
+          // console.info("🚀 ~method:onmessage -----", recordRightObj.value)
           nextTick(() => {
             scrollToBottom(recordRightRef.value);
           })
@@ -138,7 +138,7 @@ const initWebSocket = () => {
     }
     //连接关闭的回调方法
     socket.onclose = function () {
-      initWebSocket()
+      // initWebSocket()
       console.log("ws连接关闭");
     }
     setInterval(() => {
diff --git a/src/views/phone-traffic-management/phone-traffic-config/index.vue b/src/views/phone-traffic-management/phone-traffic-config/index.vue
index a3aad88..64ea87f 100644
--- a/src/views/phone-traffic-management/phone-traffic-config/index.vue
+++ b/src/views/phone-traffic-management/phone-traffic-config/index.vue
@@ -222,7 +222,7 @@ const phoneTrafficTableConfig = reactive({
   ]
 })
 const searchPhoneTraffic = (val) => {
-  let obj = {...val}
+  let obj = {...val,extraConfigType:extraConfigType.value}
   if (obj.dateValue) {
     obj.startTime = obj.dateValue[0]
     obj.endTime = obj.dateValue[1]