Merge pull request 'fix :修复分页问题' (#230) from dj into master

Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/230

auto-imports.d.ts

@@ -5,6 +5,7 @@
 export {}
 declare global {
   const EffectScope: typeof import('vue')['EffectScope']
+  const ElMessage: typeof import('element-plus/es')['ElMessage']
   const computed: typeof import('vue')['computed']
   const createApp: typeof import('vue')['createApp']
   const customRef: typeof import('vue')['customRef']

components.d.ts

@@ -11,26 +11,22 @@ declare module '@vue/runtime-core' {
   export interface GlobalComponents {
     ElAside: typeof import('element-plus/es')['ElAside']
     ElAvatar: typeof import('element-plus/es')['ElAvatar']
-    ElBadge: typeof import('element-plus/es')['ElBadge']
     ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
     ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
     ElButton: typeof import('element-plus/es')['ElButton']
-    ElCard: typeof import('element-plus/es')['ElCard']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
-    ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElContainer: typeof import('element-plus/es')['ElContainer']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
-    ElDrawer: typeof import('element-plus/es')['ElDrawer']
     ElEmpty: typeof import('element-plus/es')['ElEmpty']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
+    ElHeader: typeof import('element-plus/es')['ElHeader']
     ElIcon: typeof import('element-plus/es')['ElIcon']
-    ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElMain: typeof import('element-plus/es')['ElMain']
@@ -41,26 +37,25 @@ declare module '@vue/runtime-core' {
     ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRadio: typeof import('element-plus/es')['ElRadio']
-    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
-    ElRate: typeof import('element-plus/es')['ElRate']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElStep: typeof import('element-plus/es')['ElStep']
+    ElSpace: typeof import('element-plus/es')['ElSpace']
-    ElSteps: typeof import('element-plus/es')['ElSteps']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
-    ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElText: typeof import('element-plus/es')['ElText']
+    ElTimeline: typeof import('element-plus/es')['ElTimeline']
+    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
     ElUpload: typeof import('element-plus/es')['ElUpload']
     FvCheckbox: typeof import('./src/fvcomponents/fvCheckbox/index.vue')['default']
     FvForm: typeof import('./src/fvcomponents/fvForm/index.vue')['default']
+    FvFormDialog: typeof import('./src/fvcomponents/fvFormDialog/index.vue')['default']
     FvPagination: typeof import('./src/fvcomponents/fvPagination/index.vue')['default']
     FvRadio: typeof import('./src/fvcomponents/fvRadio/index.vue')['default']
     FvSearchForm: typeof import('./src/fvcomponents/fvSearchForm/index.vue')['default']
@@ -74,18 +69,21 @@ declare module '@vue/runtime-core' {
     IconSelect: typeof import('./src/components/iconSelect/index.vue')['default']
     IconSupport: typeof import('./src/components/icons/IconSupport.vue')['default']
     IconTooling: typeof import('./src/components/icons/IconTooling.vue')['default']
-    JavaCodeEdit: typeof import('./src/components/codeEdit/JavaCodeEdit.vue')['default']
+    ImportExcel: typeof import('./src/components/ImportExcel.vue')['default']
-    JsCodeEdit: typeof import('./src/components/codeEdit/JsCodeEdit.vue')['default']
+    InfoLiveCall: typeof import('./src/components/infoLiveCall/index.vue')['default']
+    LiveCall: typeof import('./src/components/liveCall/index.vue')['default']
+    LiveCallItem: typeof import('./src/components/liveCall/LiveCallItem.vue')['default']
+    LiveCallItemHome: typeof import('./src/components/liveCall/LiveCallItemHome.vue')['default']
     Pagination: typeof import('./src/components/pagination/index.vue')['default']
     ParentView: typeof import('./src/components/ParentView.vue')['default']
     PointTag: typeof import('./src/components/PointTag.vue')['default']
     PopoverDelete: typeof import('./src/components/PopoverDelete.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
-    SqlCodeEdit: typeof import('./src/components/codeEdit/SqlCodeEdit.vue')['default']
     SvgIcon: typeof import('./src/components/svgIcon/index.vue')['default']
     Tag: typeof import('./src/components/Tag.vue')['default']
     TheWelcome: typeof import('./src/components/TheWelcome.vue')['default']
+    Voice: typeof import('./src/components/voice/index.vue')['default']
     WelcomeItem: typeof import('./src/components/WelcomeItem.vue')['default']
   }
   export interface ComponentCustomProperties {

docker.sh

@@ -1,11 +1,4 @@
 #!/bin/sh
-# 定义应用组名
-group_name='clay'
-# 定义应用名称
-app_name=$DRONE_REPO_NAME
-# 定义应用版本
-app_version=$DRONE_COMMIT
-echo ${app_version}
 # 打包编译docker镜像
 docker rm -f smartopsweb
 docker rmi smartopsweb:latest

src/api/address-book/index.js

@@ -1,4 +1,6 @@
 import request from '@/utils/request.js'
+import axios from "axios";
+import {getToken} from "@/utils/auth";
 
 export const addContact = (data) => {
   return request({
@@ -28,3 +30,23 @@ export const deleteContact = (contactIds) => {
     method: 'delete'
   })
 }
+
+export const importContact = (data) => {
+  return request({
+    url: '/contact/import',
+    method: 'post',
+    data
+  })
+}
+
+export const exportContact = (data) => {
+  return axios.post(
+      `${import.meta.env.VITE_BASE_URL}/contact/export`,data,
+      {
+        responseType: 'blob',
+        headers: {
+          Authorization: getToken()
+        }
+      }
+  );
+}

src/api/order/order.js

@@ -11,8 +11,9 @@ export const orderGetList=(params)=>{
 
 export const orderGetDetails =(params)=>{
     return request({
-        url:`/order/info/${params}`,
+        url:'/order/info',
-        method:'get'
+        method:'get',
+        params
     })
 }
 
@@ -31,10 +32,11 @@ export const orderdDetele =(params)=>{
     })
 }
 
-export const orderdClose =(params)=>{
+export const orderdClose =(data)=>{
     return request({
-        url:`/order/${params}`,
+        url:'/order/close',
-        method:'post'
+        method:'post',
+        data
     })
 }
 

src/api/verbal-trick/index.js

@@ -7,6 +7,13 @@ export const addVerbal = (data) => {
     data
   })
 }
+export const addEnhanceVerbal = (data) => {
+  return request({
+    url: '/verbal/add/enhance',
+    method: 'post',
+    data
+  })
+}
 export const getVerbalDetail = (verbalId) => {
   return request({
     url: `/verbal/${verbalId}`,
@@ -22,6 +29,14 @@ export const editVerbal = (data) => {
   })
 }
 
+export const editEnhanceVerbal = (data) => {
+  return request({
+    url: '/verbal/update/enhance',
+    method: 'post',
+    data
+  })
+}
+
 export const deleteVerbal = (verbalIds) => {
   return request({
     url: `/verbal/${verbalIds}`,

src/api/workbench/index.js

@@ -3,8 +3,9 @@ import request from '@/utils/request.js'
 //获取历史通话文本记录
 export const getHistoryCallContent=(params)=>{
     return request({
-        url:`/text/history/list/${params}`,
+        url:`/text/history/list`,
-        method:'get'
+        method:'get',
+        params
     })
 }
 //获取工作台当前线路记录

src/components/ImportExcel.vue

@@ -0,0 +1,105 @@
+<template>
+  <el-upload :file-list="[]"
+             :limit="maxSize"
+             with-credentials
+             :multiple="multiple"
+             :http-request="httpRequestHandle"
+             :data="uploadParams"
+             :auto-upload="true"
+             :show-file-list="false"
+             :before-upload="beforeUpload"
+             :on-remove="handleRemove"
+  >
+    <el-button type="warning" style="margin-left: 10px; margin-right: 10px;" :loading="loading" v-perm="['order:contacts:import']" :disabled="disabled">导入</el-button>
+  </el-upload>
+</template>
+
+<script setup>
+import {ElMessageBox, ElNotification} from "element-plus";
+import {getToken} from '@/utils/auth'
+import axios from "axios";
+
+const props = defineProps({
+  value: {
+    type: Array,
+    default: () => {
+      return []
+    }
+  },
+  maxSize: {
+    type: Number,
+    default: 30
+  },
+  disabled: {
+    type: Boolean,
+    default: false
+  },
+  multiple: {
+    type: Boolean,
+    default: false
+  },
+})
+
+const loading = ref(false)
+const baseURL = import.meta.env.VITE_BASE_URL
+const uploadFileUrl = ref(baseURL + "/contact/import")
+const headers = reactive({
+  authorization: getToken()
+})
+const uploadParams = ref({})
+const emit = defineEmits(["input", "getFile", "delete"])
+
+const handleRemove = (file) => {
+  emit("delete", file.response.data.id)
+}
+const beforeUpload = () => {
+  loading.value = true
+  return true
+}
+const httpRequestHandle = (param) => {
+  // loading.value=true
+  let file = param.file
+  axios.post(uploadFileUrl.value, {
+    file: file
+  }, {
+    headers: {
+      'Content-Type': 'multipart/form-data',
+      ...headers
+    }
+  }).then(res => {
+    loading.value=false
+    handleUploadSuccess(res)
+  }).catch(error => {
+    loading.value=false
+    uploadError(error)
+  })
+}
+const handleUploadSuccess = (res) => {
+  let data = res.data
+  ElNotification({
+    title: '提示',
+    message: data.code === 1000 ? '导入成功' : '导入失败',
+    type: data.code === 1000 ? 'success' : 'error'
+  })
+  emit("success")
+}
+const uploadError = (error) => {
+  loading.value = false
+  ElNotification({
+    title: '提示',
+    message: "导入失败，请稍后再试！",
+    type: 'error'
+  })
+}
+defineExpose({
+  handleRemove
+})
+</script>
+
+<style lang="scss" scoped>
+a {
+  font-size: 14px;
+  color: #2a99ff;
+}
+
+</style>

src/components/infoLiveCall/index.vue

@@ -8,8 +8,8 @@ const recordLeftRef = ref(null);
 const emit = defineEmits(['update:value'])
 const props = defineProps({
   value: {
-    type:String,
+    type:Object,
-    default:''
+    default:{}
   }
 })
 
@@ -54,7 +54,12 @@ watch(() => props.value, async (newVal) => {
 })
 const getHistoryDetail=(newVal)=>{
   detailLoading.value=true
-   getHistoryCallContent(newVal).then(res => {
+  let param={
+      orderNumber:newVal.orderNumber,
+      alarmObject :newVal.alarmObject,
+      alarmUnit :newVal.alarmUnit,
+    }
+   getHistoryCallContent(param).then(res => {
      if (res.code === 1000) {
        detailLoading.value=false
        res.data?.forEach(item => {
@@ -69,6 +74,7 @@ const getHistoryDetail=(newVal)=>{
          leftHeadData.value.orderName = res.data[0].orderName || '--';
        }
      } else {
+       detailLoading.value=false
        ElMessage.error(res.msg);
      }
   })

src/components/liveCall/LiveCallItemHome.vue

@@ -6,8 +6,12 @@
         <span>电话号码：{{ recordObj.phone || '--' }}</span>
       </div>
       <div><span>工单名称：{{ recordObj.orderName || '--' }}</span></div>
-      <div v-if="recordObj.type"><el-tag>{{ recordObj.type=='1'?'线路一':recordObj.type=='2'?'线路二':'' }}</el-tag></div>
+      <div v-if="recordObj.type">
-      <div v-else><el-tag>{{ lineName  }}</el-tag></div>
+        <el-tag>{{ recordObj.type == '1' ? '线路一' : recordObj.type == '2' ? '线路二' : '' }}</el-tag>
+      </div>
+      <div v-else>
+        <el-tag>{{ lineName }}</el-tag>
+      </div>
     </div>
     <el-scrollbar ref="scrollbarRef" class="scrollbar">
       <el-empty v-if="recordObj.content?.length==0" description="暂无通话"/>
@@ -15,20 +19,26 @@
         <div v-for="(item,index) in recordObj.content" :key="index">
           <el-divider border-style="dotted" v-if="item.isLine">{{ item.lineMsg }}</el-divider>
           <div v-else>
-            <div class="time-grap"><span>{{ item.conversationTimestamp || '6月5日 12:05' }}</span></div>
+            <div class="time-grap"><span>{{ item.conversationTimestamp || '2024-11-24 21:31:55' }}</span></div>
             <!-- 我的 -->
             <div v-if="item.speaker==0" class="word-my">
               <div class="info">
                 <!--              <p class="name">{{ item.speaker==0?recordObj.name:'运维助手' }} </p>-->
                 <p class="name">{{ item.speaker == 0 ? recordObj.name : '运维助手' }} </p>
-                <div class="info-content">{{ item.message }}</div>
+                <el-tooltip
+                    effect="customized"
+                    content="如果回答不准确，请右键告诉运维助手！"
+                    placement="bottom"
+                >
+                  <div class="info-content" @contextmenu="showContextMenu($event,item.message)">{{ item.message }}</div>
+                </el-tooltip>
               </div>
-              <el-avatar>{{ item.speaker==0?recordObj.name:'运维助手' }}</el-avatar>
+              <el-avatar style="flex-shrink: 0;">{{ item.speaker == 0 ? recordObj.name : '运维助手' }}</el-avatar>
             </div>
 
             <!-- 对方 -->
             <div v-else class="word">
-              <el-avatar > {{ item.speaker==0?recordObj.name:'运维助手' }} </el-avatar>
+              <el-avatar style="flex-shrink: 0;"> {{ item.speaker == 0 ? recordObj.name : '运维助手' }}</el-avatar>
               <div class="info">
                 <p class="name">{{ item.speaker == 0 ? recordObj.name : '运维助手' }} </p>
                 <div class="info-content">{{ item.message }}</div>
@@ -41,11 +51,17 @@
 
       </div>
     </el-scrollbar>
+    <fvFormDialog ref="formDialogRef" width="550" :title="dialogTitle"
+                  :form-schema="formSchema" :form-rules="formRules"
+                  @dialogSubmit="handleSubmitAddressBook"></fvFormDialog>
   </div>
 </template>
 
 <script setup>
-import {defineProps} from "vue";
+import {defineProps, reactive} from "vue";
+import {addEnhanceVerbal} from "@/api/verbal-trick";
+import {ElMessage} from "element-plus";
+
 const scrollbarRef = ref()
 const props = defineProps({
   recordObj: {
@@ -61,7 +77,66 @@ const props = defineProps({
     default: ''
   },
 })
-
+const formDialogRef = ref()
+const dialogTitle = ref("训练知识库");
+const formRules = reactive({
+  answer: [
+    {required: true, message: "知识校准不能为空", trigger: "blur"},
+  ],
+});
+const formSchema = computed(() => {
+  return [
+    {
+      label: '知识内容',
+      prop: 'query',
+      component: 'el-input',
+      colProps: {
+        span: 24
+      },
+    },
+    {
+      label: '知识校准',
+      prop: 'answer',
+      component: 'el-input',
+      colProps: {
+        span: 24
+      },
+      props: {
+        placeholder: '请输入知识校准',
+        clearable: true,
+        type: 'textarea',
+        rows: 4,
+      },
+    },
+  ]
+})
+const handleSubmitAddressBook = async (formInstance) => {
+  if (!formInstance) return;
+  let validate = await formInstance.validate()
+  if (!validate.isValidate) return;
+  let params = {
+    query: formInstance.getValues().query,
+    answer: formInstance.getValues().answer
+  }
+  addEnhanceVerbal(params).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg);
+      formDialogRef.value.openOrCloseDialog(false)
+    } else {
+      ElMessage.error(res.msg);
+    }
+  });
+  console.log('params', params)
+}
+const showContextMenu = (event, message) => {
+  event.preventDefault(); // 阻止默认右键菜单
+  formDialogRef.value.openOrCloseDialog(true)
+  nextTick(() => {
+    formDialogRef.value.getFormInstance().setValues({
+      query: message
+    })
+  })
+}
 const getScrollbarRef = () => {
   return scrollbarRef.value
 }
@@ -87,7 +162,26 @@ defineExpose({
   getScrollbarRef
 })
 </script>
+<style lang="scss">
+.el-popper.is-customized {
+  /* Set padding to ensure the height is 32px */
+  padding: 6px 12px;
+  margin-top: -8px;
+  background: rgb(232 232 232) !important;
+  color: rgb(102, 102, 102) !important;
 
+  span {
+    letter-spacing: 0.5px;
+  }
+}
+
+
+.el-popper.is-customized .el-popper__arrow::before {
+  background: transparent !important;
+  display: none;
+  right: 0;
+}
+</style>
 <style lang="scss" scoped>
 .live-call {
   width: 48%;
@@ -157,12 +251,14 @@ defineExpose({
           }
 
           .info-content {
+            //max-width: 94%;
             padding: 10px;
             font-size: 14px;
             background: #f5f5f5;
             position: relative;
             margin-top: 8px;
             border: 1px solid #f5f5f5;
+            letter-spacing: 0.5px;
           }
 
           //小三角形
@@ -204,7 +300,7 @@ defineExpose({
           }
 
           .info-content {
-            max-width: 70%;
+            max-width: 94%;
             padding: 10px;
             font-size: 14px;
             float: right;

src/components/liveCall/index.vue

@@ -48,11 +48,30 @@ const getCurrentMsg=(line)=>{
   getCurrentContent(line).then(res=>{
     // console.info("🚀 ~method:res -----", res)
     if(line==1){
-      recordLeftObj.value.name=res.data.name
+      recordLeftObj.value.name=res.data.name||'张三'
       recordLeftObj.value.phone=res.data.callPhone
       recordLeftObj.value.orderName=res.data.orderName
       recordLeftObj.value.type=res.data.type
       recordLeftObj.value.content=res.data.textVoList||[]
+      // recordLeftObj.value.content=[
+      //     {
+      //   name: '张三',
+      //   speaker: '1',
+      //   conversationTimestamp:'2024-11-24 21:31:55',
+      //   message: '2024年04月033日14:16:13六合变1号装置故障动作',
+      // },{
+      //   name: '张三',
+      //   speaker: '0',
+      //   conversationTimestamp:'2024-11-24 21:31:56',
+      //   message: '大概需要多长时间修复',
+      // },{
+      //   name: '张三',
+      //   speaker: '1',
+      //   conversationTimestamp:'2024-11-24 21:31:58',
+      //   message: '这个很难确定具体的修复时间呢，因为还不清楚故障的具体情况。但我们希望您能以最快的速度进行处理，尽量减少对业务的影响。',
+      // }
+      //
+      // ]
     }else if(line==2){
       recordRightObj.value.name=res.data.name
       recordRightObj.value.phone=res.data.callPhone
@@ -91,9 +110,10 @@ const handleShowDeadLine=(recordObj,data)=>{
 }
 const initWebSocket = () => {
   try {
-    const wsUrl=setWsUrl(`/ws/text/${token}`)
+    // const wsUrl=setWsUrl(`/ws/text/${token}`)
     // const wsUrl = `ws://frp.feashow.cn:31800/ws/text/${token}`
     // const wsUrl = `ws://112.19.165.99:20002/api/ws/text/${token}`
+    const wsUrl = `ws://192.168.1.71:88/ws/text/${token}`
     socket = new WebSocket(wsUrl)
     // 2. ws.send()给服务器发送信息
     //连接发生错误的回调方法

src/fvcomponents/fvTable/index.vue

@@ -102,7 +102,7 @@
 
 <script setup>
 import {ElMessage, ElNotification} from 'element-plus';
-import { requestList } from '../../api/common';
+import {requestList} from '@/api/common';
 // import {exportExcel} from "@/utils/export-excel";
 
 const props = defineProps({
@@ -130,6 +130,11 @@ const props = defineProps({
   isLoading: {
     type: Boolean,
     default: true
+  },
+  //总数
+  total: {
+    type: String,
+    default: ''
   }
 })
 
@@ -291,12 +296,24 @@ const handleCurrentChange = (val) => {
   emits('getBaseQuery', localData.query)
   getList()
 }
-
+watch(() => props.data, (newVal) => {
+  console.log(newVal)
+  localData.list = newVal
+}, {
+  deep: true
+})
+watch(() => props.total, (newVal) => {
+  console.log(newVal)
+  localData.total = newVal
+}, {
+  deep: true
+})
 watchEffect(() => {
   if (localData.allColShow) {
     localData.checkGroup = props.tableConfig.columns.map(item => item.prop)
   }
 })
+
 //刷新
 const refresh = ({resetPage = false} = {}) => {
   resetPage ? localData.query.pageNum = 1 : null

src/stores/permisstion.js

@@ -4,10 +4,12 @@ import { getRouters } from "@/api/system/menu";
 import Layout from '@/layout/index.vue'
 import ParentView from '@/components/ParentView.vue'
 import router from "../router";
-const VueComUrl = import.meta.glob('../views/**/*.vue')
+import {getUserInfo} from "@/api/login";
 
+const VueComUrl = import.meta.glob('../views/**/*.vue')
 export const usePermisstionStroe = defineStore('permisstion', () => {
     const asyncRouters = ref([])
+    const userinfo = ref()
     //定义是否加载路由变量
     const isLoadRoutes = ref(false)
     const menuList = ref([{
@@ -23,13 +25,24 @@ export const usePermisstionStroe = defineStore('permisstion', () => {
     const setIsLoadRoutes = (status) => {
         return isLoadRoutes.value = status
     }
+    const getUser=async ()=>{
+       let {data}= await getUserInfo()
+        return data.user.roles[0].roleKey == 'voice';
+    }
     const setAsyncRouters = async () => {
-    await getRouters().then(res => {
+        await getRouters().then(async res => {
             if (res.code === 1000) {
                 const sRouter = JSON.parse(JSON.stringify(res.data))
                 const mData = JSON.parse(JSON.stringify(res.data))
                 asyncRouters.value = formatAsyncRouters(sRouter)
-        // menuList.value = generateMenu(mData)
+                // let role =   await getUser()
+                // if(role){
+                //     generateMenu(mData).map(item => {
+                //         if (item.path == '/voice/management') {
+                //             item.children = item.children.filter(item => item.name !== "Speech")
+                //         }
+                //     })
+                // }
                 menuList.value = [...menuList.value, ...generateMenu(mData)]
                 addAsyncRouters(asyncRouters.value)
                 isLoadRoutes.value = false
@@ -47,8 +60,7 @@ export const usePermisstionStroe = defineStore('permisstion', () => {
                     route.component = Layout
                 } else if (route.component === 'ParentView') {
                     route.component = ParentView
-        }
+                } else {
-        else {
                     route.component = loadView(route.component)
                 }
             }

src/views/enhance-speech/index.vue

@@ -0,0 +1,369 @@
+<template>
+  <fvSearchForm :searchConfig="searchConfig" @search="searchVerbalTrick"></fvSearchForm>
+  <fvTable ref="tableIns" :tableConfig="verbalTrickTableConfig"  @selectionChange="selectionChange" @headBtnClick="headBtnClick"></fvTable>
+  <fvFormDialog ref="formDialogRef" :title="dialogTitle" :dialogType="dialogType"
+                :form-schema="formSchema" :form-rules="formRules"
+                @dialogSubmit="handleSubmitVerbalTrick"></fvFormDialog>
+</template>
+
+<script setup lang="jsx">
+import fvSelect from '@/fvcomponents/fvSelect/index.vue'
+import {ElMessage, ElMessageBox} from "element-plus";
+import { deleteVerbal, getVerbalDetail, addEnhanceVerbal, editEnhanceVerbal} from "@/api/verbal-trick";
+import {reactive} from "vue";
+const router = useRouter()
+const dialogTitle = ref("");
+const dialogType = ref("");
+const verbalIds = ref("");
+const formDialogRef = ref()
+const tableIns = ref()
+const searchConfig = reactive([
+  {
+    label: '知识内容',
+    prop: 'query',
+    props: {
+      placeholder: '请输入知识内容查询',
+      clearable: true,
+      checkStrictly: true
+    },
+    component: 'el-input',
+  },
+  {
+    label: '知识校准',
+    prop: 'answer',
+    props: {
+      placeholder: '请输入知识校准查询',
+      clearable: true,
+      checkStrictly: true
+    },
+    component: 'el-input',
+  },
+  // {
+  //   label: '是否挂断电话',
+  //   prop: 'callOff',
+  //   props: {
+  //     placeholder: '请选择是否挂断电话查询',
+  //     cacheKey: 'call_off',
+  //     clearable: true,
+  //     filterable: true,
+  //   },
+  //   component: shallowRef(fvSelect),
+  // },
+  // {
+  //   label: '上下文类型',
+  //   prop: 'type',
+  //   props: {
+  //     placeholder: '请选择上下文类型查询',
+  //     cacheKey: 'context_type',
+  //     clearable: true,
+  //     filterable: true,
+  //   },
+  //   component: shallowRef(fvSelect),
+  // },
+])
+const auths = reactive({
+  add: ['order:verbal:add'],
+  edit: ['order:verbal:edit'],
+  delete: ['order:verbal:del'],
+})
+const verbalTrickTableConfig = reactive({
+  columns: [
+    {
+      type: 'selection',
+      prop: 'selection'
+    },
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width: 80,
+    },
+    {
+      prop: 'query',
+      label: '知识内容',
+      align: 'center'
+    },
+    {
+      prop: 'answer',
+      label: '知识校准',
+      align: 'center'
+    },
+    // {
+    //   prop: 'verbalContent',
+    //   label: '内容',
+    //   align: 'center'
+    // },
+    // {
+    //   prop: 'callOff',
+    //   label: '是否挂断电话',
+    //   align: 'center',
+    //   currentRender: ({ row, index }) => {
+    //     if (row.callOff !== null) {
+    //       return (<Tag dictType={'call_off'} value={row.callOff} />)
+    //     } else {
+    //       return '--'
+    //     }
+    //   }
+    // },
+    // {
+    //   prop: 'type',
+    //   label: '上下文类型',
+    //   align: 'center',
+    //   currentRender: ({ row, index }) => {
+    //     if (row.type !== null) {
+    //       return (<Tag dictType={'context_type'} value={row.type} />)
+    //     } else {
+    //       return '--'
+    //     }
+    //   }
+    // },
+    // {
+    //   prop: 'state',
+    //   label: '状态',
+    //   align: 'center',
+    //   showOverflowTooltip: false,
+    //   currentRender: ({ row, index }) => {
+    //     if (row.state !== null) {
+    //       return (<Tag dictType={'verbal_trick_state'} value={row.state} />)
+    //     } else {
+    //       return '--'
+    //     }
+    //   }
+    // },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      fixed: 'right',
+      width: 150,
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        let btn = []
+        btn.push({label: '编辑', prem: auths.edit, func: () => handleEdit(row), type: 'primary'})
+        btn.push({label: '删除', prem: auths.delete, 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: '/verbal/enhance/list',
+  params: {},
+  btns: [
+    {name: '新增', key: 'add',type:'primary',icon:'Plus', auth: auths.add},
+    {name: '删除', key: 'delete', type: 'danger', auth: auths.delete},
+  ]
+})
+const formRules = reactive({
+  query: [
+    {required: true, message: "请输入知识内容", trigger: ["change", "blur"]}
+  ],
+  answer: [
+    {required: true, message: "请输入知识校准", trigger: ["change", "blur"]}
+  ],
+  // callOff: [
+  //   {required: true, message: "请选择是否挂断电话", trigger: ["change", "blur"]}
+  // ],
+  // state: [
+  //   {required: true, message: "请选择状态", trigger: ["change", "blur"]}
+  // ],
+});
+const formSchema = computed(() => {
+  return [
+    {
+      label: '知识内容',
+      prop: 'query',
+      component: 'el-input',
+      colProps: {
+        span: 24
+      },
+      props: {
+        placeholder: '请输入知识内容',
+        clearable: true,
+        type:'textarea',
+        rows:3
+      }
+    },
+    {
+      label: '知识校准',
+      prop: 'answer',
+      component: 'el-input',
+      colProps: {
+        span: 24
+      },
+      props: {
+        placeholder: '请输入知识校准',
+        clearable: true,
+        type:'textarea',
+        rows:3
+      }
+    },
+    // {
+    //   label: '是否挂断电话',
+    //   prop: 'callOff',
+    //   component: shallowRef(fvSelect),
+    //   colProps: {
+    //     span: 24
+    //   },
+    //   props: {
+    //     placeholder: '请选择是否挂断电话',
+    //     cacheKey: 'call_off',
+    //     clearable: true,
+    //     filterable: true,
+    //   }
+    // },
+    // {
+    //   label: '上下文类型',
+    //   prop: 'type',
+    //   component: shallowRef(fvSelect),
+    //   colProps: {
+    //     span: 24
+    //   },
+    //   props: {
+    //     placeholder: '请选择上下文类型',
+    //     cacheKey: 'context_type',
+    //     clearable: true,
+    //     filterable: true,
+    //   }
+    // },
+  ]
+})
+const searchVerbalTrick = (val) => {
+  let obj = {...val}
+  if (obj.dateValue) {
+    obj.startTime = obj.dateValue[0]
+    obj.endTime = obj.dateValue[1]
+    delete obj.dateValue
+  }
+  verbalTrickTableConfig.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) => {
+  getVerbalDetail(row.templateId).then(res => {
+    if (res.code === 1000) {
+      res.data.callOff=res.data.callOff+''
+      nextTick(() => {
+        formDialogRef.value.getFormInstance().setValues(res.data)
+        // 清空校验
+        formDialogRef.value.getFormInstance().clearValidate()
+      })
+    } else {
+      ElMessage.warning(res.msg)
+    }
+  })
+}
+
+const selectionChange = (selection) => {
+  if (selection.length !== 0) {
+    verbalIds.value = selection.map(item => item.templateId).join()
+  } else {
+    verbalIds.value=''
+  }
+}
+const deleteContactMethod = (verbalId) => {
+  deleteVerbal(verbalId).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg)
+      tableIns.value.refresh()
+    } else {
+      ElMessage.error(res.msg)
+    }
+  })
+}
+const handleMoreDelete = () => {
+  if(verbalIds.value){
+    ElMessageBox.confirm(`确认删除选择的知识吗?`, '系统提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }).then(() => {
+      deleteContactMethod(verbalIds.value)
+    })
+  }else{
+    ElMessage.warning("请选择要删除的知识")
+  }
+}
+const handleSingleDelete = (row) => {
+  ElMessageBox.confirm(`确认删除问题为${row.query}的知识吗?`, '系统提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    deleteContactMethod(row.templateId)
+  })
+}
+
+//提交
+const handleSubmitVerbalTrick = async (formInstance) => {
+  if (!formInstance) return;
+  let validate = await formInstance.validate()
+  if (!validate.isValidate) return;
+  if (dialogType.value === "add") {
+    addEnhanceVerbal(formInstance.getValues()).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success(res.msg);
+        tableIns.value.refresh()
+        formDialogRef.value.openOrCloseDialog(false)
+      } else {
+        ElMessage.error(res.msg);
+      }
+    });
+  } else {
+    editEnhanceVerbal(formInstance.getValues()).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success(res.msg);
+        tableIns.value.refresh()
+        formDialogRef.value.openOrCloseDialog(false)
+      } else {
+        ElMessage.error(res.msg);
+      }
+    });
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/home/index.vue

@@ -6,23 +6,37 @@
     </div>
     <div class="call-history">
       <h3>历史通话记录</h3>
-      <fvTable ref="tableIns" :tableConfig="tableConfig" :isLoading="isLoading"></fvTable>
+      <fvTable ref="tableIns" :tableConfig="tableConfig" :data="currentHistoryData" :total="currentHistoryTotal" :isLoading="isLoading" @getBaseQuery="getBaseQuery"></fvTable>
       <voice ref="voiceRef" title="语音详情" :rowUrl="rowUrl" />
-      <infoLiveCall ref="infoLiveCallRef" v-model:value="orderNumber" />
+      <infoLiveCall ref="infoLiveCallRef" v-model:value="historyData" />
     </div>
   </div>
 </template>
 
 <script setup lang="jsx">
+import {useAuthStore} from '@/stores/userstore.js'
+import {getToken} from '@/utils/auth'
+import {usePermisstionStroe} from '@/stores/permisstion'
 import LiveCall from '@/components/liveCall/index.vue'
 import Voice from '@/components/voice/index.vue'
 import InfoLiveCall from '@/components/infoLiveCall/index.vue'
+import {orderGetList} from "@/api/order/order";
+const permisstionStore = usePermisstionStroe()
+const authStore = useAuthStore()
+const currentHistoryData = ref([])
+const historyData = ref({})
 const orderNumber = ref('')
+const currentHistoryTotal = ref('')
 const rowUrl = ref()
 const infoLiveCallRef = ref()
-const isLoading = ref(false)
+const isLoading = ref(true)
 const voiceRef = ref()
 const tableIns = ref()
+let socket = reactive("");
+let token = getToken();
+let send = {
+  type: "ping",
+};
 const auths = reactive({
   record: ['order:dialogue:list'],
 })
@@ -40,28 +54,29 @@ const tableConfig = reactive({
       label: '工单号',
       align: 'center',
     },
-    {
+    // {
-      prop: 'orderName',
+    //   prop: 'orderName',
-      label: '工单名称',
+    //   label: '工单名称',
-      align: 'center'
+    //   align: 'center'
-    },
+    // },
     {
       prop: 'orderContent',
       label: '工单内容',
-      align: 'center'
+      align: 'center',
+      width: 250,
     },
     {
       prop: 'operationUser',
       // prop: 'destinationName',
       label: '处理人',
-      align: 'center'
+      align: 'center',
-    },
-    {
-      prop: 'knotter',
-      // prop: 'destinationName',
-      label: '关单人',
-      align: 'center'
     },
+    // {
+    //   prop: 'knotter',
+    //   // prop: 'destinationName',
+    //   label: '关单人',
+    //   align: 'center'
+    // },
     {
       prop: 'destinationName',
       // prop: 'workOrderNumber',
@@ -77,7 +92,7 @@ const tableConfig = reactive({
       prop: 'callState',
       label: '电话拨打状态',
       align: 'center',
-      width: 120,
+      width: 160,
       showOverflowTooltip: false,
       currentRender: ({ row, index }) => {
         if (row.callState !== null) {
@@ -130,10 +145,33 @@ const tableConfig = reactive({
       }
     }
   ],
-  api: '/order/list',
+  // api: '/order/list',
   params: {
   }
 })
+const getOrder=(pageNum=1,pageSize=10)=>{
+  // isLoading.value=true
+  nextTick(()=>{
+    tableIns.value.updateLoading(true)
+  })
+  orderGetList({
+    pageNum: pageNum,
+    pageSize: pageSize
+  }).then(res=>{
+    console.log('res',res)
+    currentHistoryData.value=res.data.rows
+    currentHistoryTotal.value=res.data.total
+    nextTick(()=>{
+      tableIns.value.updateLoading(false)
+    })
+  })
+}
+getOrder()
+const getBaseQuery=(params)=>{
+  console.log('params',params)
+  // tableConfig.params=params
+  getOrder(params.pageNum,params.pageSize)
+}
 const handleVoice = (row) => {
   if (row.recordUrl !== null) {
     voiceRef.value.open(true)
@@ -147,12 +185,71 @@ const handleVoice = (row) => {
 
 }
 const handleInfo = (row) => {
+  historyData.value=row
   orderNumber.value = row.orderNumber
   infoLiveCallRef.value.open()
 }
-window.setInterval(() => {
+// window.setInterval(() => {
-  setTimeout(tableIns.value.refresh(), 0)
+//   setTimeout(tableIns.value.refresh(), 0)
-}, 2000)
+// }, 2000)
+
+const handleLogout = () => {
+  authStore.userLogout()
+  permisstionStore.removeMenu()
+  router.push('/login')
+}
+const initWebSocket = () => {
+  try {
+    // const wsUrl=setWsUrl(`/ws/text/${token}`)
+    // const wsUrl = `ws://frp.feashow.cn:31800/ws/history/${token}`
+    const wsUrl = `ws://192.168.1.71:88/ws/history/${token}`
+    socket = new WebSocket(wsUrl)
+    // 2. ws.send()给服务器发送信息
+    //连接发生错误的回调方法
+    socket.onerror = function () {
+      console.log("ws连接发生错误");
+    };
+    //连接成功建立的回调方法
+    socket.onopen = function () {
+      console.log("ws连接成功");
+    }
+    //接收到消息的回调方法
+    socket.onmessage = function (event) {
+      let data = JSON.parse(event.data)
+      if (data.type !== 'pong') {
+        if (data.type === 'error') {
+          handleLogout()
+          return;
+        } else if (data.type === 'failed') {
+          initWebSocket()
+          return;
+        }
+        console.log("服务器返回的信息: ", data);
+        let historyDataObj=JSON.parse(data)
+        console.log("historyDataObj: ", historyDataObj);
+        currentHistoryData.value=historyDataObj.rows
+        currentHistoryTotal.value=historyDataObj.total
+        // historyDataObj.rows?.forEach(item=>{
+        //   currentHistoryData.value.push(item)
+        // })
+      }
+    }
+    //连接关闭的回调方法
+    socket.onclose = function () {
+      // initWebSocket()
+      console.log("ws连接关闭");
+    }
+    setInterval(() => {
+      socket.send(JSON.stringify(send))
+    }, 5000)
+  } catch (e) {
+    console.log(e)
+    console.log("ws连接失败");
+  }
+}
+initWebSocket()
+
+
 </script>
 
 <style lang="scss" scoped>

src/views/phone-traffic-management/address-book-management/index.vue

@@ -1,7 +1,14 @@
 <template>
   <div class="address-book">
     <fvSearchForm :searchConfig="searchConfig" @search="searchAddressBook"></fvSearchForm>
-    <fvTable ref="tableIns" :tableConfig="addressBookTableConfig" @headBtnClick="headBtnClick"
+    <div style="display: flex;">
+      <el-button type="primary" v-perm="auths.add" @click="handleAdd">新增</el-button>
+      <import-excel @success="importAddress"/>
+      <el-button type="info" v-perm="auths.export" @click="handleExport">导出</el-button>
+      <el-button type="danger" v-perm="auths.delete" @click="handleMoreDelete">删除</el-button>
+    </div>
+<!--    @headBtnClick="headBtnClick"-->
+      <fvTable ref="tableIns" :tableConfig="addressBookTableConfig"
                @selectionChange="selectionChange"></fvTable>
       <fvFormDialog ref="formDialogRef" :title="dialogTitle" :dialogType="dialogType"
                     :form-schema="formSchema" :form-rules="formRules"
@@ -11,9 +18,10 @@
 
 <script setup lang="jsx">
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
-import {addContact, editContact, getContactDetail, deleteContact} from "@/api/address-book";
+import {addContact, editContact, getContactDetail, deleteContact, exportContact} from "@/api/address-book";
 import {ElMessage, ElMessageBox} from "element-plus";
 import {reactive} from "vue";
+import ImportExcel from "@/components/ImportExcel.vue";
 
 const router = useRouter()
 const tableIns = ref()
@@ -25,7 +33,8 @@ const dialogType = ref("");
 
 // 手机号验证
 const checkPhone = (rule, value, callback) => {
-  const phoneReg = /^1[3|4|5|6|7|8][0-9]{9}$/
+  // const phoneReg = /^1[3|4|5|6|7|8][0-9]{9}$/
+  const phoneReg = /^\d{11}$/
   setTimeout(() => {
     if (!Number.isInteger(+value)) {
       callback(new Error('请输入数字值'))
@@ -33,7 +42,7 @@ const checkPhone = (rule, value, callback) => {
       if (phoneReg.test(value)) {
         callback()
       } else {
-        callback(new Error('手机号码格式不正确'))
+        callback(new Error('手机号码长度不足11位，如果是座机，请添加区号'))
       }
     }
   }, 100)
@@ -48,9 +57,12 @@ const formRules = reactive({
   name: [
     {required: true, message: "请输入姓名", trigger: ["change", "blur"]}
   ],
+  dispatchUnit: [
+    {required: true, message: "请输入拨打单位", trigger: ["change", "blur"]}
+  ],
   phone: [
-    {required: true, message: "请输入手机号码",   trigger: ["change", "blur"]},
+    {required: true, message: "请输入手机号码", trigger: ["change", "blur"]}
-    { validator: checkPhone,  trigger: ["change", "blur"]},
+    //{validator: checkPhone, trigger: ["change", "blur"]},
   ]
 });
 const formSchema = computed(() => {
@@ -81,6 +93,30 @@ const formSchema = computed(() => {
         filterable: true,
       }
     },
+    {
+      label: '拨打单位',
+      prop: 'dispatchUnit',
+      component: 'el-input',
+      colProps: {
+        span: 24
+      },
+      props: {
+        placeholder: '请输入拨打单位',
+        clearable: true,
+      }
+    },
+    {
+      label: '班组信息',
+      prop: 'team',
+      component: 'el-input',
+      colProps: {
+        span: 24
+      },
+      props: {
+        placeholder: '请输入班组信息',
+        clearable: true,
+      }
+    },
     {
       label: '姓名',
       prop: 'name',
@@ -96,7 +132,7 @@ const formSchema = computed(() => {
     {
       label: '手机号',
       prop: 'phone',
-      component: 'el-input-number',
+      component: 'el-input',
       colProps: {
         span: 24
       },
@@ -156,6 +192,8 @@ const searchConfig = reactive([
 const auths = reactive({
   add: ['order:contacts:add'],
   edit: ['order:contacts:edit'],
+  import: ['order:contacts:import'],
+  export: ['order:contacts:export'],
   delete: ['order:contacts:del'],
 })
 const addressBookTableConfig = reactive({
@@ -189,6 +227,16 @@ const addressBookTableConfig = reactive({
         }
       }
     },
+    {
+      prop: 'dispatchUnit',
+      label: '拨打单位',
+      align: 'center'
+    },
+    {
+      prop: 'team',
+      label: '班组信息',
+      align: 'center'
+    },
     {
       prop: 'name',
       label: '姓名',
@@ -237,8 +285,10 @@ const addressBookTableConfig = reactive({
   api: '/contact/list',
   params: {},
   btns: [
-    {name: '新增', key: 'add', type: 'primary' , auth: auths.add},
+    // {name: '新增', key: 'add', type: 'primary', auth: auths.add},
-    {name: '删除', key: 'delete', type: 'danger', auth: auths.delete},
+    // {name: '导入', key: 'import', type: 'warning', auth: auths.import},
+    // {name: '导出', key: 'export', type: 'info', auth: auths.export},
+    // {name: '删除', key: 'delete', type: 'danger', auth: auths.delete},
   ]
 })
 const searchAddressBook = (val) => {
@@ -251,18 +301,48 @@ const searchAddressBook = (val) => {
   addressBookTableConfig.params = obj
   tableIns.value.refresh()
 }
-
+//通讯录导入
+const importAddress = () => {
+  tableIns.value.refresh()
+}
 const headBtnClick = (key) => {
   switch (key) {
     case 'add':
       handleAdd()
       break;
+    case 'import':
+      handleImport()
+      break;
+    case 'export':
+      handleExport()
+      break;
     case 'delete':
       handleMoreDelete()
       break;
   }
 }
 
+//通讯录导出
+const handleExport = () => {
+  exportContact().then(res => {
+    let link = document.createElement('a')
+    try {
+      let blob = new Blob([res.data], {type: 'application/vnd.ms-excel'});
+      let _fileName = "运维智能语音服务系统-通讯录.xlsx"
+      link.style.display = 'none';
+      // 兼容不同浏览器的URL对象
+      const url = window.URL || window.webkitURL || window.moxURL;
+      link.href = url.createObjectURL(blob);
+      link.setAttribute('download', _fileName.substring(_fileName.lastIndexOf('_') + 1))
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link);
+      url.revokeObjectURL(link.href);//销毁url对象
+    } catch (e) {
+      console.log('下载的文件出错', e)
+    }
+  })
+}
 const handleAdd = () => {
   formDialogRef.value.openOrCloseDialog(true)
   dialogTitle.value = "新增通讯录";
@@ -339,7 +419,12 @@ const handleSubmitAddressBook = async (formInstance) => {
   if (!formInstance) return;
   let validate = await formInstance.validate()
   if (!validate.isValidate) return;
+  // if (formInstance.getValues().role == '1' && !formInstance.getValues().dispatchUnit) {
+  //   ElMessage.warning('请输入拨打单位');
+  //   return;
+  // }
   if (dialogType.value === "add") {
+
     addContact(formInstance.getValues()).then(res => {
       if (res.code === 1000) {
         ElMessage.success(res.msg);
@@ -367,6 +452,7 @@ const handleSubmitAddressBook = async (formInstance) => {
 
   .el-input-number {
     width: 100% !important;
+
     .el-input__inner {
       text-align: left;
     }

src/views/system/role/index.vue

@@ -147,7 +147,7 @@
                       :props="treeProps"
                       node-key="menuId"
                       ref="tree"
-                      :check-strictly="checkStrictly"
+                      :check-strictly="true"
                       show-checkbox
                       @check-change="handleCheckChange"
                   />
@@ -209,7 +209,7 @@ const rules = reactive({
     {required: true, message: '请选择显示顺序', trigger: 'blur'},
   ]
 })
-const checkList = ref(['3'])
+const checkList = ref([])
 const treeProps = {
   value: "menuId",
   label: 'menuName',
@@ -372,7 +372,7 @@ const getMenu = async () => {
 //多选框事件
 const changeCheckbox = (checked) => {
   //父子联动
-  checkStrictly.value = checked.indexOf("3") === -1;
+  // checkStrictly.value = checked.indexOf("3") === -1;
   let nodes = tree.value.store.nodesMap;
   console.log('checked',checked)
   //展开/折叠

src/views/task-management/all-work-order/index.vue

@@ -43,16 +43,18 @@ const searchConfig = reactive([
       checkStrictly: true
     },
     component: 'el-input',
-  }, {
-    label: '工单名称',
-    prop: 'orderName',
-    props: {
-      placeholder: '请输入工单名查询',
-      clearable: true,
-      checkStrictly: true
   },
-    component: 'el-input',
+  // {
-  }, {
+  //   label: '工单名称',
+  //   prop: 'orderName',
+  //   props: {
+  //     placeholder: '请输入工单名查询',
+  //     clearable: true,
+  //     checkStrictly: true
+  //   },
+  //   component: 'el-input',
+  // },
+  {
     label: '工单状态',
     prop: 'orderState',
     props: {
@@ -62,7 +64,18 @@ const searchConfig = reactive([
       filterable: true,
     },
     component: shallowRef(fvSelect),
-  }, {
+  },
+  {
+    label: '联系人',
+    prop: 'destinationNumber',
+    props: {
+      placeholder: '请输入联系人查询',
+      clearable: true,
+      checkStrictly: true
+    },
+    component: 'el-input',
+  },
+  {
     label: '处理人',
     prop: 'operationUser',
     props: {
@@ -71,16 +84,17 @@ const searchConfig = reactive([
       checkStrictly: true
     },
     component: 'el-input',
-  }, {
-    label: '关单人',
-    prop: 'knotter',
-    props: {
-      placeholder: '请输入关单人查询',
-      clearable: true,
-      checkStrictly: true
-    },
-    component: 'el-input',
   },
+  // {
+  //   label: '关单人',
+  //   prop: 'knotter',
+  //   props: {
+  //     placeholder: '请输入关单人查询',
+  //     clearable: true,
+  //     checkStrictly: true
+  //   },
+  //   component: 'el-input',
+  // },
   {
     label: '创建时间',
     prop: 'createdTime',
@@ -133,17 +147,29 @@ const tableConfig = reactive({
       align: 'center',
       width: 200
     },
-    {
+    // {
-      prop: 'orderName',
+    //   prop: 'orderName',
-      label: '工单名称',
+    //   label: '工单名称',
-      align: 'center',
+    //   align: 'center',
-      width: 200
+    //   width: 200
-    },
+    // },
     {
       prop: 'orderContent',
       label: '工单内容',
       align: 'center',
-      width: 200
+      width: 250
+    },
+    {
+      prop: 'alarmUnit',
+      label: '拨打单位',
+      align: 'center',
+      width: 120
+    },
+    {
+      prop: 'alarmObject',
+      label: '拨打对象',
+      align: 'center',
+      width: 100
     },
     {
       prop: 'orderState',
@@ -172,10 +198,24 @@ const tableConfig = reactive({
         }
       }
     },
+    {
+      prop: 'destinationNumber',
+      label: '联系人',
+      align: 'center',
+      width: 160,
+      currentRender: ({row, index}) => {
+        if (row.destinationNumber) {
+          return row.destinationNumber
+        } else {
+          return '--'
+        }
+      }
+    },
     {
       prop: 'operationUser',
       label: '处理人',
       align: 'center',
+      width: 100,
       currentRender: ({row, index}) => {
         if (row.operationUser) {
           return row.operationUser
@@ -208,11 +248,11 @@ const tableConfig = reactive({
       align: 'center',
       width: 200
     },
-    {
+    // {
-      prop: 'knotter',
+    //   prop: 'knotter',
-      label: '关单人',
+    //   label: '关单人',
-      align: 'center'
+    //   align: 'center'
-    },
+    // },
     {
       prop: 'oper',
       label: '操作',
@@ -291,7 +331,12 @@ const handleClose = async (row) => {
         }
     )
         .then(async () => {
-        const info = await orderdClose(row.orderNumber)
+          const info = await orderdClose(
+              {
+                orderNumber: row.orderNumber,
+                alarmObject: row.alarmObject,
+                alarmUnit: row.alarmUnit
+              })
           // console.log(info);
           if (info.code === 1000) {
             tableIns.value.refresh()

src/views/task-management/components/WorkDialog.vue

@@ -25,7 +25,11 @@ const open = (row) => {
 
 const getData = async () => {
   // console.log(123);
-    const data = await orderGetDetails(props.rowData.orderNumber)
+  const data = await orderGetDetails({
+    orderNumber: props.rowData.orderNumber,
+    alarmObject: props.rowData.alarmObject,
+    alarmUnit: props.rowData.alarmUnit
+  })
   // console.log("111", data);
   return data
 
@@ -86,14 +90,14 @@ let contentState2 = [
   },
   {
     content: "已处理",
-        timestamp: "2022-07-20 20:00:00",
+    timestamp: "2024-07-20 20:00:00",
     icon: Check,
     color: "#0bbd87",
     size: "large",
   },
   {
     content: "结单",
-        timestamp: "2022-07-20 20:00:00",
+    timestamp: "2024-07-20 20:00:00",
     size: "large",
     icon: Check,
     color: "#0bbd87",
@@ -112,7 +116,7 @@ watch(() => props.rowData, (newRowData) => {
       // console.log(dataDetails);
       const theData = [{createTime: '', data: []}]
 
-            dataDetails.forEach(for1data => {
+      dataDetails?.forEach(for1data => {
         // console.log(for1data.createTime, '--------');
         for (let i = 0; i < theData.length; i++) {
           // console.log(theData[i]);
@@ -146,15 +150,16 @@ watch(() => props.rowData, (newRowData) => {
 
       //工单时间线
       orderContent.value = []
-            // console.log(orderData.value);
+      console.log(orderData.value);
       // orderData.value.orderState='2'
       if (orderData.value.orderState === '0') {
         inputOrderContent(contentState0)
-            }
+      } else if (orderData.value.orderState === '1') {
-            else if (orderData.value.orderState === '1') {
+        contentState1[1].timestamp = orderData.value.processedTime || '--'
         inputOrderContent(contentState1)
-            }
+      } else if (orderData.value.orderState === '2') {
-            else if (orderData.value.orderState === '2') {
+        contentState2[1].timestamp = orderData.value.processedTime || '--'
+        contentState2[2].timestamp = orderData.value.completionTime || '--'
         inputOrderContent(contentState2)
       }
       // console.log(orderContent.value);
@@ -177,12 +182,14 @@ const inputOrderTime = (item, index) => {
 }
 
 const inputOrderContent = (contentState) => {
+  // console.log('contentState',contentState)
   contentState.map((item, index) => {
     inputOrderTime(item, index)
-    })
-    contentState.forEach(item => {
     orderContent.value.push(item)
   })
+  // contentState.forEach(item => {
+  //   orderContent.value.push(item)
+  // })
 }
 
 const openRecord = () => {
@@ -211,7 +218,6 @@ defineExpose({
 });
 
 
-
 </script>
 
 <template>
@@ -240,8 +246,8 @@ defineExpose({
                 <span>处理人：{{ rowData.operationUser || '--' }}</span>
               </div>
               <div class="info">
-                                <span>工单名称：{{ rowData.orderName || '--' }}</span>
+                <span>拨打单位：{{ rowData.alarmUnit || '--' }}</span>
-                                <span>关单人：{{ rowData.knotter || '--' }}</span>
+                <span>拨打对象：{{ rowData.alarmObject || '--' }}</span>
               </div>
             </div>
             <div class="body">
@@ -253,15 +259,15 @@ defineExpose({
                   </el-scrollbar>
                 </div>
               </div>
-                            <div>
+              <!--                            <div>-->
-                                <div>通话记录：</div>
+              <!--                                <div>通话记录：</div>-->
-                                <div class="textBox">
+              <!--                                <div class="textBox">-->
-                                    <el-scrollbar>
+              <!--                                    <el-scrollbar>-->
-                                        <div class="text">{{ rowData.processedContent || '暂无通话记录' }}</div>
+              <!--                                        <div class="text">{{ rowData.processedContent || '暂无通话记录' }}</div>-->
-                                    </el-scrollbar>
+              <!--                                    </el-scrollbar>-->
-                                </div>
+              <!--                                </div>-->
 
-                            </div>
+              <!--                            </div>-->
               <div>
                 <div>录音信息：</div>
                 <div class="textBox—record">
@@ -272,7 +278,8 @@ defineExpose({
                   <voice ref="voiceRef" title="录音详情" :rowUrl="rowUrl"/>
                   <a :href=rowData.recordUrl download>
                     <el-button type="primary" :icon="Download"
-                                            @click="downloadRecord">下载录音</el-button>
+                               @click="downloadRecord">下载录音
+                    </el-button>
                   </a>
                   <!-- <el-scrollbar> -->
                   <!-- <div class="text">{{ rowData.recordUrl }}</div> -->
@@ -292,9 +299,11 @@ defineExpose({
                                         icon="MoreFilled" type="primary" size="large">
                         <div class="custom-card">
                           <div style="font-weight: bold">{{ activity.createTime }}</div>
+                          <template v-if="activity.data&&activity.data.length>0">
                             <div v-for="(info, index) in activity.data" :key="index">
                               <div class="timeline-row">
-                                                            <span :style="{ color: '#a8abb2' }">{{ info.callIdNumber
+                                                            <span :style="{ color: '#a8abb2' }">{{
+                                                                info.destinationNumber
                                                               }}</span>
                                 <PointTag dictType="call_status" :value="info.callState"
                                           class="tag"/>
@@ -302,9 +311,15 @@ defineExpose({
                                     color: info.callState === '通话中' ? '#6cc23a' : '#409eff'
                                 }">{{ info.callState }}</span> -->
                                 <span class="span-3th" :style="{ color: '#a8abb2' }">{{
-                                                                info.answeredTime || '00:00:00' }}</span>
+                                    info.answeredTime || '00:00:00'
+                                  }}</span>
                               </div>
                             </div>
+                          </template>
+                          <template v-else>
+                            <p>暂无电话拨打记录</p>
+                          </template>
+
                         </div>
                       </el-timeline-item>
                     </el-timeline>

src/views/task-management/historical-work-order/index.vue

@@ -45,16 +45,28 @@ const searchConfig = reactive([
       checkStrictly: true
     },
     component: 'el-input',
-  }, {
+  },
-    label: '工单名称',
+  // {
-    prop: 'orderName',
+  //   label: '工单名称',
+  //   prop: 'orderName',
+  //   props: {
+  //     placeholder: '请输入工单名查询',
+  //     clearable: true,
+  //     checkStrictly: true
+  //   },
+  //   component: 'el-input',
+  // },
+  {
+    label: '联系人',
+    prop: 'destinationNumber',
     props: {
-      placeholder: '请输入工单名查询',
+      placeholder: '请输入联系人查询',
       clearable: true,
       checkStrictly: true
     },
     component: 'el-input',
-  }, {
+  },
+  {
     label: '处理人',
     prop: 'operationUser',
     props: {
@@ -63,16 +75,17 @@ const searchConfig = reactive([
       checkStrictly: true
     },
     component: 'el-input',
-  }, {
-    label: '关单人',
-    prop: 'knotter',
-    props: {
-      placeholder: '请输入关单人查询',
-      clearable: true,
-      checkStrictly: true
-    },
-    component: 'el-input',
   },
+  // {
+  //   label: '关单人',
+  //   prop: 'knotter',
+  //   props: {
+  //     placeholder: '请输入关单人查询',
+  //     clearable: true,
+  //     checkStrictly: true
+  //   },
+  //   component: 'el-input',
+  // },
   {
     label: '创建时间',
     prop: 'createdTime',
@@ -125,17 +138,29 @@ const tableConfig = reactive({
       align: 'center',
       width: 200
     },
-    {
+    // {
-      prop: 'orderName',
+    //   prop: 'orderName',
-      label: '工单名称',
+    //   label: '工单名称',
-      align: 'center',
+    //   align: 'center',
-      width: 200
+    //   width: 200
-    },
+    // },
     {
       prop: 'orderContent',
       label: '工单内容',
       align: 'center',
-      width: 200
+      width: 250
+    },
+    {
+      prop: 'alarmUnit',
+      label: '拨打单位',
+      align: 'center',
+      width: 120
+    },
+    {
+      prop: 'alarmObject',
+      label: '拨打对象',
+      align: 'center',
+      width: 100
     },
     {
       prop: 'orderState',
@@ -164,6 +189,20 @@ const tableConfig = reactive({
         }
       }
     },
+
+    {
+      prop: 'destinationNumber',
+      label: '联系人',
+      align: 'center',
+      width: 160,
+      currentRender: ({row, index}) => {
+        if (row.destinationNumber) {
+          return row.destinationNumber
+        } else {
+          return '--'
+        }
+      }
+    },
     {
       prop: 'operationUser',
       label: '处理人',
@@ -193,11 +232,11 @@ const tableConfig = reactive({
       align: 'center',
       width: 200
     },
-    {
+    // {
-      prop: 'knotter',
+    //   prop: 'knotter',
-      label: '关单人',
+    //   label: '关单人',
-      align: 'center'
+    //   align: 'center'
-    },
+    // },
     {
       prop: 'oper',
       label: '操作',
@@ -275,7 +314,11 @@ const handleClose = async (row) => {
       }
     )
       .then(async () => {
-        const info = await orderdClose(row.orderNumber)
+        const info = await orderdClose({
+          orderNumber: row.orderNumber,
+          alarmObject: row.alarmObject,
+          alarmUnit: row.alarmUnit
+        })
         // console.log(info);
         if (info.code === 1000) {
           tableIns.value.refresh()

src/views/task-management/pending-work-order/index.vue

@@ -45,16 +45,28 @@ const searchConfig = reactive([
       checkStrictly: true
     },
     component: 'el-input',
-  }, {
+  },
-    label: '工单名称',
+  // {
-    prop: 'orderName',
+  //   label: '工单名称',
+  //   prop: 'orderName',
+  //   props: {
+  //     placeholder: '请输入工单名查询',
+  //     clearable: true,
+  //     checkStrictly: true
+  //   },
+  //   component: 'el-input',
+  // },
+  {
+    label: '联系人',
+    prop: 'destinationNumber',
     props: {
-      placeholder: '请输入工单名查询',
+      placeholder: '请输入联系人查询',
       clearable: true,
       checkStrictly: true
     },
     component: 'el-input',
-  }, {
+  },
+  {
     label: '处理人',
     prop: 'operationUser',
     props: {
@@ -63,16 +75,17 @@ const searchConfig = reactive([
       checkStrictly: true
     },
     component: 'el-input',
-  }, {
-    label: '关单人',
-    prop: 'knotter',
-    props: {
-      placeholder: '请输入关单人查询',
-      clearable: true,
-      checkStrictly: true
-    },
-    component: 'el-input',
   },
+  // {
+  //   label: '关单人',
+  //   prop: 'knotter',
+  //   props: {
+  //     placeholder: '请输入关单人查询',
+  //     clearable: true,
+  //     checkStrictly: true
+  //   },
+  //   component: 'el-input',
+  // },
   {
     label: '创建时间',
     prop: 'createdTime',
@@ -125,17 +138,29 @@ const tableConfig = reactive({
       align: 'center',
       width: 200
     },
-    {
+    // {
-      prop: 'orderName',
+    //   prop: 'orderName',
-      label: '工单名称',
+    //   label: '工单名称',
-      align: 'center',
+    //   align: 'center',
-      width: 200
+    //   width: 200
-    },
+    // },
     {
       prop: 'orderContent',
       label: '工单内容',
       align: 'center',
-      width: 200
+      width: 250
+    },
+    {
+      prop: 'alarmUnit',
+      label: '拨打单位',
+      align: 'center',
+      width: 120
+    },
+    {
+      prop: 'alarmObject',
+      label: '拨打对象',
+      align: 'center',
+      width: 100
     },
     {
       prop: 'orderState',
@@ -164,6 +189,19 @@ const tableConfig = reactive({
         }
       }
     },
+    {
+      prop: 'destinationNumber',
+      label: '联系人',
+      align: 'center',
+      width: 160,
+      currentRender: ({row, index}) => {
+        if (row.destinationNumber) {
+          return row.destinationNumber
+        } else {
+          return '--'
+        }
+      }
+    },
     {
       prop: 'operationUser',
       label: '处理人',
@@ -193,11 +231,11 @@ const tableConfig = reactive({
       align: 'center',
       width: 200
     },
-    {
+    // {
-      prop: 'knotter',
+    //   prop: 'knotter',
-      label: '关单人',
+    //   label: '关单人',
-      align: 'center'
+    //   align: 'center'
-    },
+    // },
     {
       prop: 'oper',
       label: '操作',
@@ -275,7 +313,11 @@ const handleClose = async (row) => {
       }
     )
       .then(async () => {
-        const info = await orderdClose(row.orderNumber)
+        const info = await orderdClose({
+          orderNumber: row.orderNumber,
+          alarmObject: row.alarmObject,
+          alarmUnit: row.alarmUnit
+        })
         // console.log(info);
         if (info.code === 1000) {
           tableIns.value.refresh()

src/views/voice-management/verbal-trick/index.vue

@@ -19,20 +19,20 @@ const formDialogRef = ref()
 const tableIns = ref()
 const searchConfig = reactive([
   {
-    label: '话术问题',
+    label: '知识内容',
     prop: 'query',
     props: {
-      placeholder: '请输入话术问题查询',
+      placeholder: '请输入知识内容查询',
       clearable: true,
       checkStrictly: true
     },
     component: 'el-input',
   },
   {
-    label: '话术答案',
+    label: '期望回复',
     prop: 'answer',
     props: {
-      placeholder: '请输入话术答案查询',
+      placeholder: '请输入期望回复查询',
       clearable: true,
       checkStrictly: true
     },
@@ -81,12 +81,12 @@ const verbalTrickTableConfig = reactive({
     },
     {
       prop: 'query',
-      label: '话术问题',
+      label: '知识内容',
       align: 'center'
     },
     {
       prop: 'answer',
-      label: '话术答案',
+      label: '期望回复',
       align: 'center'
     },
     // {
@@ -98,6 +98,7 @@ const verbalTrickTableConfig = reactive({
       prop: 'callOff',
       label: '是否挂断电话',
       align: 'center',
+      width: '120',
       currentRender: ({ row, index }) => {
         if (row.callOff !== null) {
           return (<Tag dictType={'call_off'} value={row.callOff} />)
@@ -110,6 +111,7 @@ const verbalTrickTableConfig = reactive({
       prop: 'type',
       label: '上下文类型',
       align: 'center',
+      width: '120',
       currentRender: ({ row, index }) => {
         if (row.type !== null) {
           return (<Tag dictType={'context_type'} value={row.type} />)
@@ -170,10 +172,10 @@ const verbalTrickTableConfig = reactive({
 })
 const formRules = reactive({
   query: [
-    {required: true, message: "请输入话术问题", trigger: ["change", "blur"]}
+    {required: true, message: "请输入知识内容", trigger: ["change", "blur"]}
   ],
   // answer: [
-  //   {required: true, message: "请输入话术答案", trigger: ["change", "blur"]}
+  //   {required: true, message: "请输入期望回复", trigger: ["change", "blur"]}
   // ],
   callOff: [
     {required: true, message: "请选择是否挂断电话", trigger: ["change", "blur"]}
@@ -185,28 +187,28 @@ const formRules = reactive({
 const formSchema = computed(() => {
   return [
     {
-      label: '话术问题',
+      label: '知识内容',
       prop: 'query',
       component: 'el-input',
       colProps: {
         span: 24
       },
       props: {
-        placeholder: '请输入话术问题',
+        placeholder: '请输入知识内容',
         clearable: true,
         type:'textarea',
         rows:3
       }
     },
     {
-      label: '话术答案',
+      label: '期望回复',
       prop: 'answer',
       component: 'el-input',
       colProps: {
         span: 24
       },
       props: {
-        placeholder: '请输入话术答案',
+        placeholder: '请输入期望回复',
         clearable: true,
         type:'textarea',
         rows:3
@@ -265,7 +267,7 @@ const headBtnClick = (key) => {
 }
 const handleAdd = () => {
   formDialogRef.value.openOrCloseDialog(true)
-  dialogTitle.value = "新增话术";
+  dialogTitle.value = "新增知识";
   dialogType.value = "add";
   nextTick(() => {
     formDialogRef.value.getFormInstance().setValues({})
@@ -277,7 +279,7 @@ const handleAdd = () => {
 const handleEdit = (row) => {
   formDialogRef.value.openOrCloseDialog(true)
   getDetail(row)
-  dialogTitle.value = "编辑话术";
+  dialogTitle.value = "编辑知识";
   dialogType.value = "edit";
 }
 const getDetail = (row) => {
@@ -314,7 +316,7 @@ const deleteContactMethod = (verbalId) => {
 }
 const handleMoreDelete = () => {
   if(verbalIds.value){
-    ElMessageBox.confirm(`确认删除选择的话术吗?`, '系统提示', {
+    ElMessageBox.confirm(`确认删除选择的知识吗?`, '系统提示', {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
       type: 'warning'
@@ -322,11 +324,11 @@ const handleMoreDelete = () => {
       deleteContactMethod(verbalIds.value)
     })
   }else{
-    ElMessage.warning("请选择要删除的话术")
+    ElMessage.warning("请选择要删除的知识")
   }
 }
 const handleSingleDelete = (row) => {
-  ElMessageBox.confirm(`确认删除问题为${row.query}的话术吗?`, '系统提示', {
+  ElMessageBox.confirm(`确认删除问题为${row.query}的知识吗?`, '系统提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
     type: 'warning'

vite.config.js

@@ -76,8 +76,9 @@ export default defineConfig({
       //   rewrite: (path) => path.replace(/^\/api/, ""),
       // },
       "/api": {
-        // target: "http://frp.feashow.cn:31800/",
+        target: "http://frp.feashow.cn:31800/",
-        target: "http://10.8.105.91:28080/",
+        // target: "http://10.8.105.91:28080/",
+        // target: "http://112.19.165.99:20002/",
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/api/, ""),
       },