bug fix

.env.development

@@ -7,10 +7,13 @@ VITE_APP_ENV = 'development'
 # 若依管理系统/开发环境 http://192.168.1.15:8010/  http://123.56.29.119:8080
 
 VITE_APP_BASE_API = 'http://39.164.159.226:8120/'
+# VITE_APP_BASE_API = 'http://222.139.29.127:8120/'
+
 
 # VITE_APP_BASE_WS = '39.164.159.226:8010/'
 # VITE_APP_BASE_WS = 'ws://192.168.1.15:8010/'
 # VITE_APP_BASE_WS = 'ws://192.168.8.17:9000/ws'
+# VITE_APP_BASE_WS = 'ws://222.139.29.127:9000/ws'
 VITE_APP_BASE_WS = 'ws://192.168.1.19:9000/ws'
 
 # VITE_APP_PHONE_TYPE = 'SIP'

.env.production

@@ -4,9 +4,9 @@ VITE_APP_TITLE = 智能客服中心
 # 生产环境配置
 VITE_APP_ENV = 'production'
 
-# 若依管理系统/生产环境
-VITE_APP_BASE_API = 'http://192.168.0.78:8120/'
-VITE_APP_BASE_WS = 'ws://192.168.0.78:9000/ws'
+# 若依管理系统/生产环境 
+VITE_APP_BASE_API = 'http://172.16.211.153:8120/'
+VITE_APP_BASE_WS = 'ws://172.16.211.153:9000/ws'
 
 VITE_APP_PHONE_TYPE = 'PHONE'
 VITE_APP_CALL_TYPE = 'VIOCE'

.env.staging

@@ -7,10 +7,15 @@ VITE_APP_ENV = 'staging'
 # 若依管理系统/生产环境
 # VITE_APP_BASE_API = 'http://192.168.1.15:8010/'
 
-VITE_APP_BASE_API = 'http://39.164.159.226:8120/'
-
-VITE_APP_BASE_WS = 'ws://192.168.1.19:9000/ws'
+VITE_APP_BASE_API = 'http://222.139.29.127:8120/'
 
+VITE_APP_BASE_WS = 'ws://222.139.29.127:9000/ws'
 
+VITE_APP_PHONE_TYPE = 'PHONE'
+VITE_APP_CALL_TYPE = 'VIOCE'
+VITE_APP_SIP_URL = 'ws://192.168.1.19:5066'
+VITE_APP_SIP_IP = '192.168.1.19'
+VITE_APP_SIP_PASSWORD = '1234'
+VITE_APP_SIP_CONTACT_URL = "@192.168.1.19;transport=ws"
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip

nginx.conf

@@ -0,0 +1,105 @@
+user www-data;
+worker_processes auto;
+pid /run/nginx.pid;
+include /etc/nginx/modules-enabled/*.conf;
+
+events {
+	worker_connections 768;
+	# multi_accept on;
+}
+
+http {
+
+	##
+	# Basic Settings
+	##
+
+	sendfile on;
+	tcp_nopush on;
+	types_hash_max_size 2048;
+	# server_tokens off;
+
+	# server_names_hash_bucket_size 64;
+	# server_name_in_redirect off;
+
+	include /etc/nginx/mime.types;
+	default_type application/octet-stream;
+
+	##
+	# SSL Settings
+	##
+
+	ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; # Dropping SSLv3, ref: POODLE
+	ssl_prefer_server_ciphers on;
+
+	##
+	# Logging Settings
+	##
+
+	access_log /var/log/nginx/access.log;
+	error_log /var/log/nginx/error.log;
+
+	##
+	# Gzip Settings
+	##
+	server {
+		listen       8121;
+			server_name  localhost;
+	
+		location / {
+			root   /home/website/web;
+			try_files $uri $uri/ /index.html;
+			index  index.html index.htm;
+			}
+			
+		location /prod-api/{
+			proxy_set_header Host $http_host;
+			proxy_set_header X-Real-IP $remote_addr;
+			proxy_set_header REMOTE-HOST $remote_addr;
+			proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+			proxy_pass http://localhost:8120/;
+		}
+		
+		error_page   500 502 503 504  /50x.html;
+			location = /50x.html {
+				root   html;
+			}
+	}
+	gzip on;
+
+	# gzip_vary on;
+	# gzip_proxied any;
+	# gzip_comp_level 6;
+	# gzip_buffers 16 8k;
+	# gzip_http_version 1.1;
+	# gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
+
+	##
+	# Virtual Host Configs
+	##
+
+	include /etc/nginx/conf.d/*.conf;
+	include /etc/nginx/sites-enabled/*;
+}
+
+
+#mail {
+#	# See sample authentication script at:
+#	# http://wiki.nginx.org/ImapAuthenticateWithApachePhpScript
+#
+#	# auth_http localhost/auth.php;
+#	# pop3_capabilities "TOP" "USER";
+#	# imap_capabilities "IMAP4rev1" "UIDPLUS";
+#
+#	server {
+#		listen     localhost:110;
+#		protocol   pop3;
+#		proxy      on;
+#	}
+#
+#	server {
+#		listen     localhost:143;
+#		protocol   imap;
+#		proxy      on;
+#	}
+#}

src/components/main/drawer-phone/index.vue

@@ -164,7 +164,7 @@ import { getPageListData } from '@/api/main/system/system'
 import defaultTubiao from '@/assets/images/defaultTubiao.png'
 import { getCallSate,getUnprefixNuber} from '@/utils/index';
 
-const router = useRouter();
+
 import {
     UserFilled,
     Phone,
@@ -185,6 +185,7 @@ import {
     Notebook,
     Mute
 } from '@element-plus/icons-vue';
+const router = useRouter()
 const showCallPanel = ref(false);
 const searchQuery = ref('');
 const searchContactQuery = ref('');
@@ -249,10 +250,13 @@ const callPhoneFlag = ref(false)
 const callData = ref({});
 
 const initCall = (isPause = false) => {
+    
     if (!isPause) callDuration.value = '00:00:00'
     // startTime.value = Date.now()
     if (timer) {
+        console.log('cleartimer',timer)
         clearInterval(timer);
+        timer = null
     }
 }
 
@@ -298,6 +302,8 @@ const changeState = (state) => {
         } else if (callDirection.value == 2 ) {
             allState.value = 10
         }
+        
+        console.log('timer',timer)
         startTime.value = Date.now()
         if (!timer) timer = window.setInterval(updateCallDuration, 1000);
     } else if (state === 4) {

src/components/page-content/src/page-content.vue

@@ -77,7 +77,7 @@
         <el-tag class="ml-2" @click="handleRecordCall(scope.row)">
           <!-- getOfffixNuber(scope.row.callType==1 ? scope.row.caller : scope.row.callee) -->
           {{
-            getOfffixNuber(scope.row.caller)
+            getOfffixNuber(scope.row.callType==1 ? scope.row.caller : scope.row.callee)
           }}
         </el-tag>
       </template>

src/store/commonSelect/common.js

@@ -32,7 +32,7 @@ const useSelectStore = defineStore('common', {
             // this.templateListData = getUserSelcet(templateResult.data, 'templateCode', 'templateId')
             // this.templateNameListData = getUserSelcet(templateResult.data, 'templateName', 'templateId', ['content'])
             const deptResult = await getPageListData('/common/dept') // /common/dept
-            this.deptListData = arrayToTree(deptResult.data, 100)   
+            this.deptListData = arrayToTree(deptResult.data, 0)   
             const userResult = await getPageListData('/common/user')    //  /common/user
             this.userData = userResult.data
             this.userListData = getUserSelcet(userResult.data, 'nickName', 'userName')

src/views/main/patientFile/patientFileList/cpns/patientDetail/patientDetail.vue

@@ -7,41 +7,47 @@
       <el-col v-if="showType" :span="18">
         <div class="info-card">
           <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-            
+            <el-tab-pane label="变更日志" name="six">
+              <log :patientId="patientId" @getLogs="getLogs" />
+            </el-tab-pane>
+
             <el-tab-pane label="工单" name="third">
-              
-              <!-- <operation-log></operation-log> -->
               <div>
-                <!-- 表格 -->
                 <el-table
-                  :data="tableData"
+                  :data="tableData2"
                   stripe
                   border
                   :default-sort="{ prop: 'date', order: 'ascending' }"
                   @sort-change="handleSortChange"
                 >
-                  <el-table-column prop="date" label="日期" sortable></el-table-column>
-                  <el-table-column prop="name" label="姓名"></el-table-column>
-                  <el-table-column prop="address" label="地址"></el-table-column>
-                </el-table>
+                <el-table-column  prop="workordercode" label="工单编号">
+                  <template #default="scope">
+                    <a style="color: blue" @click="openWorkHandle(scope.row)">{{ scope.row['workordercode'] }}</a>
+                  </template>
+                </el-table-column>
+                <el-table-column  prop="workordercatename" label="工单类型"></el-table-column>
+                <el-table-column  prop="content" label="工单内容"></el-table-column>
+                <el-table-column  prop="dealusername" label="受理人"></el-table-column>
+                <el-table-column  prop="createtime" label="受理时间"></el-table-column>
+                <el-table-column  prop="limittime" label="办理时限"></el-table-column>
+                <el-table-column  prop="workorderstatename" label="状态"></el-table-column></el-table>
             
-                <!-- 分页组件 -->
                 <el-pagination
                   style="float: right; margin-top: 15px;"
-                  @size-change="handleSizeChange"
-                  @current-change="handleCurrentChange"
-                  :current-page="currentPage"
+                  @size-change="handleSizeChange2"
+                  @current-change="handleCurrentChange2"
+                  :current-page="currentPage2"
                   :page-sizes="[10, 20, 30]"
                   :page-size="pageSize"
                   layout="total, sizes, prev, pager, next, jumper"
-                  :total="tableData.length"
+                  :total="total2"
                 >
                 </el-pagination>
               </div>
             </el-tab-pane>
+
             <el-tab-pane label="通话记录" name="fourth">
               <div>
-                <!-- 表格 -->
                 <el-table
                   :data="tableData"
                   stripe
@@ -49,12 +55,36 @@
                   :default-sort="{ prop: 'date', order: 'ascending' }"
                   @sort-change="handleSortChange"
                 >
-                  <el-table-column prop="date" label="日期" sortable></el-table-column>
-                  <el-table-column prop="name" label="姓名"></el-table-column>
-                  <el-table-column prop="address" label="地址"></el-table-column>
+                <el-table-column label="电话号码">
+                  <template #default="scope">
+                    {{ getOfffixNuber(scope.row.callType==1 ? scope.row.caller : scope.row.callee) }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="坐席工号">
+                  <template #default="scope">
+                    {{ scope.row.callType==2 ? scope.row.callerAgent : scope.row.calleeAgent }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="坐席分机号">
+                  <template #default="scope">
+                    {{ scope.row.callType==2 ? scope.row.caller : scope.row.callee }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="呼叫状态">
+                  <template #default="scope">
+                    {{ getCallSate(scope.row.callType, scope.row.isAnswer) }}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="answerTime" label="通话开始时间"></el-table-column>
+                <el-table-column prop="hangupTime" label="通话结束时间"></el-table-column>
+                <el-table-column label="通话时长">
+                  <template #default="scope">
+                    {{ getTimeLimit(scope.row.answerTime, scope.row.hangupTime) }}
+                  </template>
+                </el-table-column>
+                 
                 </el-table>
             
-                <!-- 分页组件 -->
                 <el-pagination
                   style="float: right; margin-top: 15px;"
                   @size-change="handleSizeChange"
@@ -63,16 +93,13 @@
                   :page-sizes="[10, 20, 30]"
                   :page-size="pageSize"
                   layout="total, sizes, prev, pager, next, jumper"
-                  :total="tableData.length"
+                  :total="total"
                 >
                 </el-pagination>
               </div>
-              <!-- <knowledge-list></knowledge-list>  -->
             </el-tab-pane>
     
-            <el-tab-pane label="变更日志" name="six">
-              <log :patientId="patientId" @getLogs="getLogs" />
-            </el-tab-pane>
+            
           </el-tabs>
         </div>
       </el-col>
@@ -93,9 +120,9 @@ import patientInfo from "../patientInfo/patientInfo";
 import log from "../logs/log.vue";
 
 import patientIcon from '@/assets/images/patientIcon.png'
-import { useRoute } from 'vue-router';
+import { useRoute,useRouter } from 'vue-router';
 import { getPatientInfo } from '@/api/patient/patient';
-import { userDecryptToAsterisk } from '@/utils/aes'
+import { userDecryptToAsterisk,userDecrypt } from '@/utils/aes'
 import { nations, patientStatus, sex, patientSource, phoneStatus } from "@/utils/commonDic.js";
 import { getStrById, areaTrees } from "@/utils/area.js";
 import { ArrayToMap } from '@/utils/tools'
@@ -105,27 +132,34 @@ import { modalConfig } from '../../config/modal.config'
 import { ElMessage } from 'element-plus'
 import { Avatar, Edit } from '@element-plus/icons-vue'
 import { getPageListData } from '@/api/main/system/system';
-
-// 工单开始
+import { getCallSate, getUnprefixNuber,getOfffixNuber } from '@/utils/index';
+const router = useRoute();
+const routerPath = useRouter();
+// 通话记录开始
 // 模拟表格数据
-const tableData = ref([
-  {
-    date: '2024-01-01',
-    name: '张三',
-    address: '北京市朝阳区'
-  },
-  {
-    date: '2024-01-02',
-    name: '李四',
-    address: '上海市浦东新区'
-  },
-  {
-    date: '2024-01-03',
-    name: '王五',
-    address: '广州市天河区'
-  },
-  // 可以添加更多数据
-])
+const { proxy } = getCurrentInstance();
+const total = ref(0)
+const tableData = ref([])
+const queryParams = ref({
+  pageNum: 1,
+  pageSize: 10,
+})
+function getCalllog(phone) {
+  queryParams.value.phone = phone
+  getPageListData('/call/calllog',queryParams.value).then((res)=>{
+    tableData.value = []
+    total.value = 0
+    if (res.data.length>0) {
+      tableData.value = res.data
+      console.log(tableData.value)
+      total.value = res.total
+    }
+  })
+}
+function getTimeLimit(startTime, endTime) {
+  return proxy.getTimeDifference(startTime, endTime);
+}
+
 
 // 当前页码
 const currentPage = ref(1)
@@ -135,11 +169,15 @@ const pageSize = ref(10)
 // 处理每页显示条数变化
 const handleSizeChange = (newSize) => {
   pageSize.value = newSize
+  queryParams.value.pageSize = newSize
+  getCalllog(queryParams.value.phone)
 }
 
 // 处理当前页码变化
 const handleCurrentChange = (newPage) => {
   currentPage.value = newPage
+  queryParams.value.pageNum = newPage
+  getCalllog(queryParams.value.phone)
 }
 
 // 处理表格排序变化
@@ -147,19 +185,69 @@ const handleSortChange = ({ prop, order }) => {
   console.log(`排序字段: ${prop}, 排序顺序: ${order}`)
   // 这里可以根据 prop 和 order 对 tableData 进行排序
 }
-// 工单结束
+// 通话记录结束
 
+// 工单开始
+const total2 = ref(0)
+const tableData2 = ref([])
+const queryParams2 = ref({
+  listType: 0,
+  pageNum: 1,
+  pageSize: 10,
+})
+function getWorkorder(phone) {
+  queryParams2.value.callnum = phone
+  getPageListData('/order/workorder',queryParams2.value).then((res)=>{
+    tableData2.value = []
+    total2.value = 0
+    if (res.data.length>0) {
+      tableData2.value = res.data
+      console.log(tableData2.value)
+      total2.value = res.total
+    }
+  })
+}
+// 处理弹出框
+function openWorkHandle(rowData) { 
+  let type = 'djb'
+  let query = {
+    workordercode : rowData.workordercode,
+    type,
+    listType:0
+  }
+  sessionStorage.setItem('workQuery', JSON.stringify(query))
+  routerPath.push({ path : '/workHandle' }) 
+}
+// 当前页码
+const currentPage2 = ref(1)
+// 每页显示条数
+const pageSize2 = ref(10)
 
-const activeName = ref('third')
+// 处理每页显示条数变化
+const handleSizeChange2 = (newSize) => {
+  pageSize.value = newSize
+  queryParams2.value.pageSize = newSize
+  getWorkorder(queryParams2.value.phone)
+}
+
+// 处理当前页码变化
+const handleCurrentChange2 = (newPage) => {
+  queryParams2.value.pageNum = newPage
+  getWorkorder(queryParams2.value.phone)
+}
+
+// 工单结束
+
+const activeName = ref('six')
 function handleClick() {
 }
 
-const router = useRoute();
+
 
 let detail = ref({});
 
 const patientId = ref(router.query.patientId || router.query.id);
-console.log(patientId.value)
+
 const props = defineProps({
   descColumn: {
     type: Number,
@@ -177,6 +265,8 @@ const props = defineProps({
 watch(props, (nweProps) => {
     if (nweProps.patientCallNumber) {
       customerDetail(nweProps.patientCallNumber)
+      getCalllog(nweProps.patientCallNumber)
+      getWorkorder(nweProps.patientCallNumber)
     }
 });
 
@@ -196,11 +286,15 @@ const stateLog = ref();
 async function customerDetail(customerno) {
     const resultData = await getPageListData('/patient/patient',{phoneNumber:customerno});
     detail.value = resultData.data[0]
-    console.log(detail.value);
+    console.log('customerDetail',detail.value);
 }
 const getDetail = async () => {
   const res = await getPatientInfo(patientId.value)
   detail.value = res.data
+  console.log('getPatientInfo',detail.value);
+  getCalllog(userDecrypt(detail.value.phoneNumber))
+  getWorkorder(userDecrypt(detail.value.phoneNumber))
+  
 }
 onBeforeMount(async () => {
   if (props.patientCallNumber) {

src/views/main/phone/index.vue

@@ -294,11 +294,15 @@ import { userDecryptToAsterisk } from '@/utils/aes';
 import knowledgeList from "@/views/main/knowledgeBase/knowledgeList/cpns/konwlegelist/konwlegelist";
 
 import { max } from 'lodash';
+import { getOfffixNuber } from '@/utils/index';
+
+const router = useRouter()
 let { proxy } = getCurrentInstance()
 const showCallPanel = ref(false);
 const searchQuery = ref('');
 console.log('proxy', proxy.$route);
 const telNumber = ref(proxy.$route.query.phone || proxy.$route.query.callNumber || proxy.$route.params.callNumber);
+
 proxy.$route.meta.title = telNumber.value || '来电弹屏';
 const callid = ref(proxy.$route.query.callid || 0);
 onMounted(() => {
@@ -506,7 +510,7 @@ const getUserInfo = async () => {
     if (!telNumber.value) {
         return;
     }
-
+    telNumber.value = getOfffixNuber(telNumber.value)
     profile.value.phone = telNumber.value;
     form.value.phone = telNumber.value;
 
@@ -578,6 +582,7 @@ const submit = async () => {
                 if (data.state === 'success') {
                     ElMessage.success('提交成功');
                     resetForm()
+                    router.push({ path: '/' })
                 } else {
                     ElMessage.error(data.message || '提交失败');
                 }

src/views/main/system/dept/dept.vue

@@ -7,6 +7,7 @@
     />
     <page-content
       ref="pageContentRef"
+      pageName="/system/dept"
       :contentTableConfig="contentTableConfig"
       rowKey="deptId"
       :isExport="false"

src/views/main/telephone/callRecord/callRecord.vue

@@ -16,12 +16,12 @@
     >
     
       <template #recordAgentHandler="scope">
-        <!-- {{ scope.row.callType==2 ? scope.row.callerAgent : scope.row.calleeAgent }} -->
-        {{scope.row.calleeAgent }}
+        {{ scope.row.callType==2 ? scope.row.callerAgent : scope.row.calleeAgent }}
+        <!-- {{scope.row.calleeAgent }} -->
       </template>
       <template #recordCallerHandler="scope">
-        <!-- {{ scope.row.callType==2 ? scope.row.caller : scope.row.callee }} -->
-        {{scope.row.callee }}
+        {{ scope.row.callType==2 ? scope.row.caller : scope.row.callee }}
+        <!-- {{scope.row.callee }} -->
       </template>
       <template #recordCallStateHandler="scope">
         {{ getCallSate(scope.row.callType, scope.row.isAnswer) }}