更新 docker.sh

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

.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
+#      - npm config set registry https://registry.npmmirror.com
-      - set NODE_OPTIONS=--openssl-legacy-provider
+#      - set NODE_OPTIONS=--openssl-legacy-provider
-      # - npm install
+#      - npm install
       - npm run build
       - echo $NODE_MODULES_PATH
       - cp -r dist /app/build/$DRONE_REPO_NAME

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 --restart=always -d -p 8080:80 smartopsweb:latest
+docker run --name smartopsweb --link smartopsserver --restart=always -d -p 28081:80 smartopsweb:latest
 

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;

src/api/auth/auth.js

@@ -1,4 +1,5 @@
 import request from "@/utils/request.js";
+import { method } from "lodash";
 
 export const modifyUser=(data)=>{
     return request({
@@ -9,8 +10,16 @@ export const modifyUser=(data)=>{
 }
 export const editPassword=(data)=>{
     return request({
-        url:'/admin/mosr/user/update/password',
+        url:'/ops/user/update/password',
         method:'post',
         data
     })
 }
+
+//查询用户详细
+export const detailsUser=()=>{
+    return request({
+        url:'ops/user/detail/info',
+        method:'get'
+    })
+}

src/api/phone-traffic-config/index.js

@@ -0,0 +1,36 @@
+import request from '@/utils/request.js'
+
+// 获取参数配置表详情
+export const getConfigDetails = (configId,extraConfigType) => {
+    return request({
+        url: `/extra/config/${configId}/${extraConfigType}`,
+        method: 'get'
+    })
+}
+
+// 新增参数配置表
+export const addConfig = (data) => {
+    return request({
+        url: '/extra/config',
+        method: 'post',
+        data
+    })
+}
+
+// 修改参数配置表
+export const editConfig = (data) => {
+    return request({
+        url: '/extra/config',
+        method: 'put',
+        data
+    })
+}
+
+// 删除参数配置表
+export const delConfig =(configIdList,extraConfigType) => {
+    return request({
+        url: `/extra/config/${configIdList}/${extraConfigType}`,
+        method: 'delete'
+    })
+}
+

src/api/workbench/index.js

@@ -0,0 +1,11 @@
+import request from '@/utils/request.js'
+import { method } from 'lodash'
+
+//获取历史通话文本记录
+
+export const getHistoryCallContent=(params)=>{
+    return request({
+        url:`/text/history/list/${params}`,
+        method:'get'
+    })
+}

src/components/infoLiveCall/index.vue

@@ -1,30 +1,109 @@
 <script setup>
-import LiveCall from '@/components/liveCall/index.vue'
+import LiveCallItem from '@/components/liveCall/LiveCallItem.vue'
-const dialogVisible = ref(false);
+import {getHistoryCallContent} from '@/api/workbench';
-const open = (row) => {
+import {ElMessage} from "element-plus";
-    dialogVisible.value = true;
-};
-defineExpose({
-    open,
-});
 
+const dialogVisible = ref(false);
+const recordLeftRef = ref(null);
+const emit = defineEmits(['update:value'])
+const props = defineProps({
+  value: {
+    type:String,
+    default:''
+  }
+})
+
+const open = (row) => {
+  dialogVisible.value = true;
+};
+
+const leftHeadData = ref({
+  // 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 convertArrayToMap=(array)=> {
+  const map = new Map();
+  array.forEach(item => {
+    // 如果时间戳对应的键已经存在，则添加到现有数组中
+    if (map.has(item.conversationTimestamp)) {
+      map.get(item.conversationTimestamp).push(item);
+    } else {
+      // 否则，创建一个新的数组并添加元素
+      map.set(item.conversationTimestamp, [item]);
+    }
+  });
+  return map;
+}
+
+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].callIdNumber || '--';
+         leftHeadData.value.phone = res.data[0].callPhone || '--';
+         leftHeadData.value.orderName = res.data[0].orderName || '--';
+       }
+     } else {
+       ElMessage.error(res.msg);
+     }
+  })
+}
+
+const scrollToBottom = (scrollbarRef) => {
+  if (scrollbarRef) {
+    const container = scrollbarRef.$el.querySelector('.el-scrollbar__wrap');
+    container.style.scrollBehavior = 'smooth'; // 添加平滑滚动效果
+    container.scrollTop = container.scrollHeight;
+  }
+};
+
+scrollToBottom(recordLeftRef.value)
+
+defineExpose({
+  open,
+});
 </script>
 
 <template>
-    <el-dialog v-model="dialogVisible" title="历史通话记录" width="1000"  :before-close="handleClose" class="box">
+  <el-dialog v-model="dialogVisible" title="历史通话记录" width="700" class="box">
-        <LiveCall />
+    <LiveCallItem ref="recordLeftRef" :recordArray="recordLeftObj" :headData="leftHeadData" style="width: 100%;" :detailLoading="detailLoading"/>
-        <template #footer>
+    <template #footer>
-            <div class="dialog-footer">
+      <div class="dialog-footer">
-                <el-button type="primary" @click="dialogVisible = false">
+        <el-button type="primary" @click="dialogVisible = false">
-                    关闭
+          关闭
-                </el-button>
+        </el-button>
-            </div>
+      </div>
-        </template>
+    </template>
-    </el-dialog>
+  </el-dialog>
 </template>
 
 <style>
-.box{
+.box {
-    height: 68vh;
+  /*height: 68vh;*/
 }
 </style>

src/components/liveCall/LiveCallItem.vue

@@ -1,33 +1,42 @@
 <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">
-        <div v-for="(item,index) in recordObj.content" :key="index">
+        <div v-for="(item,index) in recordArray" :key="index">
-          <div class="time-grap"><span>{{ item.conversationTimestamp || '6月5日 12:05' }}</span></div>
+          <div v-for="[key,value]  of item.textVoList">
-          <!-- 我的 -->
+            <div class="time-grap"><span>{{ key || '6月5日 12:05' }}</span></div>
-          <div v-if="item.speaker==0" class="word-my">
+            <div v-for="(recordItem)  in value">
-            <div class="info">
+              <!-- 我的 -->
-              <p class="name">{{ item.speaker==0?headData.username:'AI助手' }} </p>
+              <div v-if="recordItem.speaker==0" class="word-my">
-              <div class="info-content">{{ item.message }}</div>
+                <div class="info">
-            </div>
+                  <p class="name">{{ recordItem.speaker == 0 ? recordItem.callIdNumber : 'AI助手' }} </p>
-            <el-avatar text="我"/>
+                  <div class="info-content">{{ recordItem.message }}</div>
-          </div>
+                </div>
-          <!-- 对方 -->
+                <el-avatar text="我"/>
-          <div v-else class="word">
+              </div>
-            <el-avatar text="对方"/>
+              <!-- 对方 -->
-            <div class="info">
+              <div v-else class="word">
-              <p class="name">{{ item.speaker==0?headData.username:'AI助手'  }} </p>
+                <el-avatar text="对方"/>
-              <div class="info-content">{{ item.message }}</div>
+                <div class="info">
+                  <p class="name">{{ recordItem.speaker == 0 ? recordItem.callIdNumber : 'AI助手' }} </p>
+                  <div class="info-content">{{ recordItem.message }}</div>
+                </div>
+              </div>
             </div>
           </div>
+          <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>
@@ -35,20 +44,28 @@
 
 <script setup>
 import {defineProps} from "vue";
-const scrollbarRef=ref()
+
+const scrollbarRef = ref()
 const props = defineProps({
-  recordObj: {
+  recordArray: {
-    type: Object,
+    type: Array,
-    default: {}
+    default: []
   },
   headData: {
     type: Object,
     default: {}
   },
+  detailLoading: {
+    type: Boolean,
+    default: false
+  },
 })
-const getScrollbarRef=()=>{
+const getScrollbarRef = () => {
-  return  scrollbarRef.value
+  return scrollbarRef.value
 }
+watch(() => props.detailLoading,  (newVal) => {
+  props.detailLoading=newVal
+})
 defineExpose({
   getScrollbarRef
 })
@@ -56,7 +73,7 @@ defineExpose({
 
 <style lang="scss" scoped>
 .live-call {
-  width: 48%;
+  width: 50%;
   height: 47vh;
   margin-bottom: 20px;
   overflow: hidden;

src/components/liveCall/LiveCallItemHome.vue

@@ -0,0 +1,234 @@
+<template>
+  <div class="live-call">
+    <div class="header">
+      <div>
+        <span style="margin-right: 20px">姓名：{{ recordObj.name ||'--'}}</span>
+        <span>电话号码：{{ recordObj.phone ||'--'}}</span>
+      </div>
+      <div><span>工单名称：{{ recordObj.orderName||'--' }}</span></div>
+<!--      <div><span>{{ recordObj.type=='1'?'线路一':recordObj.type=='2'?'线路二':'' }}</span></div>-->
+      <div><span>{{ lineName  }}</span></div>
+    </div>
+    <el-scrollbar ref="scrollbarRef" class="scrollbar">
+      <div class="chat-content" ref="innerRef">
+        <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 v-if="item.speaker==0" class="word-my">
+              <div class="info">
+                <!--              <p class="name">{{ item.speaker==0?recordObj.name:'AI助手' }} </p>-->
+                <p class="name">{{ item.speaker==0?item.callIdNumber:'AI助手' }} </p>
+                <div class="info-content">{{ item.message }}</div>
+              </div>
+              <el-avatar text="我"/>
+            </div>
+
+            <!-- 对方 -->
+            <div v-else class="word">
+              <el-avatar text="对方"/>
+              <div class="info">
+                <p class="name">{{ item.speaker==0?item.callIdNumber:'AI助手' }} </p>
+                <div class="info-content">{{ item.message }}</div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+<!--        <el-empty description="暂无通话记录~" v-else/>-->
+
+      </div>
+    </el-scrollbar>
+  </div>
+</template>
+
+<script setup>
+import {defineProps} from "vue";
+const scrollbarRef=ref()
+const props = defineProps({
+  recordObj: {
+    type: Object,
+    default: {}
+  },
+  headData: {
+    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
+})
+</script>
+
+<style lang="scss" scoped>
+.live-call {
+  width: 48%;
+  height: 47vh;
+  margin-bottom: 20px;
+  overflow: hidden;
+  border: 1px solid #d5d4d4;
+  border-radius: 10px;
+
+  .header {
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    height: 40px;
+    border-bottom: 1px solid #d5d4d4;
+  }
+
+  .scrollbar {
+    padding: 10px 10px 0 10px;
+    height: 42vh;
+
+    .el-scrollbar__wrap {
+      height: 100%;
+      overflow: scroll;
+      overflow-x: auto;
+    }
+
+    // 聊天内容样式
+    .chat-content {
+      width: 100%;
+
+      .time-grap {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        > span {
+          font-size: 13px;
+          padding: 5px 10px;
+          border: 1px solid #d7d9da;
+          border-radius: 25px;
+        }
+
+        margin-bottom: 10px;
+      }
+
+      .word {
+        display: flex;
+        margin-bottom: 20px;
+
+        img {
+          width: 40px;
+          height: 40px;
+          border-radius: 50%;
+        }
+
+        .info {
+          margin-left: 10px;
+
+          .name {
+            font-size: 12px;
+            color: rgba(51, 51, 51, 0.8);
+            margin: 0;
+            height: 20px;
+            line-height: 20px;
+            margin-top: -5px;
+          }
+
+          .info-content {
+            padding: 10px;
+            font-size: 14px;
+            background: #f5f5f5;
+            position: relative;
+            margin-top: 8px;
+            border: 1px solid #f5f5f5;
+          }
+
+          //小三角形
+          .info-content::before {
+            position: absolute;
+            left: -8px;
+            top: 8px;
+            content: '';
+            border-right: 10px solid #f5f5f5;
+            border-top: 8px solid transparent;
+            border-bottom: 8px solid transparent;
+          }
+        }
+      }
+
+      .word-my {
+        display: flex;
+        justify-content: flex-end;
+        margin-bottom: 20px;
+
+        img {
+          width: 40px;
+          height: 40px;
+          border-radius: 50%;
+        }
+
+        .info {
+          width: 90%;
+          margin-left: 10px;
+          text-align: right;
+
+          .name {
+            font-size: 12px;
+            color: rgba(51, 51, 51, 0.8);
+            height: 20px;
+            line-height: 20px;
+            margin-top: -5px;
+            margin-right: 10px;
+          }
+
+          .info-content {
+            max-width: 70%;
+            padding: 10px;
+            font-size: 14px;
+            float: right;
+            margin-right: 10px;
+            position: relative;
+            margin-top: 8px;
+            background: #A3C3F6;
+            text-align: left;
+          }
+
+          //小三角形
+          .info-content::after {
+            position: absolute;
+            right: -8px;
+            top: 8px;
+            content: '';
+            border-left: 10px solid #A3C3F6;
+            border-top: 8px solid transparent;
+            border-bottom: 8px solid transparent;
+          }
+        }
+      }
+    }
+
+  }
+
+}
+</style>

src/components/liveCall/index.vue

@@ -1,82 +1,37 @@
 <template>
-<!--测试 张三 : 17260625724565   李四: 17260625724123-->
+  <!--测试 张三 : 17260625724565   李四: 17260625724123-->
   <div class="live-call-block">
-    <live-call-item ref="recordLeftRef" :recordObj="recordLeftObj" :headData="leftHeadData" />
+    <live-call-item-home ref="recordLeftRef" :recordObj="recordLeftObj" :headData="leftHeadData" lineName="线路一"/>
-    <live-call-item ref="recordRightRef"  :recordObj="recordRightObj"  :headData="rightHeadData" />
+    <live-call-item-home ref="recordRightRef" :recordObj="recordRightObj" :headData="rightHeadData" lineName="线路二"/>
   </div>
 </template>
 
 <script setup>
+import {useAuthStore} from '@/stores/userstore.js'
 import {getToken} from '@/utils/auth'
+import {usePermisstionStroe} from '@/stores/permisstion'
+
+const permisstionStore = usePermisstionStroe()
+const authStore = useAuthStore()
 //聊天消息滚动面板dom
 const recordLeftRef = ref(null);
 const recordRightRef = ref(null);
-const leftHeadData=ref({
+const leftHeadData = ref({
-  username:'张三',
+  // username: '张三',
-  phone:'13546812315',
+  // phone: '13546812315',
-  orderName:'张三工单',
+  // orderName: '张三工单',
 })
-const rightHeadData=ref({
+const rightHeadData = ref({
-  username:'李四',
+  // username: '李四',
-  phone:'18246812546',
+  // phone: '18246812546',
-  orderName:'李四工单',
+  // orderName: '李四工单',
 })
 const recordLeftObj = ref({
-      content:[]
+  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"
-    // }
-)
 const recordRightObj = ref({
-      content:[]
+  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"
-    // }
-)
 let socket = reactive("");
 let token = getToken();
 let send = {
@@ -95,10 +50,23 @@ const scrollToBottom = (scrollbarRef) => {
 const setWsUrl = (url) => {
   return (window.location.protocol === 'http:' ? "ws://" : "wss://") + window.location.host + import.meta.env.VITE_BASE_WSURL + 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://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()给服务器发送信息
     //连接发生错误的回调方法
@@ -119,31 +87,71 @@ const initWebSocket = () => {
     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);
-        if(data.type=='1'){
+        if (data.type == '1') {
-            recordLeftObj.value.content.push(data.content)
+          recordLeftObj.value.name=data.name
-          console.info("🚀 ~method:onmessage -----", recordLeftObj.value)
+          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({
+              //   callIdNumber: "17282197782048",
+              // conversationId:0,
+              // conversationTimestamp: "",
+              // createTime: "2024-10-08",
+              isLine:true,
+              lineMsg: "一轮通话结束~~",
+              speaker: data.content.speaker
+            })
+          }
+          recordLeftObj.value.content.push(data.content)
+          // console.info("🚀 ~method:onmessage -----", recordLeftObj.value)
           nextTick(() => {
             scrollToBottom(recordLeftRef.value)
           })
-        }else {
+        } else {
-            recordRightObj.value.content.push(data.content)
+          recordRightObj.value.name=data.name
-          console.info("🚀 ~method:onmessage -----", recordRightObj.value)
+          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({
+            //   callIdNumber: "17282197782048",
+            // conversationId:0,
+            // conversationTimestamp: "",
+            // createTime: "2024-10-08",
+              isLine:true,
+              lineMsg: "一轮通话结束~~",
+            speaker: data.content.speaker
+            })
+          }
+          recordRightObj.value.content.push(data.content)
+          // console.info("🚀 ~method:onmessage -----", recordRightObj.value)
           nextTick(() => {
             scrollToBottom(recordRightRef.value);
           })
         }
-
       }
     }
     //连接关闭的回调方法
     socket.onclose = function () {
-      initWebSocket()
+      // initWebSocket()
       console.log("ws连接关闭");
     }
     setInterval(() => {
       socket.send(JSON.stringify(send))
-    }, 10000)
+    }, 5000)
   } catch (e) {
     console.log(e)
     console.log("ws连接失败");

src/components/voice/index.vue

@@ -3,15 +3,23 @@ const dialogVisible = ref(false);
 const open = (row) => {
     dialogVisible.value = true;
 };
+// console.log(dialogVisible.value);
+defineProps({
+    title:String,
+    rowUrl:String
+})
 defineExpose({
     open,
 });
 
+
+// console.log(props.rowUrl);
+
 </script>
 
 <template>
-    <el-dialog v-model="dialogVisible" title="语音详情" width="500" :before-close="handleClose">
+    <el-dialog v-model="dialogVisible" :title="title" width="500" >
-        <audio src="" controls style="width: 100%;"></audio>
+        <audio :src=rowUrl controls style="width: 100%;"></audio>
         <template #footer>
             <div class="dialog-footer">
 

src/views/auth/index.vue

@@ -20,10 +20,11 @@
                     <User />
                   </el-icon>
                   <strong>工号 :</strong>
-
+                  <!-- <p>{{ userInfo.orderNum }}</p> -->
+                  <div class="box-info">{{ userParams.userNumber||'--' }}</div>
 
                 </div>
-                <div>{{ userParams.userNumber }}</div>
+                
               </div>
               <div class="userInfo_item">
                 <div style="display: flex;align-items: center" class="userInfo_label">
@@ -31,18 +32,18 @@
                     <Notification />
                   </el-icon>
                   <strong>邮箱 :</strong>
-
+                  <div class="box-info">{{ userParams.email||'--' }}</div>
                 </div>
-                <div>{{ userParams.email }}</div>
+                
               </div>
               <div class="userInfo_item">
                 <div style="display: flex;align-items: center" class="userInfo_label">
                   <el-icon size="18" style="margin-right: 5px">
                     <Notification />
                   </el-icon><strong>登录账号 :</strong>
-
+                  <div class="box-info">{{ userParams.loginAccount||'--' }}</div>
                 </div>
-                <div>{{ userParams.loginAccount }}</div>
+                
               </div>
               <div class="userInfo_item">
                 <div style="display: flex;align-items: center" class="userInfo_label">
@@ -50,9 +51,9 @@
                     <Folder />
                   </el-icon>
                   <strong>用户名称 :</strong>
-
+                  <div class="box-info">{{ userParams.userName||'--' }}</div>
                 </div>
-                <div>{{ userParams.userName }}</div>
+                
               </div>
               <div class="userInfo_item">
                 <div style="display: flex;align-items: center" class="userInfo_label">
@@ -60,9 +61,9 @@
                     <Folder />
                   </el-icon>
                   <strong>手机号码 :</strong>
-
+                  <div class="box-info">{{ userParams.phoneNumber||'--' }}</div>
                 </div>
-                <div>{{ userParams.userPhone }}</div>
+                
               </div>
               <div class="userInfo_item">
                 <div style="display: flex;align-items: center" class="userInfo_label">
@@ -70,9 +71,9 @@
                     <Folder />
                   </el-icon>
                   <strong>账号类型 :</strong>
-
+                  <div class="box-info">{{ userParams.remark||'--' }}</div>
                 </div>
-                <div>{{ userParams.accountType }}</div>
+                
               </div>
 
             </div>
@@ -122,7 +123,8 @@ import { ElNotification } from 'element-plus'
 import { useTagsView } from '@/stores/tagsview.js'
 import { editPassword } from "@/api/auth/auth";
 import { Lock } from '@element-plus/icons-vue'
-import { ref } from 'vue';
+import { onMounted, ref } from 'vue';
+import { detailsUser } from '@/api/auth/auth';
 
 const infoWidth = ref(22)
 const isShowDiv = ref(true)
@@ -138,6 +140,18 @@ const userPassword = ref({
 });
 const tagsViewStore = useTagsView()
 
+const getUserInfo= async ()=>{
+  const res= await detailsUser()
+  userParams.value=res.data.user
+    console.log(userParams.value);
+    
+  }
+
+
+getUserInfo()
+
+
+
 const validatePasswordComplexity = (rule, value, callback) => {
   const reg = /^(?=.*[a-zA-Z])(?=.*\d).{1,9}$/; //密码必须是至少包含字母、数字，1-9位
   if (!reg.test(value)) {
@@ -191,7 +205,19 @@ const belongToRole = (roles) => {
 
 // 修改密码
 const handleSubmit = async () => {
-  ElMessageBox.confirm(
+  // console.log(userPassword.value);
+  await passwordRef.value.validate()
+  editPassword({
+    ...userPassword.value
+  }).then(res => {
+    ElNotification({
+      title: '提示',
+      message: res.msg,
+      type: res.code === 1000 ? 'success' : 'error'
+    })
+    if (res.code === 1000) {
+      passwordRef.value.resetFields()
+      ElMessageBox.confirm(
     '提交成功',
     {
       confirmButtonText: '关闭',
@@ -209,16 +235,6 @@ const handleSubmit = async () => {
 
     }
   )
-  editPassword({
-    ...userPassword.value
-  }).then(res => {
-    ElNotification({
-      title: '提示',
-      message: res.msg,
-      type: res.code === 1000 ? 'success' : 'error'
-    })
-    if (res.code === 1000) {
-      passwordRef.value.resetFields()
     }
   })
 }
@@ -321,6 +337,12 @@ div {
     border-bottom-style: solid;
     border-color: #daddd2;
     border-width: 2px;
+
+    .box-info{
+      // background-color: red;
+      
+      margin: auto;
+    }
   }
 
   //

src/views/home/index.vue

@@ -4,10 +4,11 @@
     <div class="real-time-call">
       <LiveCall />
     </div>
-    <div class="call-history"><h3 >历史通话记录</h3>
+    <div class="call-history">
-      <fvTable ref="tableIns" :tableConfig="tableConfig" :data="mockData" @headBtnClick="headBtnClick"></fvTable>
+      <h3>历史通话记录</h3>
-      <voice ref="voiceRef" />
+      <fvTable ref="tableIns" :tableConfig="tableConfig"></fvTable>
-      <infoLiveCall ref="infoLiveCallRef"/>
+      <voice ref="voiceRef" title="语音详情" :rowUrl="rowUrl" />
+      <infoLiveCall ref="infoLiveCallRef" v-model:value="orderNumber" />
     </div>
   </div>
 </template>
@@ -16,22 +17,11 @@
 import LiveCall from '@/components/liveCall/index.vue'
 import Voice from '@/components/voice/index.vue'
 import InfoLiveCall from '@/components/infoLiveCall/index.vue'
-const infoLiveCallRef=ref()
+const orderNumber = ref('')
-const voiceRef=ref()
+const rowUrl = ref()
+const infoLiveCallRef = ref()
+const voiceRef = ref()
 const tableIns = ref()
-const mockData = ref([
-  {
-    workOrderNumber: 1211,
-    workOrderTime: '2022-02-09 00 : 12',
-    state: 0,
-    callState: '01'
-  },
-  {
-    workOrderNumber: 232,
-    state: 1,
-    callState: '02'
-  }
-])
 const auths = reactive({
   report: ['mosr:collect:reported'],
 })
@@ -40,27 +30,32 @@ const tableConfig = reactive({
     {
       prop: 'index',
       type: 'index',
-      label: '工单号',
+      label: '序号',
       align: 'center',
       width: 80,
     },
     {
-      prop: 'workOrderNumber',
+      prop: 'orderNumber',
+      label: '工单号',
+      align: 'center',
+    },
+    {
+      prop: 'orderName',
       label: '工单名称',
       align: 'center'
     },
     {
-      prop: 'workOrderNumber',
+      prop: 'orderContent',
       label: '工单内容',
       align: 'center'
     },
     {
-      prop: 'workOrderNumber',
+      prop: 'operationUser',
       label: '处理人',
       align: 'center'
     },
     {
-      prop: 'workOrderNumber',
+      prop: 'knotter',
       label: '关单人',
       align: 'center'
     },
@@ -71,7 +66,7 @@ const tableConfig = reactive({
     },
     {
       prop: 'workOrderNumber',
-      label: '号码',
+      label: '电话号码',
       align: 'center'
     },
     {
@@ -124,17 +119,26 @@ const tableConfig = reactive({
       }
     }
   ],
-  api: '',
+  api: '/order/list',
-  params: {},
+  params: {
-  btns: [
+  }
-    // {name: '新增', key: 'add',type:'primary',icon:'Plus'},
-  ]
 })
 const handleVoice = (row) => {
-  voiceRef.value.open(true)
+  if (row.recordUrl !== null) {
+    voiceRef.value.open(true)
+    rowUrl.value = row.recordUrl
+  }else{
+    ElMessage({
+      message: '暂无语音',
+      type: 'warning',
+    })
+  }
+
 }
 const handleInfo = (row) => {
-  infoLiveCallRef.value.open(true)
+  console.log('fefe',row.orderNumber);
+  orderNumber.value = row.orderNumber
+  infoLiveCallRef.value.open()
 }
 </script>
 

src/views/login/index.vue

@@ -35,8 +35,10 @@ import { User,Lock, Key } from '@element-plus/icons-vue'
 const router = useRouter()
 const authStore = useAuthStore()
 const loginForm = reactive({
-  username: 'admin',
+  username: '',
-  password: '123456',
+  password: '',
+  // username: 'admin',
+  // password: '123456',
   code: '',
   uuid: ''
 })

src/views/phone-traffic-management/phone-traffic-config/index.vue

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

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>
@@ -28,8 +38,8 @@
                  :icon="Delete" plain
                  :disabled="disabled">删除
       </el-button>
-      <el-button type="warning" v-perm="['admin:config:export']" @click="handleExport" :icon="Download" plain>导出
+<!--      <el-button type="warning" v-perm="['admin:config:export']" @click="handleExport" :icon="Download" plain>导出-->
-      </el-button>
+<!--      </el-button>-->
     </div>
     <div class="table">
       <el-table
@@ -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"]},
   ],
 })
 
@@ -231,7 +264,7 @@ const handleAdd = async () => {
   restFrom()
   title.value = "新增参数配置表"
   isVisited.value = true
-  nextTick(() => {
+  await nextTick(() => {
     // 清空校验
     formInstance.value.clearValidate()
   })
@@ -253,10 +286,10 @@ const handleEdit = async (configId) => {
     formInstance.value.clearValidate()
   })
 }
-//导出excel
+// //导出excel
-const handleExport = () => {
+// const handleExport = () => {
-  downLoadExcel('/config/export', {...queryParams})
+//   downLoadExcel('/config/export', {...queryParams})
-}
+// }
 
 //勾选table数据行的 Checkbox
 const handleSelect = async (selection) => {

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);

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 = "新增用户";
+  dialogTitle.value = "新增用户";
-  // nextTick(()=>{
+  dialogType.value = "add";
-  //   // 清空校验
+  nextTick(() => {
-  //   formDialogRef.value.getFormInstance().clearValidate()
+    // formDialogRef.value.getFormInstance().setValues({})
-  //   formDialogRef.value.getFormInstance().resetFields()
+    // 清空校验
-  // })
+    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) => {
+  let validate = await formInstance.validate()
-    if (!valid) return;
+  if (!validate.isValidate) return;
-    // if (title.value === "新增用户") {
+  if (dialogType.value === "add") {
-    //   addUser(userForm.value).then(res => {
+    addUser(formInstance.getValues()).then(res => {
-    //     if (res.code === 1000) {
+      if (res.code === 1000) {
-    //       ElMessage.success(res.msg);
+        ElMessage.success(res.msg);
-    //       isVisited.value = false;
+        tableIns.value.refresh()
-    //     } else {
+        formDialogRef.value.openOrCloseDialog(false)
-    //       ElMessage.error(res.msg);
+      } else {
-    //     }
+        ElMessage.error(res.msg);
-    //   });
+      }
-    // }
+    });
-  })
+  }
+  // editUser
 }
 </script>

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

@@ -81,30 +81,37 @@ const searchConfig = reactive([
     component: 'el-input',
   },
   {
-    label: '创建日期',
+    label: '创建时间',
-    prop: 'createTime',
+    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: 'te',
+    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 +174,14 @@ const tableConfig = reactive({
     {
       prop: 'operationUser',
       label: '处理人',
-      align: 'center'
+      align: 'center',
+      currentRender: ({ row, index }) => {
+        if (row.operationUser) {
+          return row.operationUser
+        } else {
+          return '--'
+        }
+      }
     },
 
     {
@@ -176,7 +190,7 @@ const tableConfig = reactive({
       align: 'center'
     },
     {
-      prop: 'createTime',
+      prop: 'createdTime',
       label: '创建时间',
       align: 'center',
       width: 200
@@ -211,7 +225,7 @@ 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: 'primary' })
+        btn.push({ label: '删除', prem: auths.detail, func: () => handleDelete(row), type: 'danger'})
         return (
           <div style={{ width: '100%' }}>
             {
@@ -258,7 +272,9 @@ const headBtnClick = (key) => {
 }
 
 const handleDetail = (row) => {
-  workDialogRef.value.open(row)
+  // console.log(row);
+
+  workDialogRef.value.open()
   rowData.value = row
 }
 
@@ -274,25 +290,27 @@ const handleClose = async (row) => {
       }
     )
       .then(async () => {
-        await orderdClose(row.orderNumber)
+        const info = await orderdClose(row.orderNumber)
-        tableIns.value.refresh()
+        // console.log(info);
-        ElMessage({
+        if (info.code === 1000) {
-          type: 'success',
+          tableIns.value.refresh()
-          message: '关闭成功',
+          ElMessage({
-        })
+            message: '关闭成功',
-      })
+            type: 'success',
-      .catch(() => {
+          })
-        // tableIns.value.refresh()
+        } else {
-        ElMessage({
+          ElMessage({
-          type: 'info',
+            message: info.msg,
-          message: '关闭失败',
+            type: 'warning',
-        })
+          })
+        }
       })
+
   } else {
     ElMessageBox.alert('此工单已被关闭！', '温馨提示', {
       // if you want to disable its autofocus
       // autofocus: false,
-      type:'warning',
+      type: 'warning',
       confirmButtonText: '确定',
     })
   }
@@ -311,19 +329,20 @@ const handleDelete = async (row) => {
     }
   )
     .then(async () => {
-      await orderdDetele(row.orderNumber)
+      const info = await orderdDetele(row.orderNumber)
-      tableIns.value.refresh()
+      console.log(info);
-      ElMessage({
+      if (info.code === 1000) {
-        type: 'success',
+        tableIns.value.refresh()
-        message: '删除成功',
+        ElMessage({
-      })
+          message: '删除成功',
-    })
+          type: 'success',
-    .catch(() => {
+        })
-      // tableIns.value.refresh()
+      } else {
-      ElMessage({
+        ElMessage({
-        type: 'info',
+          message: info.msg,
-        message: '删除失败',
+          type: 'warning',
-      })
+        })
+      }
     })
 }
 </script>

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

@@ -1,20 +1,24 @@
 <script setup>
 import { nextTick, onMounted, reactive, ref, watch } from "vue";
 import { ElMessageBox } from "element-plus";
-import { MoreFilled } from "@element-plus/icons-vue";
+import { MoreFilled, Check, Download, VideoPlay } from "@element-plus/icons-vue";
 import { time } from "echarts";
 import { defineExpose } from "vue";
 import { defineProps } from "vue";
 import { orderGetDetails } from "@/api/order/order.js"
+import Voice from '@/components/voice/index.vue'
 //控制显示隐藏
 const dialogVisible = ref(false);
 
 const props = defineProps({
     rowData: Object
 })
+
 let opsCallList = ref([]);
 let orderData = ref([]);
 let orderContent = ref([]);
+const voiceRef = ref()
+const rowUrl = ref()
 const open = (row) => {
     dialogVisible.value = true;
 };
@@ -22,29 +26,77 @@ const open = (row) => {
 const getData = async () => {
     // console.log(123);
     const data = await orderGetDetails(props.rowData.orderNumber)
-
     // console.log("111", data);
     return data
 
 }
-
+let contentState0 = [
-let content = [
     {
         content: "待处理",
         timestamp: "orderData.value",
+        icon: Check,
         color: "#0bbd87",
+        size: "large",
     },
     {
         content: "已处理",
-        timestamp: "2022-07-20 20:00",
+        timestamp: "--",
         type: "primary",
         icon: MoreFilled,
         size: "large",
     },
     {
         content: "结单",
-        timestamp: "2022-07-20 20:00",
+        timestamp: "--",
         size: "large",
+        // icon: Check,
+        // color: "#0bbd87",
+    },
+];
+let contentState1 = [
+    {
+        content: "待处理",
+        timestamp: "orderData.value",
+        icon: Check,
+        color: "#0bbd87",
+        size: "large",
+    },
+    {
+        content: "已处理",
+        timestamp: "2022-07-20 20:00:00",
+        icon: Check,
+        color: "#0bbd87",
+        size: "large",
+    },
+    {
+        content: "结单",
+        timestamp: "--",
+        size: "large",
+        type: "primary",
+        icon: MoreFilled,
+    },
+];
+let contentState2 = [
+    {
+        content: "待处理",
+        timestamp: "orderData.value",
+        icon: Check,
+        color: "#0bbd87",
+        size: "large",
+    },
+    {
+        content: "已处理",
+        timestamp: "2022-07-20 20:00:00",
+        icon: Check,
+        color: "#0bbd87",
+        size: "large",
+    },
+    {
+        content: "结单",
+        timestamp: "2022-07-20 20:00:00",
+        size: "large",
+        icon: Check,
+        color: "#0bbd87",
     },
 ];
 
@@ -54,50 +106,57 @@ watch(() => props.rowData, (newRowData) => {
         getData(newRowData).then((data) => {
             opsCallList.value = []
             orderData.value = data.data
+
             //电话拨打记录
             const dataDetails = data.data.opsCallList
             // console.log(dataDetails);
             const theData = [{ createTime: '', data: [] }]
 
             dataDetails.forEach(for1data => {
-                theData.forEach(for2data => {
+                // console.log(for1data.createTime, '--------');
-                    if (for1data.createTime !== for2data.createTime) {
+                for (let i = 0; i < theData.length; i++) {
-                        // console.log(for2data);
+                    // console.log(theData[i]);
-                        for2data.createTime = for1data.createTime
+                    if (theData[i].createTime === for1data.createTime) {
-                        for2data.data.push(for1data)
+                        theData[i].data.push(for1data)
-                        theData.push({ createTime: for1data.createTime, data: [] })
+                        break;
+                    } else if (theData[i].createTime === '') {
+                        theData[i].createTime = for1data.createTime
+                        theData[i].data.push(for1data)
                     } else {
-                        for2data.data.push(for1data)
+                        theData.push({ createTime: '', data: [] })
-                        return;
                     }
-                })
+                }
             });
-            theData.pop()
+            // theData.pop()
             // theData[0].data.sort((a, b) => b.answer_time- a.answer_time)
             // console.log(theData);
             theData.forEach(item => {
-                item.data.sort((a, b) => b.answer_time- a.answer_time)
+                item.data.forEach(info => {
+                    if (info.answeredTime !== null) {
+                        // console.log(info.answeredTime);
+                        let startIndex = info.answeredTime.indexOf(' ') + 1;
+                        let timeOnly = info.answeredTime.slice(startIndex, startIndex + 8);
+                        info.answeredTime = timeOnly.replace(/:/g, ':')
+                        // info.answeredTime = timeOnly
+                    }
+                })
+                // item.data.sort((a, b) => a.answeredTime - b.answeredTime)
                 opsCallList.value.push(item)
             })
+
             //工单时间线
             orderContent.value = []
             // console.log(orderData.value);
-            content.map((item, index) => {
+            // orderData.value.orderState='2'
-                if (index === 0) {
+            if (orderData.value.orderState === '0') {
-                    item.timestamp = orderData.value.operationTime || '--'
+                inputOrderContent(contentState0)
-                } else if (index === 1) {
+            }
-                    item.timestamp = orderData.value.processedTime || '--'
+            else if (orderData.value.orderState === '1') {
-
+                inputOrderContent(contentState1)
-                } else {
+            }
-                    item.timestamp = orderData.value.completionTime || '--'
+            else if (orderData.value.orderState === '2') {
-
+                inputOrderContent(contentState2)
-                }
+            }
-
-            })
-            content.forEach(item => {
-                orderContent.value.push(item)
-            })
-
             // console.log(orderContent.value);
 
         })
@@ -105,37 +164,48 @@ watch(() => props.rowData, (newRowData) => {
 }, {
     immediate: true // 立即执行一次，以便在rowData初始值非空时也能触发
 });
-// getData()
+const inputOrderTime = (item, index) => {
-
-
-const test2 = [
     {
-
+        if (index === 0) {
-        date: '2024-8-31',
+            item.timestamp = orderData.value.operationTime || '--'
-        type: "primary",
+        } else if (index === 1) {
-        icon: MoreFilled,
+            // item.timestamp = orderData.value.processedTime || '--'
-        size: "large",
+        } else {
-    }, {
+            // item.timestamp = orderData.value.completionTime || '--'
-        content: "结单",
+        }
-        size: "large",
     }
-];
+}
-// const data = [
+
-//     {
+const inputOrderContent = (contentState) => {
-//         number: '17628661307',
+    contentState.map((item, index) => {
-//         state: '通话中',
+        inputOrderTime(item, index)
-//         time: '18 : 32',
+    })
-//     },
+    contentState.forEach(item => {
-//     {
+        orderContent.value.push(item)
-//         number: '17628661307',
+    })
-//         state: '已接通',
+}
-//         time: '18 : 32',
+
-//     },
+const openRecord = () => {
-//     {
+    if ( props.rowData.recordUrl !== null) {
-//         number: '17628661307',
+        voiceRef.value.open(true)
-//         state: '已接通',
+        rowUrl.value =  props.rowData.recordUrl
-//         time: '18 : 32',
+    } else {
-//     }]
+        ElMessage({
+            message: '暂无语音',
+            type: 'warning',
+        })
+    }
+
+}
+
+const downloadRecord = () => {
+    if(props.rowData.recordUrl === null){
+        ElMessage({
+            message: '暂无语音',
+            type: 'warning',
+        })
+    }
+}
 defineExpose({
     open,
 });
@@ -149,7 +219,7 @@ defineExpose({
         <div class="common-layout">
             <el-container>
                 <el-header class="header"><span>工单号：</span>
-                    <span>{{ rowData.orderNumber }}</span>
+                    <span>{{ rowData.orderNumber || '--' }}</span>
                 </el-header>
                 <el-container class="main-container">
                     <el-aside width="200px" :style="{ position: 'static' }">
@@ -166,12 +236,12 @@ defineExpose({
                     <el-main :style="{ position: 'static' }" class="main-content">
                         <div class="top">
                             <div class="info">
-                                <span>创始人：{{ rowData.createBy }}</span>
+                                <!-- <span>创始人：{{ rowData.createBy }}</span> -->
-                                <span>处理人：{{ rowData.operationUser }}</span>
+                                <span>处理人：{{ rowData.operationUser || '--' }}</span>
                             </div>
                             <div class="info">
-                                <span>工单名称：{{ rowData.siteName }}</span>
+                                <span>工单名称：{{ rowData.orderName || '--' }}</span>
-                                <span>关单人：{{ rowData.knotter }}</span>
+                                <span>关单人：{{ rowData.knotter || '--' }}</span>
                             </div>
                         </div>
                         <div class="body">
@@ -179,25 +249,34 @@ defineExpose({
                                 <div>工单内容：</div>
                                 <div class="textBox">
                                     <el-scrollbar>
-                                        <div class="text">{{ rowData.orderContent }}</div>
+                                        <div class="text">{{ rowData.orderContent || '暂无工单内容' }}</div>
                                     </el-scrollbar>
                                 </div>
                             </div>
                             <div>
-                                <div>处理内容：</div>
+                                <div>通话记录：</div>
                                 <div class="textBox">
                                     <el-scrollbar>
-                                        <div class="text">{{ rowData.processedContent }}</div>
+                                        <div class="text">{{ rowData.processedContent || '暂无通话记录' }}</div>
                                     </el-scrollbar>
                                 </div>
 
                             </div>
                             <div>
                                 <div>录音信息：</div>
-                                <div class="textBox">
+                                <div class="textBox—record">
-                                    <el-scrollbar>
+
-                                        <div class="text">{{ rowData.recordUrl }}</div>
+                                    <el-button @click="openRecord" type="primary" :icon="VideoPlay"
-                                    </el-scrollbar>
+                                        style="margin-right: 10px ;">播放录音
+                                    </el-button>
+                                    <voice ref="voiceRef" title="录音详情" :rowUrl="rowUrl" />
+                                    <a :href=rowData.recordUrl download>
+                                        <el-button type="primary" :icon="Download"
+                                            @click="downloadRecord">下载录音</el-button>
+                                    </a>
+                                    <!-- <el-scrollbar> -->
+                                    <!-- <div class="text">{{ rowData.recordUrl }}</div> -->
+                                    <!-- </el-scrollbar> -->
                                 </div>
 
                             </div>
@@ -207,6 +286,7 @@ defineExpose({
                             <div class="timebox">
                                 <div>
                                     <el-scrollbar height="20vh">
+                                        <p v-if="opsCallList.length === 0">暂无电话拨打记录</p>
                                         <el-timeline style="max-width: 99%" class="timeline">
                                             <el-timeline-item v-for="(activity, index) in opsCallList" :key="index"
                                                 icon="MoreFilled" type="primary" size="large">
@@ -216,12 +296,13 @@ defineExpose({
                                                         <div class="timeline-row">
                                                             <span :style="{ color: '#a8abb2' }">{{ info.callIdNumber
                                                                 }}</span>
-                                                            <PointTag dictType="call_status" :value="info.callState" class="tag"/>
+                                                            <PointTag dictType="call_status" :value="info.callState"
+                                                                class="tag" />
                                                             <!-- <span :style="{
                                                                 color: info.callState === '通话中' ? '#6cc23a' : '#409eff'
                                                             }">{{ info.callState }}</span> -->
                                                             <span class="span-3th" :style="{ color: '#a8abb2' }">{{
-                                                                info.answer_time ||'00 : 00'}}</span>
+                                                                info.answeredTime || '00:00:00' }}</span>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -285,13 +366,19 @@ defineExpose({
     padding: 15px;
 }
 
+.main-content .body .textBox—record {
+    width: 100%;
+    min-height: 10vh;
+    // max-height: 15vh;
+    // border: 1.5px solid #e4e7ed;
+    // box-shadow: 0 4px 8px 0 rgba(242, 242, 242, 1);
+    // margin-bottom: 20px;
+    padding: 15px;
+}
+
 .main-content .body .text {
-
     resize: none;
-
-
     // overflow-y: auto;
-
     font-size: 16px;
     line-height: 25px
 }
@@ -319,26 +406,29 @@ defineExpose({
 
 }
 
-.main-content .timeline-row{
+.main-content .timeline-row {
     // border: 1px solid #000;
     display: flex;
     // justify-content: space-between;
     // border: 1px solid #000;
-    
+
 }
-.main-content .tag{
+
+.main-content .tag {
     align-items: center;
     // background-color: red;
     margin-left: 30px;
 }
-.main-content .span-3th{
+
+.main-content .span-3th {
     // flex-grow: 1;
     // margin-right:;
     flex: 1;
-   text-align: right;
+    text-align: right;
-   margin-right: 100px;
+    margin-right: 100px;
 
 }
+
 .custom-card {
     width: 100%;
     font-size: 16px;

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

@@ -52,16 +52,6 @@ const searchConfig = reactive([
       checkStrictly: true
     },
     component: 'el-input',
-  }, {
-    label: '工单状态',
-    prop: 'orderState',
-    props: {
-      placeholder: '请选择工单状态查询',
-      cacheKey: 'work_order_status',
-      clearable: true,
-      filterable: true,
-    },
-    component: shallowRef(fvSelect),
   }, {
     label: '处理人',
     prop: 'operationUser',
@@ -82,30 +72,37 @@ const searchConfig = reactive([
     component: 'el-input',
   },
   {
-    label: '创建日期',
+    label: '创建时间',
-    prop: 'createTime',
+    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: 'te',
+    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',
   }
@@ -170,14 +167,14 @@ const tableConfig = reactive({
       label: '处理人',
       align: 'center'
     },
-    
+
     {
       prop: 'processedContent',
       label: '处理内容',
       align: 'center'
     },
     {
-      prop: 'createTime',
+      prop: 'createdTime',
       label: '创建时间',
       align: 'center',
       width: 200
@@ -212,7 +209,7 @@ 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: 'primary' })
+        btn.push({ label: '删除', prem: auths.detail, func: () => handleDelete(row), type: 'danger' })
         return (
           <div style={{ width: '100%' }}>
             {
@@ -233,14 +230,14 @@ const tableConfig = reactive({
     }
   ],
   api: '/order/list',
-  params: {orderState:"2"},
+  params: { orderState: "2" },
   btns: [
     // {name: '新增', key: 'add', color: '#DED0B2', auth: auths.report},
   ]
 })
 
 const search = (val) => {
-  let obj = {...val}
+  let obj = { ...val, orderState: '2' }
   if (obj.dateValue) {
     obj.startTime = obj.dateValue[0]
     obj.endTime = obj.dateValue[1]
@@ -276,25 +273,26 @@ const handleClose = async (row) => {
       }
     )
       .then(async () => {
-        await orderdClose(row.orderNumber)
+        const info = await orderdClose(row.orderNumber)
-        tableIns.value.refresh()
+        // console.log(info);
-        ElMessage({
+        if (info.code === 1000) {
-          type: 'success',
+          tableIns.value.refresh()
-          message: '关闭成功',
+          ElMessage({
-        })
+            message: '关闭成功',
-      })
+            type: 'success',
-      .catch(() => {
+          })
-        // tableIns.value.refresh()
+        } else {
-        ElMessage({
+          ElMessage({
-          type: 'info',
+            message: info.msg,
-          message: '关闭失败',
+            type: 'warning',
-        })
+          })
+        }
       })
   } else {
     ElMessageBox.alert('此工单已被关闭！', '温馨提示', {
       // if you want to disable its autofocus
       // autofocus: false,
-      type:'warning',
+      type: 'warning',
       confirmButtonText: '确定',
     })
   }
@@ -313,19 +311,20 @@ const handleDelete = async (row) => {
     }
   )
     .then(async () => {
-      await orderdDetele(row.orderNumber)
+      const info = await orderdDetele(row.orderNumber)
-      tableIns.value.refresh()
+      console.log(info);
-      ElMessage({
+      if (info.code === 1000) {
-        type: 'success',
+        tableIns.value.refresh()
-        message: '删除成功',
+        ElMessage({
-      })
+          message: '删除成功',
-    })
+          type: 'success',
-    .catch(() => {
+        })
-      // tableIns.value.refresh()
+      } else {
-      ElMessage({
+        ElMessage({
-        type: 'info',
+          message: info.msg,
-        message: '删除失败',
+          type: 'warning',
-      })
+        })
+      }
     })
 }
 </script>

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

@@ -52,16 +52,6 @@ const searchConfig = reactive([
       checkStrictly: true
     },
     component: 'el-input',
-  }, {
-    label: '工单状态',
-    prop: 'orderState',
-    props: {
-      placeholder: '请选择工单状态查询',
-      cacheKey: 'work_order_status',
-      clearable: true,
-      filterable: true,
-    },
-    component: shallowRef(fvSelect),
   }, {
     label: '处理人',
     prop: 'operationUser',
@@ -82,30 +72,37 @@ const searchConfig = reactive([
     component: 'el-input',
   },
   {
-    label: '创建日期',
+    label: '创建时间',
-    prop: 'createTime',
+    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: 'te',
+    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',
   }
@@ -170,14 +167,14 @@ const tableConfig = reactive({
       label: '处理人',
       align: 'center'
     },
-    
+
     {
       prop: 'processedContent',
       label: '处理内容',
       align: 'center'
     },
     {
-      prop: 'createTime',
+      prop: 'createdTime',
       label: '创建时间',
       align: 'center',
       width: 200
@@ -212,7 +209,7 @@ 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: 'primary' })
+        btn.push({ label: '删除', prem: auths.detail, func: () => handleDelete(row), type: 'danger' })
         return (
           <div style={{ width: '100%' }}>
             {
@@ -233,14 +230,14 @@ const tableConfig = reactive({
     }
   ],
   api: '/order/list',
-  params: {orderState:"0"},
+  params: { orderState: "0" },
   btns: [
     // {name: '新增', key: 'add', color: '#DED0B2', auth: auths.report},
   ]
 })
 
 const search = (val) => {
-  let obj = {...val}
+  let obj = { ...val, orderState: '0' }
   if (obj.dateValue) {
     obj.startTime = obj.dateValue[0]
     obj.endTime = obj.dateValue[1]
@@ -276,25 +273,26 @@ const handleClose = async (row) => {
       }
     )
       .then(async () => {
-        await orderdClose(row.orderNumber)
+        const info = await orderdClose(row.orderNumber)
-        tableIns.value.refresh()
+        // console.log(info);
-        ElMessage({
+        if (info.code === 1000) {
-          type: 'success',
+          tableIns.value.refresh()
-          message: '关闭成功',
+          ElMessage({
-        })
+            message: '关闭成功',
-      })
+            type: 'success',
-      .catch(() => {
+          })
-        // tableIns.value.refresh()
+        } else {
-        ElMessage({
+          ElMessage({
-          type: 'info',
+            message: info.msg,
-          message: '关闭失败',
+            type: 'warning',
-        })
+          })
+        }
       })
   } else {
     ElMessageBox.alert('此工单已被关闭！', '温馨提示', {
       // if you want to disable its autofocus
       // autofocus: false,
-      type:'warning',
+      type: 'warning',
       confirmButtonText: '确定',
     })
   }
@@ -313,19 +311,20 @@ const handleDelete = async (row) => {
     }
   )
     .then(async () => {
-      await orderdDetele(row.orderNumber)
+      const info = await orderdDetele(row.orderNumber)
-      tableIns.value.refresh()
+      console.log(info);
-      ElMessage({
+      if (info.code === 1000) {
-        type: 'success',
+        tableIns.value.refresh()
-        message: '删除成功',
+        ElMessage({
-      })
+          message: '删除成功',
-    })
+          type: 'success',
-    .catch(() => {
+        })
-      // tableIns.value.refresh()
+      } else {
-      ElMessage({
+        ElMessage({
-        type: 'info',
+          message: info.msg,
-        message: '删除失败',
+          type: 'warning',
-      })
+        })
+      }
     })
 }
 </script>

src/views/voice-management/sensitive-words/index.vue

@@ -116,11 +116,6 @@ const sensitiveTableConfig= reactive({
       align: 'center',
       width: 80,
     },
-    {
-      prop: 'sensitiveId',
-      label: '敏感词ID',
-      align: 'center'
-    },
     {
       prop: 'content',
       label: '内容',

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

@@ -72,11 +72,6 @@ const verbalTrickTableConfig = reactive({
       align: 'center',
       width: 80,
     },
-    {
-      prop: 'verbalId',
-      label: '话术ID',
-      align: 'center'
-    },
     {
       prop: 'verbalName',
       label: '名称',

src/views/voice-management/voice-config/index.vue

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

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",