更新 src/components/liveCall/index.vue

Merge pull request 'master' (#164 ) from master into test
Reviewed-on: http://git.feashow.cn/feashow/SmartOpsWeb/pulls/164
2024-11-16 03:08:41 +00:00 · 2024-11-08 07:48:43 +00:00 · 2024-11-08 07:48:23 +00:00 · 2024-11-08 15:47:54 +08:00 · 2024-11-08 07:26:42 +00:00 · 2024-11-08 15:26:29 +08:00
30 changed files with 640 additions and 380 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -20,9 +20,9 @@ steps:
      - npm -v
      - mkdir -p ./node_modules
      - export NODE_MODULES_PATH=`pwd`/node_modules
-      # - npm config set registry https://registry.npmmirror.com
-      - set NODE_OPTIONS=--openssl-legacy-provider
-      # - npm install
+#      - npm config set registry https://registry.npmmirror.com
+#      - set NODE_OPTIONS=--openssl-legacy-provider
+#      - npm install
      - npm run build
      - echo $NODE_MODULES_PATH
      - cp -r dist /app/build/$DRONE_REPO_NAME
--- a/docker.sh
+++ b/docker.sh
@@ -12,5 +12,5 @@ docker rmi smartopsweb:latest
 echo '----build image start----'
 docker build -t smartopsweb:latest .
 echo '----build image success----'
-docker run --name smartopsweb -d -p 8080:80 smartopsweb:latest
+docker run --name smartopsweb --link smartopsserver --restart=always -d -p 8080:80 smartopsweb:latest

--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
    <meta charset="UTF-8">
    <link rel="icon" href="/favicon.ico">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>智能语音服务系统</title>
+    <title>运维智能语音服务系统</title>
  </head>
  <body>
    <div id="app"></div>
--- a/nginx.conf
+++ b/nginx.conf
@@ -29,6 +29,20 @@ http {
        listen       80;
        listen  [::]:80;

+
+        location /api {
+          proxy_pass http://smartopsserver:8080;
+          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_set_header X-Forwarded-Proto $scheme;
+          proxy_set_header X-Forwarded-Port $server_port;
+          proxy_set_header Host $host;
+          rewrite "^/api/(.*)$" /$1 break;
+          proxy_http_version 1.1;
+          proxy_set_header Upgrade $http_upgrade;
+          proxy_set_header Connection 'upgrade';
+          client_max_body_size  30m;
+        }
+
        location / {
            root   /home/clay;
            index  index.html index.htm;
--- a/src/api/phone-traffic-config/index.js
+++ b/src/api/phone-traffic-config/index.js
@@ -1,9 +1,9 @@
 import request from '@/utils/request.js'

 // 获取参数配置表详情
-export const getConfigDetails = (configId,extraConfigType) => {
+export const getConfigDetails = (configId) => {
    return request({
-        url: `/extra/config/${configId}/${extraConfigType}`,
+        url: `/extra/config/${configId}`,
        method: 'get'
    })
 }
@@ -27,9 +27,9 @@ export const editConfig = (data) => {
 }

 // 删除参数配置表
-export const delConfig =(configIdList,extraConfigType) => {
+export const delConfig =(configIdList) => {
    return request({
-        url: `/extra/config/${configIdList}/${extraConfigType}`,
+        url: `/extra/config/${configIdList}`,
        method: 'delete'
    })
 }
--- a/src/api/workbench/index.js
+++ b/src/api/workbench/index.js
@@ -1,11 +1,16 @@
 import request from '@/utils/request.js'
-import { method } from 'lodash'

 //获取历史通话文本记录
-
 export const getHistoryCallContent=(params)=>{
    return request({
        url:`/text/history/list/${params}`,
        method:'get'
    })
-}
+}
+//获取工作台当前线路记录
+export const getCurrentContent=(line)=>{
+    return request({
+        url:`/text/records/${line}`,
+        method:'get'
+    })
+}
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -3,7 +3,7 @@
  background-color: #418DFF;
  color: #ffffff;
  font-weight: bold;
-  font-size: 26px;
+  font-size: 18px;
  display: flex;
  justify-content: center;
  align-items: center;
--- a/src/components/infoLiveCall/index.vue
+++ b/src/components/infoLiveCall/index.vue
@@ -1,11 +1,16 @@
 <script setup>
 import LiveCallItem from '@/components/liveCall/LiveCallItem.vue'
 import {getHistoryCallContent} from '@/api/workbench';
+import {ElMessage} from "element-plus";

 const dialogVisible = ref(false);
 const recordLeftRef = ref(null);
+const emit = defineEmits(['update:value'])
 const props = defineProps({
-  rowData: String
+  value: {
+    type:String,
+    default:''
+  }
 })

 const open = (row) => {
@@ -13,14 +18,20 @@ const open = (row) => {
 };

 const leftHeadData = ref({
-  username: '张三',
-  phone: '13546812315',
-  orderName: '张三工单',
+  // username: '张三',
+  // phone: '13546812315',
+  // orderName: '张三工单',
+})
+const detailLoading=ref(false)
+const recordLeftObj = ref({});
+const _value = computed({
+  get() {
+    return props.value;
+  },
+  set(val) {
+    emit("update:value", val);
+  }
 })
-
-const recordLeftObj = ref({
-  content: []
-});
 const convertArrayToMap=(array)=> {
  const map = new Map();
  array.forEach(item => {
@@ -35,22 +46,33 @@ const convertArrayToMap=(array)=> {
  return map;
 }

-watch(() => props.rowData, async (newVal) => {
-  recordLeftObj.value.content = []
-  // let map1 = new Map()
-  await getHistoryCallContent(newVal).then(res => {
-    res.data?.forEach(item => {
-      item.textVoList = convertArrayToMap(item.textVoList);
-    })
-    recordLeftObj.value = res.data
-    // console.info("🚀 ~method:res.data -----", res.data)
-    if (res.data && res.data.length > 0) {
-      leftHeadData.value.username = res.data[0].callIdNumber || '--';
-      leftHeadData.value.phone = res.data[0].callPhone || '--';
-      leftHeadData.value.orderName = res.data[0].orderName || '--';
-    }
-  })
+watch(() => props.value, async (newVal) => {
+  if(newVal){
+
+    getHistoryDetail(newVal)
+  }
 })
+const getHistoryDetail=(newVal)=>{
+  detailLoading.value=true
+   getHistoryCallContent(newVal).then(res => {
+     if (res.code === 1000) {
+       detailLoading.value=false
+       res.data?.forEach(item => {
+         if( item.textVoList&& item.textVoList.length>0){
+           item.textVoList = convertArrayToMap(item.textVoList);
+         }
+       })
+       recordLeftObj.value = res.data
+       if (res.data && res.data.length > 0) {
+         leftHeadData.value.username = res.data[0].name || '--';
+         leftHeadData.value.phone = res.data[0].callPhone || '--';
+         leftHeadData.value.orderName = res.data[0].orderName || '--';
+       }
+     } else {
+       ElMessage.error(res.msg);
+     }
+  })
+}

 const scrollToBottom = (scrollbarRef) => {
  if (scrollbarRef) {
@@ -68,8 +90,8 @@ defineExpose({
 </script>

 <template>
-  <el-dialog v-model="dialogVisible" title="历史通话记录" width="600" class="box">
-    <LiveCallItem ref="recordLeftRef" :recordArray="recordLeftObj" :headData="leftHeadData" style="width: 100%;"/>
+  <el-dialog v-model="dialogVisible" title="历史通话记录" width="700" class="box">
+    <LiveCallItem ref="recordLeftRef" :recordArray="recordLeftObj" :headData="leftHeadData" style="width: 100%;" :detailLoading="detailLoading"/>
    <template #footer>
      <div class="dialog-footer">
        <el-button type="primary" @click="dialogVisible = false">
@@ -82,6 +104,6 @@ defineExpose({

 <style>
 .box {
-  height: 68vh;
+  /*height: 68vh;*/
 }
 </style>
--- a/src/components/liveCall/LiveCallItem.vue
+++ b/src/components/liveCall/LiveCallItem.vue
@@ -1,11 +1,13 @@
 <template>
-  <div class="live-call">
+  <div class="live-call" v-loading="detailLoading">
    <div class="header">
      <div>
        <span style="margin-right: 20px">{{ headData.username }}</span>
-        <span>电话号码：{{ headData.phone }}</span>
      </div>
-      <div><span>工单名称：{{ headData.orderName }}</span></div>
+      <div>
+        <span>电话号码：{{ headData.phone ||'--'}}</span>
+      </div>
+      <div><span>工单名称：{{ headData.orderName ||'--'}}</span></div>
    </div>
    <el-scrollbar ref="scrollbarRef" class="scrollbar">
      <div class="chat-content" ref="innerRef">
@@ -16,23 +18,27 @@
              <!-- 我的 -->
              <div v-if="recordItem.speaker==0" class="word-my">
                <div class="info">
-                  <p class="name">{{ recordItem.speaker == 0 ? recordItem.callIdNumber : 'AI助手' }} </p>
+                  <p class="name">{{ recordItem.speaker == 0 ? recordItem.name
+                      : '运维助手' }} </p>
                  <div class="info-content">{{ recordItem.message }}</div>
                </div>
-                <el-avatar text="我"/>
+                <el-avatar>{{ recordItem.speaker==0?recordItem.name:'运维助手' }}</el-avatar>
              </div>
              <!-- 对方 -->
              <div v-else class="word">
-                <el-avatar text="对方"/>
+                <el-avatar>{{ recordItem.speaker==0?recordItem.name:'运维助手' }}</el-avatar>
                <div class="info">
-                  <p class="name">{{ recordItem.speaker == 0 ? recordItem.callIdNumber : 'AI助手' }} </p>
+                  <p class="name">{{ recordItem.speaker == 0 ? recordItem.name
+                      : '运维助手' }} </p>
                  <div class="info-content">{{ recordItem.message }}</div>
                </div>
              </div>
            </div>
          </div>
-          <el-divider border-style="dotted" v-if="item">一轮通话结束~~</el-divider>
+          <el-divider border-style="dotted" v-if="item.textVoList&&item.textVoList.length>0">一轮通话结束~~</el-divider>
        </div>
+<!--                  <el-empty description="暂无通话记录~" v-if="recordArray"/>-->
+
      </div>
    </el-scrollbar>
  </div>
@@ -51,10 +57,17 @@ const props = defineProps({
    type: Object,
    default: {}
  },
+  detailLoading: {
+    type: Boolean,
+    default: false
+  },
 })
 const getScrollbarRef = () => {
  return scrollbarRef.value
 }
+watch(() => props.detailLoading,  (newVal) => {
+  props.detailLoading=newVal
+})
 defineExpose({
  getScrollbarRef
 })
@@ -62,7 +75,7 @@ defineExpose({

 <style lang="scss" scoped>
 .live-call {
-  width: 48%;
+  width: 50%;
  height: 47vh;
  margin-bottom: 20px;
  overflow: hidden;
--- a/src/components/liveCall/LiveCallItemHome.vue
+++ b/src/components/liveCall/LiveCallItemHome.vue
@@ -2,32 +2,43 @@
  <div class="live-call">
    <div class="header">
      <div>
-        <span style="margin-right: 20px">{{ headData.username }}</span>
-        <span>{{ headData.phone }}</span>
+        <span style="margin-right: 20px">{{ recordObj.name }}</span>
+        <span>电话号码：{{ recordObj.phone ||'--'}}</span>
      </div>
-      <div><span>工单名称：{{ headData.orderName }}</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-else><el-tag>{{ lineName  }}</el-tag></div>
    </div>
    <el-scrollbar ref="scrollbarRef" class="scrollbar">
-      <div class="chat-content" ref="innerRef">
+      <el-empty v-if="recordObj.content?.length==0" description="暂无通话" />
+      <div class="chat-content" ref="innerRef" v-else>
        <div v-for="(item,index) in recordObj.content" :key="index">
-          <div class="time-grap"><span>{{ item.conversationTimestamp || '6月5日 12:05' }}</span></div>
-          <!-- 我的 -->
-          <div v-if="item.speaker==0" class="word-my">
-            <div class="info">
-              <p class="name">{{ item.speaker==0?headData.username:'AI助手' }} </p>
-              <div class="info-content">{{ item.message }}</div>
+          <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 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>
+              </div>
+              <el-avatar>{{ item.speaker==0?recordObj.name:'运维助手' }}</el-avatar>
            </div>
-            <el-avatar text="我"/>
-          </div>
-          <!-- 对方 -->
-          <div v-else class="word">
-            <el-avatar text="对方"/>
-            <div class="info">
-              <p class="name">{{ item.speaker==0?headData.username:'AI助手'  }} </p>
-              <div class="info-content">{{ item.message }}</div>
+
+            <!-- 对方 -->
+            <div v-else class="word">
+              <el-avatar > {{ 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>
+              </div>
            </div>
          </div>
        </div>
+
+<!--        <el-empty description="暂无通话记录~" v-else/>-->
+
      </div>
    </el-scrollbar>
  </div>
@@ -45,10 +56,33 @@ const props = defineProps({
    type: Object,
    default: {}
  },
+  lineName: {
+    type: String,
+    default: ''
+  },
 })
+
 const getScrollbarRef=()=>{
  return  scrollbarRef.value
 }
+const handleShowDeadLine=(recordObj)=>{
+  console.info("🚀 ~method:'recordObj' -----", recordObj)
+  let flag=false
+  if(recordObj.content&&recordObj.content.length>1){
+        let indices = recordObj.content.reduce(function (r, v, i) {
+          return r.concat(v === 'a' ? i : []);
+        }, []);
+
+    console.log(indices);
+
+    recordObj.content.forEach((item,index)=>{
+      console.info("🚀 ~method:.callIdNumber -----",recordObj.content.findIndex(item=>item.callIdNumber), item.callIdNumber)
+      flag=recordObj.content[recordObj.content.length-2]?.callIdNumber!=recordObj.content[recordObj.content.length-1].callIdNumber
+
+    })
+  }
+return flag;
+}
 defineExpose({
  getScrollbarRef
 })
--- a/src/components/liveCall/index.vue
+++ b/src/components/liveCall/index.vue
@@ -1,8 +1,8 @@
 <template>
  <!--测试 张三 : 17260625724565   李四: 17260625724123-->
  <div class="live-call-block">
-    <live-call-item-home ref="recordLeftRef" :recordObj="recordLeftObj" :headData="leftHeadData"/>
-    <live-call-item-home ref="recordRightRef" :recordObj="recordRightObj" :headData="rightHeadData"/>
+    <live-call-item-home ref="recordLeftRef" :recordObj="recordLeftObj" :headData="leftHeadData" lineName="线路一"/>
+    <live-call-item-home ref="recordRightRef" :recordObj="recordRightObj" :headData="rightHeadData" lineName="线路二"/>
  </div>
 </template>

@@ -10,6 +10,7 @@
 import {useAuthStore} from '@/stores/userstore.js'
 import {getToken} from '@/utils/auth'
 import {usePermisstionStroe} from '@/stores/permisstion'
+import {getCurrentContent} from "@/api/workbench";

 const permisstionStore = usePermisstionStroe()
 const authStore = useAuthStore()
@@ -17,76 +18,52 @@ const authStore = useAuthStore()
 const recordLeftRef = ref(null);
 const recordRightRef = ref(null);
 const leftHeadData = ref({
-  username: '张三',
-  phone: '13546812315',
-  orderName: '张三工单',
+  // username: '张三',
+  // phone: '13546812315',
+  // orderName: '张三工单',
 })
 const rightHeadData = ref({
-  username: '李四',
-  phone: '18246812546',
-  orderName: '李四工单',
+  // username: '李四',
+  // phone: '18246812546',
+  // orderName: '李四工单',
 })
 const recordLeftObj = ref({
-      content: []
-    }
-    // {
-    //   "callIdNumber": "17260625724565",
-    //   "content": [{
-    //     "callIdNumber": "17260625724565",
-    //     "conversationId": 0,
-    //     "conversationTimestamp": "2024-09-15 12:10",
-    //     "createTime": "2024-09-16",
-    //     "message": "你好11",
-    //     "speaker": "1"
-    //   },
-    //     {
-    //       "callIdNumber": "17260625724565",
-    //       "conversationId": 0,
-    //       "conversationTimestamp": "2024-09-15 16:10",
-    //       "createTime": "2024-09-16",
-    //       "message": "你好好11!",
-    //       "speaker": "0"
-    //     }
-    //   ],
-    //   "name": "",
-    //   "phone": "",
-    //   "timestamp": "1726416597958",
-    //   "type": "1"
-    // }
-)
+  content: []
+})
 const recordRightObj = ref({
-      content: []
-    }
-    // {
-    //   "callIdNumber": "17260625724123",
-    //   "content": [{
-    //     "callIdNumber": "17260625724123",
-    //     "conversationId": 0,
-    //     "conversationTimestamp": "2024-09-15 12:10",
-    //     "createTime": "2024-09-16",
-    //     "message": "你好22",
-    //     "speaker": "1"
-    //   },
-    //     {
-    //       "callIdNumber": "17260625724123",
-    //       "conversationId": 0,
-    //       "conversationTimestamp": "2024-09-15 16:10",
-    //       "createTime": "2024-09-16",
-    //       "message": "你好好222!",
-    //       "speaker": "0"
-    //     }
-    //   ],
-    //   "name": "",
-    //   "phone": "",
-    //   "timestamp": "1726416597958",
-    //   "type": "2"
-    // }
-)
+  content: []
+})
 let socket = reactive("");
 let token = getToken();
 let send = {
  type: "ping",
 };
+// if(localStorage.getItem('recordLeftObj')){
+//   recordLeftObj.value=JSON.parse(localStorage.getItem('recordLeftObj'))
+// }
+// if(localStorage.getItem('recordRightObj')){
+//   recordRightObj.value=JSON.parse(localStorage.getItem('recordRightObj'))
+// }
+const getCurrentMsg=(line)=>{
+  getCurrentContent(line).then(res=>{
+    // console.info("🚀 ~method:res -----", res)
+    if(line==1){
+      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||[]
+    }else if(line==2){
+      recordRightObj.value.name=res.data.name
+      recordRightObj.value.phone=res.data.callPhone
+      recordRightObj.value.orderName=res.data.orderName
+      recordRightObj.value.type=res.data.type
+      recordRightObj.value.content=res.data.textVoList||[]
+    }
+  })
+}
+getCurrentMsg(1)
+getCurrentMsg(2)
 //滚动面板自动滑动到底部
 const scrollToBottom = (scrollbarRef) => {
  if (scrollbarRef) {
@@ -98,18 +75,25 @@ const scrollToBottom = (scrollbarRef) => {


 const setWsUrl = (url) => {
-  return (window.location.protocol === 'http:' ? "ws://" : "wss://") + window.location.host + import.meta.env.VITE_BASE_WSURL + url;
+  return (window.location.protocol === 'http:' ? "ws://" : "wss://") + window.location.host + import.meta.env.VITE_BASE_URL + url;
 }
 const handleLogout = () => {
  authStore.userLogout()
  permisstionStore.removeMenu()
  router.push('/login')
 }
+const handleShowDeadLine=(recordObj,data)=>{
+  let flag=false
+  if(recordObj.content&&recordObj.content.length>0){
+      flag=recordObj.content[recordObj.content.length-1]?.callIdNumber!=data.callIdNumber
+  }
+  return flag;
+}
 const initWebSocket = () => {
  try {
-    // 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=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}`
    socket = new WebSocket(wsUrl)
    // 2. ws.send()给服务器发送信息
    //连接发生错误的回调方法
@@ -139,14 +123,42 @@ const initWebSocket = () => {
        }
        console.log("服务器返回的信息: ", data);
        if (data.type == '1') {
+          recordLeftObj.value.name=data.name
+          recordLeftObj.value.phone=data.phone
+          recordLeftObj.value.type=data.type
+          recordLeftObj.value.orderName=data.orderName
+          let flag=handleShowDeadLine(recordLeftObj.value,data)
+          console.info("🚀 ~method:flag -----", flag)
+          if(flag){
+            recordLeftObj.value.content.push({
+              isLine:true,
+              lineMsg: "一轮通话结束~~",
+              speaker: data.content.speaker
+            })
+          }
          recordLeftObj.value.content.push(data.content)
+          localStorage.setItem('recordLeftObj',JSON.stringify(recordLeftObj.value))
          // console.info("🚀 ~method:onmessage -----", recordLeftObj.value)
          nextTick(() => {
            scrollToBottom(recordLeftRef.value)
          })
        } else {
+          recordRightObj.value.name=data.name
+          recordRightObj.value.phone=data.phone
+          recordRightObj.value.type=data.type
+          recordRightObj.value.orderName=data.orderName
+          let flag=handleShowDeadLine(recordRightObj.value,data)
+          console.info("🚀 ~method:flag -----", flag)
+          if(flag){
+            recordRightObj.value.content.push({
+              isLine:true,
+              lineMsg: "一轮通话结束~~",
+            speaker: data.content.speaker
+            })
+          }
          recordRightObj.value.content.push(data.content)
          // console.info("🚀 ~method:onmessage -----", recordRightObj.value)
+          localStorage.setItem('recordRightObj',JSON.stringify(recordRightObj.value))
          nextTick(() => {
            scrollToBottom(recordRightRef.value);
          })
--- a/src/fvcomponents/fvTable/index.vue
+++ b/src/fvcomponents/fvTable/index.vue
@@ -125,6 +125,11 @@ const props = defineProps({
  isSettingCol: {
    type: Boolean,
    default: true
+  },
+  //表格是否刷新
+  isLoading: {
+    type: Boolean,
+    default: true
  }
 })

@@ -217,7 +222,7 @@ const getList = async () => {
  const { api, params } = props.tableConfig
  const queryParmas = {...localData.query, ...params}
  if(api) {
-    localData.loading = true
+    localData.loading = props.isLoading
    try {
      const {code, data, msg} = await requestList(api, queryParmas).then(res=>{
        // console.log(res)
--- a/src/layout/siderbar/index.vue
+++ b/src/layout/siderbar/index.vue
@@ -1,6 +1,6 @@
 <template>
  <div class="logo" ref="logo">
-    <span v-if="!siderbarStore.isCollapse">智能语音服务</span>
+    <span v-if="!siderbarStore.isCollapse">运维智能语音服务系统</span>
  </div>
  <el-scrollbar :height="`calc(100vh - ${logoHeight}px)`" style="background-color: #ffffff">
    <el-menu
--- a/src/layout/tagsview/index.vue
+++ b/src/layout/tagsview/index.vue
@@ -76,7 +76,7 @@ init()
 .link-box {
  position: relative;
  padding: 12px 0;
-  line-height: 30px;
+  line-height: 34px;

  .tag {
    padding: 6px;
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -22,4 +22,4 @@ export const setAuthInfo = (info) => {

 export const removeAuthInfo = () => {
  return Cookies.remove('authinfo')
-}
+}
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -6,6 +6,7 @@ import { getToken, removeToken } from "./auth";
 axios.defaults.headers['Content-Type']='application/json'
 console.log(import.meta.env.VITE_BASE_URL);

+
 const serveice = axios.create({
  baseURL: import.meta.env.VITE_BASE_URL,
  timeout: 6000
@@ -50,8 +51,9 @@ serveice.interceptors.response.use(response=>{
      }).then(()=>{
        removeToken()
        window.location = '/login'
+        return Promise.reject('会话已过期,请重新登录')
      })
-      return Promise.reject('会话已过期,请重新登录')
+      break;
    case 402:
      break;
    case 403:
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -6,9 +6,9 @@
    </div>
    <div class="call-history">
      <h3>历史通话记录</h3>
-      <fvTable ref="tableIns" :tableConfig="tableConfig"></fvTable>
+      <fvTable ref="tableIns" :tableConfig="tableConfig" :isLoading="isLoading"></fvTable>
      <voice ref="voiceRef" title="语音详情" :rowUrl="rowUrl" />
-      <infoLiveCall ref="infoLiveCallRef" :rowData="rowData" />
+      <infoLiveCall ref="infoLiveCallRef" v-model:value="orderNumber" />
    </div>
  </div>
 </template>
@@ -17,13 +17,14 @@
 import LiveCall from '@/components/liveCall/index.vue'
 import Voice from '@/components/voice/index.vue'
 import InfoLiveCall from '@/components/infoLiveCall/index.vue'
-const rowData = ref()
+const orderNumber = ref('')
 const rowUrl = ref()
 const infoLiveCallRef = ref()
+const isLoading = ref(false)
 const voiceRef = ref()
 const tableIns = ref()
 const auths = reactive({
-  report: ['mosr:collect:reported'],
+  record: ['order:dialogue:list'],
 })
 const tableConfig = reactive({
  columns: [
@@ -51,21 +52,24 @@ const tableConfig = reactive({
    },
    {
      prop: 'operationUser',
+      // prop: 'destinationName',
      label: '处理人',
      align: 'center'
    },
    {
      prop: 'knotter',
+      // prop: 'destinationName',
      label: '关单人',
      align: 'center'
    },
    {
-      prop: 'workOrderNumber',
+      prop: 'destinationName',
+      // prop: 'workOrderNumber',
      label: '用户名',
      align: 'center'
    },
    {
-      prop: 'workOrderNumber',
+      prop: 'destinationNumber',
      label: '电话号码',
      align: 'center'
    },
@@ -73,6 +77,7 @@ const tableConfig = reactive({
      prop: 'callState',
      label: '电话拨打状态',
      align: 'center',
+      width: 120,
      showOverflowTooltip: false,
      currentRender: ({ row, index }) => {
        if (row.callState !== null) {
@@ -83,7 +88,8 @@ const tableConfig = reactive({
      }
    },
    {
-      prop: 'workOrderTime',
+      prop: 'createdTime',
+      // prop: 'workOrderTime',
      label: '拨打时间',
      align: 'center',
      width: 200
@@ -97,21 +103,26 @@ const tableConfig = reactive({
      currentRender: ({ row, index }) => {
        // console.log(row);
        let btn = []
-        btn.push({ label: '播放语音', prem: auths.detail, func: () => handleVoice(row), type: 'primary' })
-        btn.push({ label: '通话记录', prem: auths.detail, func: () => handleInfo(row), type: 'primary' })
+        btn.push({ label: '播放语音',  func: () => handleVoice(row), type: 'primary' })
+        btn.push({ label: '通话记录', prem: auths.record, func: () => handleInfo(row), type: 'primary' })
        return (
          <div style={{ width: '100%' }}>
            {
              btn.map(item => (
-                <>
+                  item.prem?
                  <el-button
                    type={item.type}
-                    // v-perm={item.prem}
+                    v-perm={item.prem}
                    onClick={() => item.func()}
                    link>
                    {item.label}
                  </el-button>
-                </>
+                  : <el-button
+                    type={item.type}
+                    onClick={() => item.func()}
+                    link>
+                  {item.label}
+                </el-button>
              ))
            }
          </div >
@@ -121,7 +132,6 @@ const tableConfig = reactive({
  ],
  api: '/order/list',
  params: {
-    orderState: '2'
  }
 })
 const handleVoice = (row) => {
@@ -137,14 +147,18 @@ const handleVoice = (row) => {

 }
 const handleInfo = (row) => {
-  console.log(row);
-
-  infoLiveCallRef.value.open(true)
-  rowData.value = row.orderNumber
+  orderNumber.value = row.orderNumber
+  infoLiveCallRef.value.open()
 }
+window.setInterval(() => {
+  setTimeout(tableIns.value.refresh(), 0)
+}, 2000)
 </script>

 <style lang="scss" scoped>
+:deep(.el-table--fit){
+  min-height: 180px;
+}
 .home {
  .real-time-call {
    width: 100%;
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -6,7 +6,7 @@
    :rules="rules"
    label-width="70px"
    >
-      <h3>智能语音服务系统</h3>
+      <h3>运维智能语音服务系统</h3>
      <el-form-item prop="username" label="账号">
        <el-input v-model="loginForm.username" :prefix-icon="User" ></el-input>
      </el-form-item>
@@ -35,8 +35,10 @@ import { User,Lock, Key } from '@element-plus/icons-vue'
 const router = useRouter()
 const authStore = useAuthStore()
 const loginForm = reactive({
-  username: 'admin',
-  password: 'qwe123',
+  username: '',
+  password: '',
+  // username: 'admin',
+  // password: '123456',
  code: '',
  uuid: ''
 })
--- a/src/views/phone-traffic-management/address-book-management/index.vue
+++ b/src/views/phone-traffic-management/address-book-management/index.vue
@@ -13,6 +13,7 @@
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 import {addContact, editContact, getContactDetail, deleteContact} from "@/api/address-book";
 import {ElMessage, ElMessageBox} from "element-plus";
+import {reactive} from "vue";

 const router = useRouter()
 const tableIns = ref()
@@ -152,6 +153,11 @@ const searchConfig = reactive([
    component: 'el-input',
  }
 ])
+const auths = reactive({
+  add: ['order:contacts:add'],
+  edit: ['order:contacts:edit'],
+  delete: ['order:contacts:del'],
+})
 const addressBookTableConfig = reactive({
  columns: [
    {
@@ -207,15 +213,15 @@ const addressBookTableConfig = reactive({
      showOverflowTooltip: false,
      currentRender: ({row, index}) => {
        let btn = []
-        btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
-        btn.push({label: '删除', func: () => handleSingleDelete(row), type: 'danger'})
+        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}
+                        v-perm={item.prem}
                        onClick={() => item.func()}
                        link
                    >
@@ -231,8 +237,8 @@ const addressBookTableConfig = reactive({
  api: '/contact/list',
  params: {},
  btns: [
-    {name: '新增', key: 'add', type: 'primary'},
-    {name: '删除', key: 'delete', type: 'danger'},
+    {name: '新增', key: 'add', type: 'primary' , auth: auths.add},
+    {name: '删除', key: 'delete', type: 'danger', auth: auths.delete},
  ]
 })
 const searchAddressBook = (val) => {
@@ -277,13 +283,13 @@ const handleEdit = (row) => {
 const getDetail = (row) => {
  getContactDetail(row.contactsId).then(res => {
    if (res.code === 1000) {
-      ElMessage.success(res.msg)
      nextTick(() => {
        formDialogRef.value.getFormInstance().setValues(res.data)
        // 清空校验
        formDialogRef.value.getFormInstance().clearValidate()
      })
    } else {
+      ElMessage.success(res.msg)
    }
  })
 }
--- a/src/views/phone-traffic-management/phone-traffic-config/index.vue
+++ b/src/views/phone-traffic-management/phone-traffic-config/index.vue
@@ -7,7 +7,7 @@
 </template>

 <script setup lang="jsx">
-import { shallowRef } from 'vue';
+import {reactive, 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";
@@ -131,12 +131,17 @@ const searchConfig = reactive([
    component: shallowRef(fvSelect),
  }
 ])
+const auths = reactive({
+  add: ['extra:config:add'],
+  edit: ['extra:config:edit'],
+  delete: ['extra:config:del'],
+})
 const phoneTrafficTableConfig = reactive({
  columns: [
-    {
-      type: 'selection',
-      prop: 'selection'
-    },
+    // {
+    //   type: 'selection',
+    //   prop: 'selection'
+    // },
    {
      prop: 'index',
      type: 'index',
@@ -191,15 +196,15 @@ const phoneTrafficTableConfig = reactive({
      showOverflowTooltip: false,
      currentRender: ({row, index}) => {
        let btn = []
-        btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
-        btn.push({label: '删除', func: () => handleSingleDelete(row), type: 'danger'})
+        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}
+                        v-perm={item.prem}
                        onClick={() => item.func()}
                        link
                    >
@@ -217,8 +222,8 @@ const phoneTrafficTableConfig = reactive({
    extraConfigType:extraConfigType.value
  },
  btns: [
-    {name: '新增', key: 'add',type:'primary'},
-    {name: '删除', key: 'delete', type: 'danger'},
+    {name: '新增', key: 'add',type:'primary', auth: auths.add},
+    // {name: '删除', key: 'delete', type: 'danger'},
  ]
 })
 const searchPhoneTraffic = (val) => {
@@ -261,9 +266,8 @@ const handleEdit = (row) => {
  dialogType.value = "edit";
 }
 const getDetail = (row) => {
-  getConfigDetails(row.configId,extraConfigType.value).then(res => {
+  getConfigDetails(row.configId).then(res => {
    if (res.code === 1000) {
-      ElMessage.success(res.msg)
      res.data.configType=''+res.data.configType
      nextTick(() => {
        formDialogRef.value.getFormInstance().setValues(res.data)
@@ -271,6 +275,7 @@ const getDetail = (row) => {
        formDialogRef.value.getFormInstance().clearValidate()
      })
    } else {
+      ElMessage.success(res.msg)
    }
  })
 }
@@ -283,7 +288,7 @@ const selectionChange = (selection) => {
  }
 }
 const deleteContactMethod = (configId) => {
-  delConfig(configId,extraConfigType.value).then(res => {
+  delConfig(configId).then(res => {
    if (res.code === 1000) {
      ElMessage.success(res.msg)
      tableIns.value.refresh()
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -17,6 +17,16 @@
          />
        </el-select>
      </el-form-item>
+      <el-form-item label="外部配置类型" prop="extraConfigType">
+        <el-select v-model="queryParams.extraConfigType" placeholder="请选择外部配置类型" clearable filterable>
+          <el-option
+              v-for="dict in cacheStore.getDict('extra_config_type')"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
      <el-form-item>
        <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
        <el-button @click="handleReset" :icon="Refresh">重置</el-button>
@@ -24,12 +34,12 @@
    </el-form>
    <div class="query-btn">
      <el-button type="primary" v-perm="['admin:config:add']" @click="handleAdd" :icon="Plus" plain>新增</el-button>
-      <el-button type="danger" v-perm="['admin:config:del']" @click="handleMoreDelete(configIds,configNameList)"
-                 :icon="Delete" plain
-                 :disabled="disabled">删除
-      </el-button>
-      <el-button type="warning" v-perm="['admin:config:export']" @click="handleExport" :icon="Download" plain>导出
-      </el-button>
+<!--      <el-button type="danger" v-perm="['admin:config:del']" @click="handleMoreDelete(configIds,configNameList)"-->
+<!--                 :icon="Delete" plain-->
+<!--                 :disabled="disabled">删除-->
+<!--      </el-button>-->
+<!--      <el-button type="warning" v-perm="['admin:config:export']" @click="handleExport" :icon="Download" plain>导出-->
+<!--      </el-button>-->
    </div>
    <div class="table">
      <el-table
@@ -41,7 +51,7 @@
          @select="handleSelect"
          v-tabh
      >
-        <el-table-column type="selection" width="55"/>
+<!--        <el-table-column type="selection" width="55"/>-->
        <el-table-column label="序号" type="index" width="60"/>
        <el-table-column prop="configName" label="参数名称" align="center"/>
        <el-table-column prop="configKey" label="参数键名" align="center"/>
@@ -51,13 +61,23 @@
            <tag dict-type="yes_no" :value="scope.row.configType"/>
          </template>
        </el-table-column>
+        <el-table-column prop="extraConfigType" label="外部配置类型" align="center">
+          <template #default="scope">
+            <div v-if="scope.row.extraConfigType">
+              <tag dict-type="extra_config_type" :value="scope.row.extraConfigType"/>
+            </div>
+            <div v-else>
+              <span>--</span>
+            </div>
+          </template>
+        </el-table-column>
        <el-table-column prop="remark" label="备注" align="center"/>
        <el-table-column label="操作">
          <template #default="scope">
            <el-button type="primary" size="mini" v-perm="['admin:config:edit']"
                       @click="handleEdit(scope.row.configId)" link>编辑
            </el-button>
-            <popover-delete :name="scope.row.dsName" :type="'参数配置表'" :perm="['admin:config:del']"
+            <popover-delete :name="scope.row.configName" :type="'参数配置表'" :perm="['admin:config:del']"
                            @delete="handleDelete(scope.row.configId)"/>
          </template>
        </el-table-column>
@@ -96,11 +116,24 @@
              </el-select>
            </el-form-item>
          </el-col>
+
          <el-col :span="11">
            <el-form-item label="备注" prop="remark">
              <el-input v-model="form.remark" placeholder="请输备注"></el-input>
            </el-form-item>
          </el-col>
+          <el-col :span="11"  :offset="2">
+            <el-form-item label="外部配置类型" prop="extraConfigType" v-if="form.configType==0">
+              <el-select v-model="form.extraConfigType" placeholder="请选择外部配置类型" clearable filterable>
+                <el-option
+                    v-for="dict in cacheStore.getDict('extra_config_type')"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
        </el-row>
      </el-form>
      <template #footer>
@@ -148,16 +181,16 @@ const form = ref()
 const formInstance = ref()
 const formRules = ref({
  configName: [
-    {required: true, message: "参数名称不能为空", trigger: "blur"},
+    {required: true, message: "参数名称不能为空", trigger: ["change","blur"]},
  ],
  configKey: [
-    {required: true, message: "参数键名不能为空", trigger: "blur"},
+    {required: true, message: "参数键名不能为空", trigger: ["change","blur"]},
  ],
  configValue: [
-    {required: true, message: "参数键值不能为空", trigger: "blur"},
+    {required: true, message: "参数键值不能为空", trigger:["change","blur"]},
  ],
  configType: [
-    {required: true, message: "系统内置不能为空", trigger: "change"},
+    {required: true, message: "系统内置不能为空", trigger: ["change","blur"]},
  ],
 })

@@ -214,6 +247,9 @@ const handleSubmit = async (instance) => {
        }
      })
    } else {
+      if(form.value.configType==1){
+        delete form.value.extraConfigType
+      }
      editConfig(form.value).then(res => {
        if (res.code === 1000) {
          ElMessage.success(res.msg)
@@ -231,7 +267,7 @@ const handleAdd = async () => {
  restFrom()
  title.value = "新增参数配置表"
  isVisited.value = true
-  nextTick(() => {
+  await nextTick(() => {
    // 清空校验
    formInstance.value.clearValidate()
  })
@@ -241,6 +277,7 @@ const handleEdit = async (configId) => {
  restFrom()
  getConfigDetails(configId).then(res => {
    if (res.code === 1000) {
+      res.data.configType= res.data.configType+''
      form.value = res.data
      title.value = "编辑参数配置表"
      isVisited.value = true
@@ -253,10 +290,10 @@ const handleEdit = async (configId) => {
    formInstance.value.clearValidate()
  })
 }
-//导出excel
-const handleExport = () => {
-  downLoadExcel('/config/export', {...queryParams})
-}
+// //导出excel
+// const handleExport = () => {
+//   downLoadExcel('/config/export', {...queryParams})
+// }

 //勾选table数据行的 Checkbox
 const handleSelect = async (selection) => {
--- a/src/views/system/role/DistributeUser.vue
+++ b/src/views/system/role/DistributeUser.vue
@@ -320,9 +320,15 @@ const handleDialogSelect = (selection) => {
  }
 }
 const handleSubmit = (userIds) => {
+  let ids=[]
+  if(userIds instanceof Array){
+    ids=userIds
+  }else{
+    ids.push(userIds)
+  }
  roleBindUser({
    id: roleId,
-    ids: userIds,
+    ids: ids,
  }).then(res => {
    if (res.code === 1000) {
      ElMessage.success(res.msg);
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1,7 +1,9 @@
 <template>
  <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
  <fvTable ref="tableIns" :tableConfig="tableConfig" @headBtnClick="headBtnClick"></fvTable>
-  <fvFormDialog v-if="showAddOrEditUserDialog" ref="formDialogRef" :title="dialogTitle" :form-schema="formSchema" :form-rules="formRules" @dialogCancel="handleCancel" @dialogSubmit="handleSubmit"></fvFormDialog>
+  <fvFormDialog ref="formDialogRef" :title="dialogTitle" :dialogType="dialogType"
+                :form-schema="formSchema" :form-rules="formRules"
+                @dialogSubmit="handleSubmitAddressBook"></fvFormDialog>
 </template>

 <script setup>
@@ -11,6 +13,7 @@ import {useCacheStore} from "@/stores/cache.js";

 const tableIns = ref()
 const formDialogRef = ref()
+const dialogType = ref("");
 const showAddOrEditUserDialog = ref(false)
 const dialogTitle = ref("");
 const searchConfig = reactive([
@@ -68,7 +71,7 @@ const tableConfig = reactive({
  api: '/user',
  params: {},
  btns: [
-    {name: '导入', key: 'add', type: 'primary'},
+    // {name: '新增', key: 'add', type: 'primary'},
  ]
 })
 const formRules = reactive({
@@ -179,36 +182,60 @@ const headBtnClick = (key) => {
 }
 //新增用户
 const handleAdd = () => {
-  // showAddOrEditUserDialog.value = true
+  showAddOrEditUserDialog.value = true
  // formRules.value.password[0].required = true
  // restForm();
-  // dialogTitle.value = "新增用户";
-  // nextTick(()=>{
-  //   // 清空校验
-  //   formDialogRef.value.getFormInstance().clearValidate()
-  //   formDialogRef.value.getFormInstance().resetFields()
-  // })
+  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) => {
+  getUserDetail(row.userId).then(res => {
+    if (res.code === 1000) {
+      ElMessage.success(res.msg)
+      nextTick(() => {
+        formDialogRef.value.getFormInstance().setValues(res.data)
+        // 清空校验
+        formDialogRef.value.getFormInstance().clearValidate()
+      })
+    } else {
+    }
+  })
+}
+
 //取消
 const handleCancel = () => {
  showAddOrEditUserDialog.value = false;
 };
-
 //提交
 const handleSubmit = async (formInstance) => {
  if (!formInstance) return;
-  formInstance.validate(async (valid) => {
-    if (!valid) return;
-    // if (title.value === "新增用户") {
-    //   addUser(userForm.value).then(res => {
-    //     if (res.code === 1000) {
-    //       ElMessage.success(res.msg);
-    //       isVisited.value = false;
-    //     } else {
-    //       ElMessage.error(res.msg);
-    //     }
-    //   });
-    // }
-  })
+  let validate = await formInstance.validate()
+  if (!validate.isValidate) return;
+  if (dialogType.value === "add") {
+    addUser(formInstance.getValues()).then(res => {
+      if (res.code === 1000) {
+        ElMessage.success(res.msg);
+        tableIns.value.refresh()
+        formDialogRef.value.openOrCloseDialog(false)
+      } else {
+        ElMessage.error(res.msg);
+      }
+    });
+  }
+  // editUser
 }
 </script>
--- a/src/views/task-management/all-work-order/index.vue
+++ b/src/views/task-management/all-work-order/index.vue
@@ -1,6 +1,5 @@
 <template>
-  <fvSearchForm :searchConfig="searchConfig" @search="search">
-  </fvSearchForm>
+  <fvSearchForm :searchConfig="searchConfig" @search="search"></fvSearchForm>
  <fvTable ref="tableIns" :tableConfig="tableConfig" :data="mockData" @headBtnClick="headBtnClick"></fvTable>
  <WorkDialog ref="workDialogRef" :rowData="rowData" />
 </template>
@@ -30,7 +29,9 @@ const mockData = ref([
  }
 ])
 const auths = reactive({
-  report: ['mosr:collect:reported'],
+  detail: ['order:order:detail'],
+  close: ['order:order:close'],
+  delete: ['order:order:del'],
 })
 const searchConfig = reactive([
  {
@@ -81,10 +82,10 @@ const searchConfig = reactive([
    component: 'el-input',
  },
  {
-    label: '创建日期',
-    prop: 'createTime',
+    label: '创建时间',
+    prop: 'createdTime',
    props: {
-      placeholder: '请选择',
+      placeholder: '请选择创建时间',
      type: 'datetime',
      clearable: true,
      checkStrictly: true,
@@ -96,18 +97,22 @@ const searchConfig = reactive([
    label: '处理时间',
    prop: 'processedTime',
    props: {
-      placeholder: '请选择',
+      placeholder: '请选择处理时间',
+      type: 'datetime',
      clearable: true,
-      checkStrictly: true
+      checkStrictly: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
    },
    component: 'el-date-picker',
  }, {
    label: '完成时间',
    prop: 'completionTime',
    props: {
-      placeholder: '请选择',
+      placeholder: '请选择完成时间',
+      type: 'datetime',
      clearable: true,
-      checkStrictly: true
+      checkStrictly: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
    },
    component: 'el-date-picker',
  }
@@ -186,7 +191,7 @@ const tableConfig = reactive({
      align: 'center'
    },
    {
-      prop: 'createTime',
+      prop: 'createdTime',
      label: '创建时间',
      align: 'center',
      width: 200
@@ -220,15 +225,15 @@ const tableConfig = reactive({

        let btn = []
        btn.push({ label: '详情', prem: auths.detail, func: () => handleDetail(row), type: 'primary' })
-        btn.push({ label: '关单', prem: auths.detail, func: () => handleClose(row), type: 'primary' })
-        btn.push({ label: '删除', prem: auths.detail, func: () => handleDelete(row), type: 'danger'})
+        btn.push({ label: '关单', prem: auths.close, func: () => handleClose(row), type: 'primary' })
+        btn.push({ label: '删除', prem: auths.delete, func: () => handleDelete(row), type: 'danger'})
        return (
          <div style={{ width: '100%' }}>
            {
              btn.map(item => (
                <el-button
                  type={item.type}
-                  // v-perm={item.prem}
+                  v-perm={item.prem}
                  onClick={() => item.func()}
                  link
                >
--- a/src/views/task-management/historical-work-order/index.vue
+++ b/src/views/task-management/historical-work-order/index.vue
@@ -31,7 +31,9 @@ const mockData = ref([
  }
 ])
 const auths = reactive({
-  report: ['mosr:collect:reported'],
+  detail: ['order:order:detail'],
+  close: ['order:order:close'],
+  delete: ['order:order:del'],
 })
 const searchConfig = reactive([
  {
@@ -72,30 +74,37 @@ const searchConfig = reactive([
    component: 'el-input',
  },
  {
-    label: '创建日期',
-    prop: 'createTime',
+    label: '创建时间',
+    prop: 'createdTime',
    props: {
-      placeholder: '请选择',
+      placeholder: '请选择创建时间',
+      type: 'datetime',
      clearable: true,
-      checkStrictly: true
+      checkStrictly: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
    },
    component: 'el-date-picker',
-  }, {
+  },
+  {
    label: '处理时间',
    prop: 'processedTime',
    props: {
-      placeholder: '请选择',
+      placeholder: '请选择处理时间',
+      type: 'datetime',
      clearable: true,
-      checkStrictly: true
+      checkStrictly: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
    },
    component: 'el-date-picker',
  }, {
    label: '完成时间',
    prop: 'completionTime',
    props: {
-      placeholder: '请选择',
+      placeholder: '请选择完成时间',
+      type: 'datetime',
      clearable: true,
-      checkStrictly: true
+      checkStrictly: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
    },
    component: 'el-date-picker',
  }
@@ -167,7 +176,7 @@ const tableConfig = reactive({
      align: 'center'
    },
    {
-      prop: 'createTime',
+      prop: 'createdTime',
      label: '创建时间',
      align: 'center',
      width: 200
@@ -200,16 +209,16 @@ const tableConfig = reactive({
        // console.log(row);

        let btn = []
-        btn.push({ label: '详情', prem: auths.detail, func: () => handleDetail(row), type: 'primary' })
-        btn.push({ label: '关单', prem: auths.detail, func: () => handleClose(row), type: 'primary' })
-        btn.push({ label: '删除', prem: auths.detail, func: () => handleDelete(row), type: 'danger' })
+        btn.push({ label: '详情',prem: auths.detail, func: () => handleDetail(row), type: 'primary' })
+        btn.push({ label: '关单',  prem: auths.close,  func: () => handleClose(row), type: 'primary' })
+        btn.push({ label: '删除',  prem: auths.delete, func: () => handleDelete(row), type: 'danger' })
        return (
          <div style={{ width: '100%' }}>
            {
              btn.map(item => (
                <el-button
                  type={item.type}
-                  // v-perm={item.prem}
+                  v-perm={item.prem}
                  onClick={() => item.func()}
                  link
                >
--- a/src/views/task-management/pending-work-order/index.vue
+++ b/src/views/task-management/pending-work-order/index.vue
@@ -31,7 +31,9 @@ const mockData = ref([
  }
 ])
 const auths = reactive({
-  report: ['mosr:collect:reported'],
+  detail: ['order:order:detail'],
+  close: ['order:order:close'],
+  delete: ['order:order:del'],
 })
 const searchConfig = reactive([
  {
@@ -72,30 +74,37 @@ const searchConfig = reactive([
    component: 'el-input',
  },
  {
-    label: '创建日期',
-    prop: 'createTime',
+    label: '创建时间',
+    prop: 'createdTime',
    props: {
-      placeholder: '请选择',
+      placeholder: '请选择创建时间',
+      type: 'datetime',
      clearable: true,
-      checkStrictly: true
+      checkStrictly: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
    },
    component: 'el-date-picker',
-  }, {
+  },
+  {
    label: '处理时间',
    prop: 'processedTime',
    props: {
-      placeholder: '请选择',
+      placeholder: '请选择处理时间',
+      type: 'datetime',
      clearable: true,
-      checkStrictly: true
+      checkStrictly: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
    },
    component: 'el-date-picker',
  }, {
    label: '完成时间',
    prop: 'completionTime',
    props: {
-      placeholder: '请选择',
+      placeholder: '请选择完成时间',
+      type: 'datetime',
      clearable: true,
-      checkStrictly: true
+      checkStrictly: true,
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
    },
    component: 'el-date-picker',
  }
@@ -167,7 +176,7 @@ const tableConfig = reactive({
      align: 'center'
    },
    {
-      prop: 'createTime',
+      prop: 'createdTime',
      label: '创建时间',
      align: 'center',
      width: 200
@@ -201,15 +210,15 @@ const tableConfig = reactive({

        let btn = []
        btn.push({ label: '详情', prem: auths.detail, func: () => handleDetail(row), type: 'primary' })
-        btn.push({ label: '关单', prem: auths.detail, func: () => handleClose(row), type: 'primary' })
-        btn.push({ label: '删除', prem: auths.detail, func: () => handleDelete(row), type: 'danger' })
+        btn.push({ label: '关单', prem: auths.close,func: () => handleClose(row), type: 'primary' })
+        btn.push({ label: '删除', prem: auths.delete, func: () => handleDelete(row), type: 'danger' })
        return (
          <div style={{ width: '100%' }}>
            {
              btn.map(item => (
                <el-button
                  type={item.type}
-                  // v-perm={item.prem}
+                  v-perm={item.prem}
                  onClick={() => item.func()}
                  link
                >
--- a/src/views/voice-management/sensitive-words/index.vue
+++ b/src/views/voice-management/sensitive-words/index.vue
@@ -7,7 +7,7 @@
 </template>

 <script setup lang="jsx">
-import { shallowRef } from 'vue';
+import {reactive, shallowRef} from 'vue';
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 import {ElMessage, ElMessageBox} from "element-plus";
 import {addSensitive, deleteSensitive, editSensitive,getSensitiveDetail} from "@/api/sensitive-words";
@@ -103,6 +103,11 @@ const searchConfig = reactive([
    component: shallowRef(fvSelect),
  },
 ])
+const auths = reactive({
+  add: ['order:sensitive:add'],
+  edit: ['order:sensitive:edit'],
+  delete: ['order:sensitive:del'],
+})
 const sensitiveTableConfig= reactive({
  columns: [
    {
@@ -116,11 +121,6 @@ const sensitiveTableConfig= reactive({
      align: 'center',
      width: 80,
    },
-    {
-      prop: 'sensitiveId',
-      label: '敏感词ID',
-      align: 'center'
-    },
    {
      prop: 'content',
      label: '内容',
@@ -158,15 +158,15 @@ const sensitiveTableConfig= reactive({
      showOverflowTooltip: false,
      currentRender: ({row, index}) => {
        let btn = []
-        btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
-        btn.push({label: '删除', func: () => handleSingleDelete(row), type: 'danger'})
+        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}
+                        v-perm={item.prem}
                        onClick={() => item.func()}
                        link
                    >
@@ -183,8 +183,8 @@ const sensitiveTableConfig= reactive({
  api: '/sensitive/list',
  params: {},
  btns: [
-    {name: '新增', key: 'add',type:'primary',icon:'Plus'},
-    {name: '删除', key: 'delete', type: 'danger'},
+    {name: '新增', key: 'add',type:'primary',icon:'Plus', auth: auths.add},
+    {name: '删除', key: 'delete', type: 'danger', auth: auths.delete},
  ]
 })
 const searchSensitive = (val) => {
@@ -229,13 +229,13 @@ const handleEdit = (row) => {
 const getDetail = (row) => {
  getSensitiveDetail(row.sensitiveId).then(res => {
    if (res.code === 1000) {
-      ElMessage.success(res.msg)
      nextTick(() => {
        formDialogRef.value.getFormInstance().setValues(res.data)
        // 清空校验
        formDialogRef.value.getFormInstance().clearValidate()
      })
    } else {
+      ElMessage.success(res.msg)
    }
  })
 }
--- a/src/views/voice-management/verbal-trick/index.vue
+++ b/src/views/voice-management/verbal-trick/index.vue
@@ -10,6 +10,7 @@
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 import {ElMessage, ElMessageBox} from "element-plus";
 import {addVerbal, editVerbal,deleteVerbal, getVerbalDetail} from "@/api/verbal-trick";
+import {reactive} from "vue";
 const router = useRouter()
 const dialogTitle = ref("");
 const dialogType = ref("");
@@ -18,47 +19,53 @@ const formDialogRef = ref()
 const tableIns = ref()
 const searchConfig = reactive([
  {
-    label: '名称',
-    prop: 'verbalName',
+    label: '话术问题',
+    prop: 'query',
    props: {
-      placeholder: '请输入名称查询',
+      placeholder: '请输入话术问题查询',
      clearable: true,
      checkStrictly: true
    },
    component: 'el-input',
  },
  {
-    label: '类型',
-    prop: 'verbalType',
+    label: '话术答案',
+    prop: 'answer',
    props: {
-      placeholder: '请输入类型查询',
+      placeholder: '请输入话术答案查询',
      clearable: true,
      checkStrictly: true
    },
    component: 'el-input',
  },
-  {
-    label: '内容',
-    prop: 'verbalContent',
-    props: {
-      placeholder: '请输入内容查询',
-      clearable: true,
-      checkStrictly: true
-    },
-    component: 'el-input',
-  },
-  {
-    label: '状态',
-    prop: 'state',
-    props: {
-      placeholder: '请选择状态查询',
-      cacheKey: 'verbal_trick_state',
-      clearable: true,
-      filterable: true,
-    },
-    component: shallowRef(fvSelect),
-  },
+  // {
+  //   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: [
    {
@@ -73,43 +80,57 @@ const verbalTrickTableConfig = reactive({
      width: 80,
    },
    {
-      prop: 'verbalId',
-      label: '话术ID',
+      prop: 'query',
+      label: '话术问题',
      align: 'center'
    },
    {
-      prop: 'verbalName',
-      label: '名称',
+      prop: 'answer',
+      label: '话术答案',
      align: 'center'
    },
+    // {
+    //   prop: 'verbalContent',
+    //   label: '内容',
+    //   align: 'center'
+    // },
    {
-      prop: 'verbalType',
-      label: '类型',
-      align: 'center'
-    },
-    {
-      prop: 'verbalContent',
-      label: '内容',
-      align: 'center'
-    },
-    {
-      prop: 'createTime',
-      label: '创建时间',
-      align: 'center'
-    },
-    {
-      prop: 'state',
-      label: '状态',
+      prop: 'callOff',
+      label: '是否挂断电话',
      align: 'center',
-      showOverflowTooltip: false,
      currentRender: ({ row, index }) => {
-        if (row.state !== null) {
-          return (<Tag dictType={'verbal_trick_state'} value={row.state} />)
+        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: '操作',
@@ -119,15 +140,15 @@ const verbalTrickTableConfig = reactive({
      showOverflowTooltip: false,
      currentRender: ({row, index}) => {
        let btn = []
-        btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
-        btn.push({label: '删除', func: () => handleSingleDelete(row), type: 'danger'})
+        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}
+                        v-perm={item.prem}
                        onClick={() => item.func()}
                        link
                    >
@@ -143,72 +164,78 @@ const verbalTrickTableConfig = reactive({
  api: '/verbal/list',
  params: {},
  btns: [
-    {name: '新增', key: 'add',type:'primary',icon:'Plus'},
-    {name: '删除', key: 'delete', type: 'danger'},
+    {name: '新增', key: 'add',type:'primary',icon:'Plus', auth: auths.add},
+    {name: '删除', key: 'delete', type: 'danger', auth: auths.delete},
  ]
 })
 const formRules = reactive({
-  verbalName: [
-    {required: true, message: "请输入名称", trigger: ["change", "blur"]}
+  query: [
+    {required: true, message: "请输入话术问题", trigger: ["change", "blur"]}
  ],
-  verbalType: [
-    {required: true, message: "请输入类型", trigger: ["change", "blur"]}
-  ],
-  verbalContent: [
-    {required: true, message: "请输入内容", trigger: ["change", "blur"]}
-  ],
-  state: [
-    {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: 'verbalName',
+      label: '话术问题',
+      prop: 'query',
      component: 'el-input',
      colProps: {
        span: 24
      },
      props: {
-        placeholder: '请输入名称',
+        placeholder: '请输入话术问题',
        clearable: true,
+        type:'textarea',
+        rows:3
      }
    },
    {
-      label: '类型',
-      prop: 'verbalType',
+      label: '话术答案',
+      prop: 'answer',
      component: 'el-input',
      colProps: {
        span: 24
      },
      props: {
-        placeholder: '请输入类型',
+        placeholder: '请输入话术答案',
        clearable: true,
+        type:'textarea',
+        rows:3
      }
    },
    {
-      label: '内容',
-      prop: 'verbalContent',
-      component: 'el-input',
-      colProps: {
-        span: 24
-      },
-      props: {
-        placeholder: '请输入内容',
-        clearable: true,
-      }
-    },
-    {
-      label: '状态',
-      prop: 'state',
+      label: '是否挂断电话',
+      prop: 'callOff',
      component: shallowRef(fvSelect),
      colProps: {
        span: 24
      },
      props: {
-        placeholder: '请选择状态',
-        cacheKey: 'verbal_trick_state',
+        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,
      }
@@ -254,22 +281,23 @@ const handleEdit = (row) => {
  dialogType.value = "edit";
 }
 const getDetail = (row) => {
-  getVerbalDetail(row.verbalId).then(res => {
+  getVerbalDetail(row.templateId).then(res => {
    if (res.code === 1000) {
-      ElMessage.success(res.msg)
+      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.verbalId).join()
+    verbalIds.value = selection.map(item => item.templateId).join()
  } else {
    verbalIds.value=''
  }
@@ -298,12 +326,12 @@ const handleMoreDelete = () => {
  }
 }
 const handleSingleDelete = (row) => {
-  ElMessageBox.confirm(`确认删除名称为${row.verbalName}的话术吗?`, '系统提示', {
+  ElMessageBox.confirm(`确认删除问题为${row.query}的话术吗?`, '系统提示', {
    confirmButtonText: '确定',
    cancelButtonText: '取消',
    type: 'warning'
  }).then(() => {
-    deleteContactMethod(row.verbalId)
+    deleteContactMethod(row.templateId)
  })
 }

--- a/src/views/voice-management/voice-config/index.vue
+++ b/src/views/voice-management/voice-config/index.vue
@@ -7,7 +7,7 @@
 </template>

 <script setup lang="jsx">
-import { shallowRef } from 'vue';
+import {reactive, 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";
@@ -131,12 +131,17 @@ const searchConfig = reactive([
    component: shallowRef(fvSelect),
  }
 ])
+const auths = reactive({
+  add: ['extra:config:add'],
+  edit: ['extra:config:edit'],
+  delete: ['extra:config:del'],
+})
 const phoneTrafficTableConfig = reactive({
  columns: [
-    {
-      type: 'selection',
-      prop: 'selection'
-    },
+    // {
+    //   type: 'selection',
+    //   prop: 'selection'
+    // },
    {
      prop: 'index',
      type: 'index',
@@ -191,15 +196,15 @@ const phoneTrafficTableConfig = reactive({
      showOverflowTooltip: false,
      currentRender: ({row, index}) => {
        let btn = []
-        btn.push({label: '编辑', func: () => handleEdit(row), type: 'primary'})
-        btn.push({label: '删除', func: () => handleSingleDelete(row), type: 'danger'})
+        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}
+                        v-perm={item.prem}
                        onClick={() => item.func()}
                        link
                    >
@@ -217,8 +222,8 @@ const phoneTrafficTableConfig = reactive({
    extraConfigType:extraConfigType.value
  },
  btns: [
-    {name: '新增', key: 'add',type:'primary'},
-    {name: '删除', key: 'delete', type: 'danger'},
+    {name: '新增', key: 'add',type:'primary',auth: auths.add},
+    // {name: '删除', key: 'delete', type: 'danger'},
  ]
 })
 const searchPhoneTraffic = (val) => {
@@ -261,9 +266,8 @@ const handleEdit = (row) => {
  dialogType.value = "edit";
 }
 const getDetail = (row) => {
-  getConfigDetails(row.configId,extraConfigType.value).then(res => {
+  getConfigDetails(row.configId).then(res => {
    if (res.code === 1000) {
-      ElMessage.success(res.msg)
      res.data.configType=''+res.data.configType
      nextTick(() => {
        formDialogRef.value.getFormInstance().setValues(res.data)
@@ -271,6 +275,7 @@ const getDetail = (row) => {
        formDialogRef.value.getFormInstance().clearValidate()
      })
    } else {
+      ElMessage.success(res.msg)
    }
  })
 }
@@ -283,7 +288,7 @@ const selectionChange = (selection) => {
  }
 }
 const deleteContactMethod = (configId) => {
-  delConfig(configId,extraConfigType.value).then(res => {
+  delConfig(configId).then(res => {
    if (res.code === 1000) {
      ElMessage.success(res.msg)
      tableIns.value.refresh()
--- a/vite.config.js
+++ b/vite.config.js
@@ -77,9 +77,9 @@ export default defineConfig({
      // },
      "/api": {
        // target: "http://frp.feashow.cn:31800/",
-        target: "http://112.19.165.99:20002/",
+        target: "http://10.8.105.91:28080/",
        changeOrigin: true,
-        // rewrite: (path) => path.replace(/^\/api/, ""),
+        rewrite: (path) => path.replace(/^\/api/, ""),
      },
      // "/socket": {
      //   target: "ws://frp.feashow.cn:8081/ws",