更新 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 -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/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: '张三',
+  // username: '张三',
-  phone: '13546812315',
+  // phone: '13546812315',
-  orderName: '张三工单',
+  // 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) => {
+watch(() => props.value, async (newVal) => {
-  recordLeftObj.value.content = []
+  if(newVal){
-  // let map1 = new Map()
+
-  await getHistoryCallContent(newVal).then(res => {
+    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
-    // 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 || '--';
        }
+     } 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">
+  <el-dialog v-model="dialogVisible" title="历史通话记录" width="700" class="box">
-    <LiveCallItem ref="recordLeftRef" :recordArray="recordLeftObj" :headData="leftHeadData" style="width: 100%;"/>
+    <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>

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">
@@ -31,8 +33,10 @@
               </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 +55,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 +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

@@ -2,33 +2,43 @@
   <div class="live-call">
     <div class="header">
       <div>
-        <span style="margin-right: 20px">{{ headData.username }}</span>
+        <span style="margin-right: 20px">姓名：{{ recordObj.name ||'--'}}</span>
-        <span>{{ headData.phone }}</span>
+        <span>电话号码：{{ recordObj.phone ||'--'}}</span>
       </div>
-      <div><span>工单名称：{{ headData.orderName }}</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?headData.username:'AI助手' }} </p>
+                <!--              <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?headData.username:'AI助手'  }} </p>
+                <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>
@@ -45,10 +55,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
 })

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="recordLeftRef" :recordObj="recordLeftObj" :headData="leftHeadData" lineName="线路一"/>
-    <live-call-item-home ref="recordRightRef" :recordObj="recordRightObj" :headData="rightHeadData"/>
+    <live-call-item-home ref="recordRightRef" :recordObj="recordRightObj" :headData="rightHeadData" lineName="线路二"/>
   </div>
 </template>
 
@@ -17,71 +17,21 @@ const authStore = useAuthStore()
 const recordLeftRef = ref(null);
 const recordRightRef = ref(null);
 const leftHeadData = ref({
-  username: '张三',
+  // username: '张三',
-  phone: '13546812315',
+  // phone: '13546812315',
-  orderName: '张三工单',
+  // orderName: '张三工单',
 })
 const rightHeadData = ref({
-  username: '李四',
+  // username: '李四',
-  phone: '18246812546',
+  // phone: '18246812546',
-  orderName: '李四工单',
+  // 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"
-    // }
-)
 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"
-    // }
-)
 let socket = reactive("");
 let token = getToken();
 let send = {
@@ -105,6 +55,13 @@ const handleLogout = () => {
   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}`)
@@ -139,12 +96,46 @@ 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({
+              //   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 {
+          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({
+            //   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(() => {

src/views/home/index.vue

@@ -8,7 +8,7 @@
       <h3>历史通话记录</h3>
       <fvTable ref="tableIns" :tableConfig="tableConfig"></fvTable>
       <voice ref="voiceRef" title="语音详情" :rowUrl="rowUrl" />
-      <infoLiveCall ref="infoLiveCallRef" :rowData="rowData" />
+      <infoLiveCall ref="infoLiveCallRef" v-model:value="orderNumber" />
     </div>
   </div>
 </template>
@@ -17,7 +17,7 @@
 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 voiceRef = ref()
@@ -121,7 +121,6 @@ const tableConfig = reactive({
   ],
   api: '/order/list',
   params: {
-    orderState: '2'
   }
 })
 const handleVoice = (row) => {
@@ -137,10 +136,9 @@ const handleVoice = (row) => {
 
 }
 const handleInfo = (row) => {
-  console.log(row);
+  console.log('fefe',row.orderNumber);
-
+  orderNumber.value = row.orderNumber
-  infoLiveCallRef.value.open(true)
+  infoLiveCallRef.value.open()
-  rowData.value = row.orderNumber
 }
 </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: 'qwe123',
+  password: '',
+  // username: 'admin',
+  // password: '123456',
   code: '',
   uuid: ''
 })

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,10 +81,10 @@ const searchConfig = reactive([
     component: 'el-input',
   },
   {
-    label: '创建日期',
+    label: '创建时间',
-    prop: 'createTime',
+    prop: 'createdTime',
     props: {
-      placeholder: '请选择',
+      placeholder: '请选择创建时间',
       type: 'datetime',
       clearable: true,
       checkStrictly: true,
@@ -96,18 +96,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 +190,7 @@ const tableConfig = reactive({
       align: 'center'
     },
     {
-      prop: 'createTime',
+      prop: 'createdTime',
       label: '创建时间',
       align: 'center',
       width: 200

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

@@ -72,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: '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,7 @@ const tableConfig = reactive({
       align: 'center'
     },
     {
-      prop: 'createTime',
+      prop: 'createdTime',
       label: '创建时间',
       align: 'center',
       width: 200

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

@@ -72,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: '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,7 @@ const tableConfig = reactive({
       align: 'center'
     },
     {
-      prop: 'createTime',
+      prop: 'createdTime',
       label: '创建时间',
       align: 'center',
       width: 200

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: '名称',

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