100j相关bug修复
This commit is contained in:
@ -2,16 +2,10 @@
|
|||||||
VITE_APP_TITLE = 云平台管理系统
|
VITE_APP_TITLE = 云平台管理系统
|
||||||
|
|
||||||
# 生产环境配置 晶全1
|
# 生产环境配置 晶全1
|
||||||
VITE_APP_ENV = 'production'
|
VITE_APP_ENV = 'https://www.cnxhyc.com'
|
||||||
|
|
||||||
# 生产环境配置 富源晟2
|
|
||||||
# VITE_APP_ENV = 'https://fuyuanshen.com/backend-fys'
|
|
||||||
|
|
||||||
# 应用访问路径 晶全1
|
# 应用访问路径 晶全1
|
||||||
VITE_APP_CONTEXT_PATH = '/PC/'
|
VITE_APP_CONTEXT_PATH = '/jingquan/'
|
||||||
|
|
||||||
# 高德地图Key
|
|
||||||
VITE_AMAP_KEY='84a12a692ae378effdf741e16d584cd3'
|
|
||||||
|
|
||||||
# 应用访问路径 富源晟2
|
# 应用访问路径 富源晟2
|
||||||
#VITE_APP_CONTEXT_PATH = '/sys/'
|
#VITE_APP_CONTEXT_PATH = '/sys/'
|
||||||
@ -23,12 +17,7 @@ VITE_APP_MONITOR_ADMIN = '/admin/applications'
|
|||||||
VITE_APP_SNAILJOB_ADMIN = '/snail-job'
|
VITE_APP_SNAILJOB_ADMIN = '/snail-job'
|
||||||
|
|
||||||
# 生产环境 晶全3 代理访问
|
# 生产环境 晶全3 代理访问
|
||||||
VITE_APP_BASE_API = 'https://www.cnxhyc.com/jq'
|
VITE_APP_BASE_API = '/jq'
|
||||||
|
|
||||||
# VITE_APP_BASE_API = 'http://139.224.253.23:8000'
|
|
||||||
|
|
||||||
# 生产环境 富源晟3
|
|
||||||
#VITE_APP_BASE_API = '/backend-fys'
|
|
||||||
|
|
||||||
# 是否在打包时开启压缩,支持 gzip 和 brotli
|
# 是否在打包时开启压缩,支持 gzip 和 brotli
|
||||||
VITE_BUILD_COMPRESS = gzip
|
VITE_BUILD_COMPRESS = gzip
|
||||||
|
|||||||
@ -54,7 +54,7 @@ function SosSetting (data: any) {
|
|||||||
// 语音列表
|
// 语音列表
|
||||||
function queryAudioFileList (params: any) {
|
function queryAudioFileList (params: any) {
|
||||||
return request({
|
return request({
|
||||||
url: `/app/video/queryAudioFileList`,
|
url: `/api/video/queryAudioFileList`,
|
||||||
method: 'get',
|
method: 'get',
|
||||||
params: params
|
params: params
|
||||||
});
|
});
|
||||||
@ -62,7 +62,7 @@ function queryAudioFileList (params: any) {
|
|||||||
// 提取文本内容
|
// 提取文本内容
|
||||||
function extractText (data: any) {
|
function extractText (data: any) {
|
||||||
return request({
|
return request({
|
||||||
url: `/app/video/extract`,
|
url: `/api/video/extract`,
|
||||||
method: 'post',
|
method: 'post',
|
||||||
data: data
|
data: data
|
||||||
});
|
});
|
||||||
@ -70,7 +70,7 @@ function extractText (data: any) {
|
|||||||
// 上传音频文件
|
// 上传音频文件
|
||||||
function uploadAudioToOss (data: any) {
|
function uploadAudioToOss (data: any) {
|
||||||
return request({
|
return request({
|
||||||
url: `/app/video/uploadAudioToOss`,
|
url: `/api/video/uploadAudioToOss`,
|
||||||
method: 'post',
|
method: 'post',
|
||||||
data: data
|
data: data
|
||||||
});
|
});
|
||||||
@ -78,7 +78,7 @@ function uploadAudioToOss (data: any) {
|
|||||||
// 文本转语音
|
// 文本转语音
|
||||||
export function videTtsToOss(data:any) {
|
export function videTtsToOss(data:any) {
|
||||||
return request({
|
return request({
|
||||||
url: `/app/video/ttsToOss`,
|
url: `/api/video/ttsToOss`,
|
||||||
method: 'post',
|
method: 'post',
|
||||||
data:data
|
data:data
|
||||||
})
|
})
|
||||||
@ -86,7 +86,7 @@ export function videTtsToOss(data:any) {
|
|||||||
// 重命名
|
// 重命名
|
||||||
export function videRenameAudioFile(data:any) {
|
export function videRenameAudioFile(data:any) {
|
||||||
return request({
|
return request({
|
||||||
url: `/app/video/renameAudioFile`,
|
url: `/api/video/renameAudioFile`,
|
||||||
method: 'post',
|
method: 'post',
|
||||||
data:data
|
data:data
|
||||||
})
|
})
|
||||||
@ -94,7 +94,7 @@ export function videRenameAudioFile(data:any) {
|
|||||||
// 删除语音文件列表
|
// 删除语音文件列表
|
||||||
export function deviceDeleteAudioFile(params:any) {
|
export function deviceDeleteAudioFile(params:any) {
|
||||||
return request({
|
return request({
|
||||||
url: `/app/video/deleteAudioFile`,
|
url: `/api/video/deleteAudioFile`,
|
||||||
method: 'get',
|
method: 'get',
|
||||||
params:params
|
params:params
|
||||||
})
|
})
|
||||||
@ -103,7 +103,7 @@ export function deviceDeleteAudioFile(params:any) {
|
|||||||
// 更新语音,使用语音
|
// 更新语音,使用语音
|
||||||
export function deviceUpdateVoice(data:any) {
|
export function deviceUpdateVoice(data:any) {
|
||||||
return request({
|
return request({
|
||||||
url: `/app/hby100j/device/updateVoice`,
|
url: `/api/hby100j/device/updateVoice`,
|
||||||
method: 'post',
|
method: 'post',
|
||||||
data:data
|
data:data
|
||||||
})
|
})
|
||||||
@ -111,7 +111,7 @@ export function deviceUpdateVoice(data:any) {
|
|||||||
// 语音播放
|
// 语音播放
|
||||||
export function deviceVoiceBroadcast(data:any) {
|
export function deviceVoiceBroadcast(data:any) {
|
||||||
return request({
|
return request({
|
||||||
url: `/app/hby100j/device/voiceBroadcast`,
|
url: `/api/hby100j/device/voiceBroadcast`,
|
||||||
method: 'post',
|
method: 'post',
|
||||||
data:data
|
data:data
|
||||||
})
|
})
|
||||||
|
|||||||
@ -58,16 +58,17 @@
|
|||||||
<div class="current-voice">
|
<div class="current-voice">
|
||||||
<span class="voice-label">当前语音</span>
|
<span class="voice-label">当前语音</span>
|
||||||
<div class="voice-select">
|
<div class="voice-select">
|
||||||
<el-select v-model="currentVoiceId" placeholder="请选择语音" style="width: 100%;">
|
<el-input type="text" v-model="currentVoiceId" placeholder="当前语音" style="width: 100%;" :disabled="currentVoiceId"></el-input>
|
||||||
|
<!-- <el-select v-model="currentVoiceId" placeholder="请选择语音" style="width: 100%;">
|
||||||
<el-option v-for="item in voiceList" :key="item.id" :label="item.fileNameExt"
|
<el-option v-for="item in voiceList" :key="item.id" :label="item.fileNameExt"
|
||||||
:value="item.id" ite>
|
:value="item.id" :disabled="item.id !== currentVoiceId">
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select> -->
|
||||||
</div>
|
</div>
|
||||||
<el-button type="primary" class="play-btn" @click="playCurrentVoice(1)"
|
<el-button type="primary" class="play-btn" @click="playCurrentVoice"
|
||||||
v-if="deviceDetail.voiceBroadcast !== 1">
|
v-if="deviceDetail.voiceBroadcast === 0">
|
||||||
播放</el-button>
|
播放</el-button>
|
||||||
<el-button v-else type="info" class="play-btn" @click="playCurrentVoice(0)"> 暂停
|
<el-button v-else type="info" class="play-btn" @click="playCurrentVoice"> 暂停
|
||||||
</el-button>
|
</el-button>
|
||||||
</div>
|
</div>
|
||||||
<div class="voice-manage-section">
|
<div class="voice-manage-section">
|
||||||
@ -201,7 +202,7 @@
|
|||||||
<el-dialog title="上传语音" v-model="uploadVoiceDialog" width="480px" class="voice-dialog" :show-close="true">
|
<el-dialog title="上传语音" v-model="uploadVoiceDialog" width="480px" class="voice-dialog" :show-close="true">
|
||||||
<div class="upload-content">
|
<div class="upload-content">
|
||||||
<div class="upload-area" :class="{ dragOver: isDragOver }" @dragover.prevent="isDragOver = true"
|
<div class="upload-area" :class="{ dragOver: isDragOver }" @dragover.prevent="isDragOver = true"
|
||||||
@dragleave.prevent="isDragOver = false" @drop.prevent="handleDrop" @click="triggerFileInput">
|
@dragleave.prevent="isDragOver = false" @drop.prevent="handleDrop">
|
||||||
<div class="upload-icon">
|
<div class="upload-icon">
|
||||||
<el-icon>
|
<el-icon>
|
||||||
<Document />
|
<Document />
|
||||||
@ -762,6 +763,7 @@ const handleVoiceType = async (targetId: string) => {
|
|||||||
try {
|
try {
|
||||||
const res = await api.SosSetting(params);
|
const res = await api.SosSetting(params);
|
||||||
if (res.code === 200) proxy?.$modal.msgSuccess(res.msg);
|
if (res.code === 200) proxy?.$modal.msgSuccess(res.msg);
|
||||||
|
deviceDetail.value.voiceBroadcast = 0;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
await getList();
|
await getList();
|
||||||
}
|
}
|
||||||
@ -937,41 +939,41 @@ const lookMap = (row: any) => {
|
|||||||
const playCurrentVoice = async () => {
|
const playCurrentVoice = async () => {
|
||||||
// 1. 报警中场景:播放/切换报警语音
|
// 1. 报警中场景:播放/切换报警语音
|
||||||
if (deviceDetail.value.voiceStrobeAlarm === 1) {
|
if (deviceDetail.value.voiceStrobeAlarm === 1) {
|
||||||
|
const targetStatus = deviceDetail.value.voiceBroadcast === 1 ? 0 : 1;
|
||||||
try {
|
try {
|
||||||
const currentMode = sta_VoiceType.value.find(mode => mode.active)?.id || '0';
|
|
||||||
const data = {
|
const data = {
|
||||||
deviceIds: [route.params.deviceId],
|
deviceIds: [route.params.deviceId],
|
||||||
voiceStrobeAlarm: 1,
|
voiceStrobeAlarm: deviceDetail.value.voiceBroadcast == 0 ? 1 : 0,
|
||||||
mode: currentMode
|
mode: 7
|
||||||
};
|
};
|
||||||
const res = await api.SosSetting(data);
|
const res = await api.SosSetting(data);
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
|
deviceDetail.value.voiceBroadcast = targetStatus;
|
||||||
proxy?.$modal.msgSuccess(res.msg);
|
proxy?.$modal.msgSuccess(res.msg);
|
||||||
await getList();
|
|
||||||
} else {
|
} else {
|
||||||
proxy?.$modal.msgError(res.msg);
|
proxy?.$modal.msgError(res.msg);
|
||||||
}
|
}
|
||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
// proxy?.$modal.msgError(err.msg);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 2. 非报警中场景:单纯播放/暂停语音
|
// 2. 非报警中场景:单纯播放/暂停语音
|
||||||
else {
|
else {
|
||||||
const targetStatus = deviceDetail.value.voiceBroadcast === 1 ? 0 : 1;
|
const targetStatus = deviceDetail.value.voiceBroadcast === 1 ? 0 : 1;
|
||||||
|
console.log(targetStatus, 'targetStatustargetStatustargetStatus');
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const res = await api.deviceVoiceBroadcast({
|
const res = await api.deviceVoiceBroadcast({
|
||||||
deviceId: route.params.deviceId,
|
deviceId: route.params.deviceId,
|
||||||
voiceBroadcast: targetStatus
|
voiceBroadcast: deviceDetail.value.voiceBroadcast==0 ? 1 : 0
|
||||||
});
|
});
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
deviceDetail.value.voiceBroadcast = targetStatus;
|
deviceDetail.value.voiceBroadcast = targetStatus;
|
||||||
proxy?.$modal.msgSuccess(res.msg);
|
proxy?.$modal.msgSuccess(res.msg);
|
||||||
await getList();
|
|
||||||
} else {
|
} else {
|
||||||
proxy?.$modal.msgError(res.msg);
|
proxy?.$modal.msgError(res.msg);
|
||||||
}
|
}
|
||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
// proxy?.$modal.msgError(err.msg);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -982,12 +984,6 @@ onMounted(async () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
onUnmounted(() => {
|
onUnmounted(() => {
|
||||||
disconnect();
|
|
||||||
if (recordTimer) clearInterval(recordTimer);
|
|
||||||
if (mediaRecorder.value && isRecording.value) mediaRecorder.value.stop();
|
|
||||||
if (audioStream) audioStream.getTracks().forEach(track => track.stop());
|
|
||||||
// if (ttsAudio) ttsAudio.pause();
|
|
||||||
if (voiceAudio) voiceAudio.pause();
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@ -1416,12 +1412,13 @@ onUnmounted(() => {
|
|||||||
// 上传语音弹窗样式
|
// 上传语音弹窗样式
|
||||||
.upload-content {
|
.upload-content {
|
||||||
.upload-area {
|
.upload-area {
|
||||||
border: 2px dashed #dcdfe6;
|
// border: 2px dashed #dcdfe6;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
padding: 40px 20px;
|
padding: 40px 20px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
transition: all 0.3s;
|
transition: all 0.3s;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
background: #EFF7FF;
|
||||||
|
|
||||||
&.dragOver {
|
&.dragOver {
|
||||||
border-color: #409eff;
|
border-color: #409eff;
|
||||||
|
|||||||
Reference in New Issue
Block a user