diff --git a/.env.production b/.env.production index 2a03995..a827e24 100644 --- a/.env.production +++ b/.env.production @@ -9,7 +9,7 @@ ENV = 'production' # 如果使用 Nginx 代理后端接口,那么此处需要改为 '/',文件查看 Docker 部署篇,Nginx 配置 # 接口地址,注意协议,如果你没有配置 ssl,需要将 https 改为 http -VUE_APP_BASE_API = 'http://8.130.96.163:8899' +VUE_APP_BASE_API = 'https://baiyee.vip' VUE_APP_BASE_IMG = 'https://baiyee.vip' # 如果接口是 http 形式, wss 需要改为 ws VUE_APP_WS_API = 'wss://baiyee.vip' \ No newline at end of file diff --git a/src/api/index.js b/src/api/index.js index 4e82846..98d7cd6 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -1,8 +1,8 @@ /* * @Author: your name * @Date: 2021-10-21 10:06:23 - * @LastEditTime: 2023-07-04 14:33:35 - * @LastEditors: 飘泊客 + * @LastEditTime: 2023-07-04 18:27:38 + * @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git * @Description: In User Settings Edit * @FilePath: /byhl-taomi/src/api/index.js */ @@ -1110,7 +1110,6 @@ export function setLogSave(data) { data }) } - export function getCompensateInfo(params) { return request({ url: baseObj.url + 'api/boost/compensateInfo', diff --git a/src/components/Echarts/BarChart.vue b/src/components/Echarts/BarChart.vue index 8da55e2..24fe945 100644 --- a/src/components/Echarts/BarChart.vue +++ b/src/components/Echarts/BarChart.vue @@ -276,10 +276,10 @@ export default { }, formatter(data) { let matter = `${data[0].name}` - matter += `${data[0].marker} 资源接通数 :${data[0].value} - ${data[1].marker} 接通率 :${data[1].value * 100}% - ${data[2].marker} 资源使用数 :${data[2].value} - ${data[3].marker} 使用率 :${data[3].value * + matter += `${data[0].marker} 资源接通次数 :${data[0].value} + ${data[1].marker} 接通率 :${data[1].value * 100}% + ${data[2].marker} 资源使用次数 :${data[2].value} + ${data[3].marker} 使用率 :${data[3].value * 100}%` return matter } @@ -337,7 +337,7 @@ export default { data: seriesArr[1] } // { - // name: "资源使用数", + // name: "资源使用次数", // type: "bar", // barGap: 0, // label: labelOption, diff --git a/src/router/routers.js b/src/router/routers.js index f8a1921..2f36f4d 100644 --- a/src/router/routers.js +++ b/src/router/routers.js @@ -2,8 +2,8 @@ * @Description: router * @Autor: 飘泊客 * @Date: 2021-12-02 16:54:53 - * @LastEditors: 飘泊客 - * @LastEditTime: 2022-12-09 13:21:52 + * @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git + * @LastEditTime: 2023-07-05 17:15:23 */ import Vue from 'vue' import Router from 'vue-router' diff --git a/src/utils/JSsip.js b/src/utils/JSsip.js index eb34d28..6d9441e 100644 --- a/src/utils/JSsip.js +++ b/src/utils/JSsip.js @@ -2,8 +2,8 @@ * @Description: JSSIP * @Autor: 飘泊客 * @Date: 2022-02-16 14:47:05 - * @LastEditors: 飘泊客 - * @LastEditTime: 2023-06-25 10:36:32 + * @LastEditors: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git + * @LastEditTime: 2023-07-11 18:13:17 */ import JsSIP from 'JsSIP' import store from '../store' @@ -76,9 +76,9 @@ export default { console.error('SIP注册失败,请联系管理员', e) store.commit('webrtc/SET_FSSTATUS', 'registrationFailed') Message.error('SIP注册失败,请联系管理员') - setTimeout(() => { - store.commit('webrtc/SET_FSSTATUS', '') - }, 1000) + // setTimeout(() => { + // store.commit('webrtc/SET_FSSTATUS', '') + // }, 1000) }) this.RTC.ua.on('newMessage', e => { console.log('------im新消息事件------') @@ -180,8 +180,8 @@ export default { console.log('------呼叫失败: ', e) Message.error('呼叫失败,请重试拨打') this.RTC.session = null - callback('failed', e) store.commit('webrtc/SET_CALLSTATUS', 'failed') + callback('failed', e) }, ended(e) { console.log('------呼叫结束:' + e.originator === 'remote' ? '对方挂断' : '自己挂断', e) diff --git a/src/views/dashboard/PanelGroup.vue b/src/views/dashboard/PanelGroup.vue index 0df59db..6a214b6 100644 --- a/src/views/dashboard/PanelGroup.vue +++ b/src/views/dashboard/PanelGroup.vue @@ -11,7 +11,7 @@