Commit 7e92b577 authored by hubaoshan's avatar hubaoshan

修改了 没有token时控制台报的bug和完善了token

parent b839b373
...@@ -27,6 +27,9 @@ export const exportRecyclePumpAlarmData = (item) => { ...@@ -27,6 +27,9 @@ export const exportRecyclePumpAlarmData = (item) => {
return httpTwo.get(`/buscirculatingpumpalarm/export?stationId=${item.stationId}&alarmStatus=${item.alarmStatus}&alarmType=${item.alarmType}&beginTime=${item.beginTime}&endTime=${item.endTime}`,'','',{responseType:'blob'}) return httpTwo.get(`/buscirculatingpumpalarm/export?stationId=${item.stationId}&alarmStatus=${item.alarmStatus}&alarmType=${item.alarmType}&beginTime=${item.beginTime}&endTime=${item.endTime}`,'','',{responseType:'blob'})
} }
export const getAudio = () => { // export const getAudio = () => {
return httpTwo.get(`/busFireExtinguisher/test3`,'','',{responseType:'blob'}) // return httpTwo.get(`/busFireExtinguisher/test3`,'','',{responseType:'blob'})
// }
export const getAudio = (item) => {
return httpTwo.get(`/busFireExtinguisher/test3?audioUrl=${item}`,'','',{responseType:'blob'})
} }
...@@ -127,7 +127,7 @@ const search = () => { ...@@ -127,7 +127,7 @@ const search = () => {
function getNumber() { function getNumber() {
getAlarmNumData().then(res => { getAlarmNumData().then(res => {
console.log('123123123123-----------', res.data) console.log('123123123123-----------', res.data)
alarmNum.value = res.data alarmNum.value = res.data ? res.data : 0
}) })
} }
...@@ -277,7 +277,15 @@ function getSupplys() { ...@@ -277,7 +277,15 @@ function getSupplys() {
}); });
} }
} }
const performActions = async () => {
try {
await handleGetAIToken(); // 等待 handleGetAIToken 完成
resetSearch()
getNumber()
} catch (error) {
console.error('处理 Token 时出错:', error);
}
};
const route = useRoute() const route = useRoute()
watch( watch(
() => route.path, // 只监听路径变化 () => route.path, // 只监听路径变化
...@@ -287,16 +295,17 @@ watch( ...@@ -287,16 +295,17 @@ watch(
activeName.value = ExtinguisherNewDataPage activeName.value = ExtinguisherNewDataPage
selectedBtn.value = 1 selectedBtn.value = 1
// 路由变化,执行相应操作 // 路由变化,执行相应操作
handleGetAIToken(); performActions()
const checkAIToken = setInterval(() => { // handleGetAIToken();
if (localStorage.getItem('AIToken')) { // const checkAIToken = setInterval(() => {
clearInterval(checkAIToken); // 停止轮询 // if (localStorage.getItem('AIToken')) {
getNumber(); // clearInterval(checkAIToken); // 停止轮询
// getData(); // getNumber();
resetSearch(); // // getData();
} // resetSearch();
}, 100); // 每100ms检查一次 // }
console.log('route.path', route.path) // }, 100); // 每100ms检查一次
// console.log('route.path', route.path)
} }
}, },
{ immediate: true } // 只在路径变化时触发 { immediate: true } // 只在路径变化时触发
......
...@@ -123,7 +123,7 @@ const search = () => { ...@@ -123,7 +123,7 @@ const search = () => {
function getNumber() { function getNumber() {
getMoveAlarmNumber().then(res => { getMoveAlarmNumber().then(res => {
console.log('123123123123-----------', res.data) console.log('123123123123-----------', res.data)
alarmNum.value = res.data alarmNum.value = res.data ? res.data : 0
}) })
} }
...@@ -276,7 +276,15 @@ function getSupplys() { ...@@ -276,7 +276,15 @@ function getSupplys() {
} }
getSupplys(); getSupplys();
const performActions = async () => {
try {
await handleGetAIToken(); // 等待 handleGetAIToken 完成
resetSearch()
getNumber()
} catch (error) {
console.error('处理 Token 时出错:', error);
}
};
const route = useRoute() const route = useRoute()
const number = ref(0) const number = ref(0)
watch( watch(
...@@ -287,17 +295,18 @@ watch( ...@@ -287,17 +295,18 @@ watch(
activeName.value = MoveMonitorNewDataPage activeName.value = MoveMonitorNewDataPage
selectedBtn.value = 1 selectedBtn.value = 1
// 路由变化,执行相应操作 // 路由变化,执行相应操作
handleGetAIToken(); performActions()
// 轮询检测 localStorage 是否更新 // handleGetAIToken();
const checkAIToken = setInterval(() => { // // 轮询检测 localStorage 是否更新
if (localStorage.getItem('AIToken')) { // const checkAIToken = setInterval(() => {
clearInterval(checkAIToken); // 停止轮询 // if (localStorage.getItem('AIToken')) {
getNumber(); // clearInterval(checkAIToken); // 停止轮询
// getData(); // getNumber();
resetSearch(); // // getData();
} // resetSearch();
}, 100); // 每100ms检查一次 // }
console.log('route.path', route.path) // }, 100); // 每100ms检查一次
// console.log('route.path', route.path)
} }
}, },
{ immediate: true } // 只在路径变化时触发 { immediate: true } // 只在路径变化时触发
......
...@@ -147,7 +147,7 @@ const search = () => { ...@@ -147,7 +147,7 @@ const search = () => {
function getNumber() { function getNumber() {
getPipAlarmNumber().then(res => { getPipAlarmNumber().then(res => {
console.log('123123123123-----------', res.data) console.log('123123123123-----------', res.data)
alarmNum.value = res.data alarmNum.value = res.data ? res.data : 0
}) })
} }
...@@ -301,7 +301,15 @@ function getSupplys() { ...@@ -301,7 +301,15 @@ function getSupplys() {
} }
getSupplys(); getSupplys();
const performActions = async () => {
try {
await handleGetAIToken(); // 等待 handleGetAIToken 完成
resetSearch()
getNumber()
} catch (error) {
console.error('处理 Token 时出错:', error);
}
};
const route = useRoute() const route = useRoute()
const number = ref(0) const number = ref(0)
watch( watch(
...@@ -312,17 +320,18 @@ watch( ...@@ -312,17 +320,18 @@ watch(
activeName.value = PipelineTempNewDataPage activeName.value = PipelineTempNewDataPage
selectedBtn.value = 1 selectedBtn.value = 1
// 路由变化,执行相应操作 // 路由变化,执行相应操作
handleGetAIToken(); performActions()
// 轮询检测 localStorage 是否更新 // handleGetAIToken();
const checkAIToken = setInterval(() => { // // 轮询检测 localStorage 是否更新
if (localStorage.getItem('AIToken')) { // const checkAIToken = setInterval(() => {
clearInterval(checkAIToken); // 停止轮询 // if (localStorage.getItem('AIToken')) {
getNumber(); // clearInterval(checkAIToken); // 停止轮询
// getData(); // getNumber();
resetSearch(); // // getData();
} // resetSearch();
}, 100); // 每100ms检查一次 // }
console.log('route.path', route.path) // }, 100); // 每100ms检查一次
// console.log('route.path', route.path)
} }
}, },
{ immediate: true } // 只在路径变化时触发 { immediate: true } // 只在路径变化时触发
......
...@@ -40,7 +40,7 @@ function selectRow(row) { ...@@ -40,7 +40,7 @@ function selectRow(row) {
const index = RecyclePumpData.value.indexOf(row) const index = RecyclePumpData.value.indexOf(row)
selectedRow.value = row; selectedRow.value = row;
selectedRowIndex.value = index; selectedRowIndex.value = index;
// playAudio() playAudio()
} }
const audioPlayer = ref(null); const audioPlayer = ref(null);
...@@ -153,7 +153,7 @@ function playAudio() { ...@@ -153,7 +153,7 @@ function playAudio() {
watch( watch(
()=>RecyclePumpData.value, ()=>RecyclePumpData.value,
()=>{ ()=>{
if (RecyclePumpData.value.length > 0) { if (RecyclePumpData.value && RecyclePumpData.value.length > 0) {
selectRow(RecyclePumpData.value[0], 0); selectRow(RecyclePumpData.value[0], 0);
}else{ }else{
console.log('没有数据') console.log('没有数据')
...@@ -171,10 +171,12 @@ const props = defineProps({ ...@@ -171,10 +171,12 @@ const props = defineProps({
watch( watch(
() => props.queryParams, () => props.queryParams,
(newData) => { (newData) => {
params.value = newData if (props.queryParams && props.queryParams.length> 0) {
getDataNew(params.value) params.value = newData
console.log('值eeeee',params.value) getDataNew(params.value)
console.log('值ooo',props.queryParams) console.log('值eeeee', params.value)
console.log('值ooo', props.queryParams)
}
} }
) )
......
...@@ -35,7 +35,7 @@ const handleCurrentChange = (val) => { ...@@ -35,7 +35,7 @@ const handleCurrentChange = (val) => {
Page.page = val; Page.page = val;
getDataByParams() getDataByParams()
}; };
const audioUrl = ref();
const selectedRow = ref({}); const selectedRow = ref({});
const selectedRowIndex = ref(); const selectedRowIndex = ref();
// 高亮行 // 高亮行
...@@ -43,6 +43,8 @@ function selectRow(row) { ...@@ -43,6 +43,8 @@ function selectRow(row) {
const index = RecyclePumpData.value.indexOf(row) const index = RecyclePumpData.value.indexOf(row)
selectedRow.value = row; selectedRow.value = row;
selectedRowIndex.value = index; selectedRowIndex.value = index;
audioUrl.value = row.businessId
playAudio(audioUrl.value)
} }
const audioPlayer = ref(null); const audioPlayer = ref(null);
...@@ -81,14 +83,14 @@ function zoom(zoomLevel) { ...@@ -81,14 +83,14 @@ function zoom(zoomLevel) {
} }
} }
/** 获取音频*/ /** 获取音频*/
function playAudio() { function playAudio(item) {
loading.value = true loading.value = true
// 如果有波形图,则摧毁现有波形图,渲染新的波形图 // 如果有波形图,则摧毁现有波形图,渲染新的波形图
console.log('wavesurfer.value',wavesurfer.value) console.log('wavesurfer.value',wavesurfer.value)
if (wavesurfer.value) { if (wavesurfer.value) {
wavesurfer.value.destroy(); wavesurfer.value.destroy();
} }
getAudio().then(async res => { getAudio(item).then(async res => {
const audioSrc = URL.createObjectURL(new Blob([res])); const audioSrc = URL.createObjectURL(new Blob([res]));
// 播放器和波形图赋值 // 播放器和波形图赋值
audioPlayer.value.src = audioSrc; audioPlayer.value.src = audioSrc;
...@@ -151,7 +153,7 @@ function playAudio() { ...@@ -151,7 +153,7 @@ function playAudio() {
watch( watch(
()=>RecyclePumpData.value, ()=>RecyclePumpData.value,
()=>{ ()=>{
if (RecyclePumpData.value.length > 0) { if (RecyclePumpData.value && RecyclePumpData.value.length > 0) {
selectRow(RecyclePumpData.value[0], 0); selectRow(RecyclePumpData.value[0], 0);
}else{ }else{
console.log('没有数据') console.log('没有数据')
...@@ -169,10 +171,12 @@ const props = defineProps({ ...@@ -169,10 +171,12 @@ const props = defineProps({
watch( watch(
() => props.queryParams, () => props.queryParams,
(newData) => { (newData) => {
params.value = newData if (props.queryParams && props.queryParams.length> 0) {
getDataNew(params.value) params.value = newData
console.log('值eeeee',params.value) getDataNew(params.value)
console.log('值ooo',props.queryParams) console.log('值eeeee', params.value)
console.log('值ooo', props.queryParams)
}
} }
) )
......
...@@ -31,7 +31,7 @@ const selectedComponent = ref(RecyclePumpNewDataPage); ...@@ -31,7 +31,7 @@ const selectedComponent = ref(RecyclePumpNewDataPage);
const activeName = ref(RecyclePumpNewDataPage); const activeName = ref(RecyclePumpNewDataPage);
// 报警数量 // 报警数量
const alarmNum = ref(1); const alarmNum = ref(0);
// 点击标签页切换事件 // 点击标签页切换事件
const handleTabClick = (tab, event) => { const handleTabClick = (tab, event) => {
...@@ -40,11 +40,13 @@ const handleTabClick = (tab, event) => { ...@@ -40,11 +40,13 @@ const handleTabClick = (tab, event) => {
if (selectedItem) { if (selectedItem) {
selectedComponent.value = selectedItem.component; selectedComponent.value = selectedItem.component;
selectedBtn.value = selectedItem.id; selectedBtn.value = selectedItem.id;
childParams.value = {}
handleGetAIToken();
setTimeout(function () { setTimeout(function () {
resetSearch(); resetSearch()
search() // playAudio()
playAudio() getNumber()
}, 1000) }, 500)
} }
}; };
...@@ -84,16 +86,16 @@ const search = () => { ...@@ -84,16 +86,16 @@ const search = () => {
beginTime: queryParams.beginTime, beginTime: queryParams.beginTime,
endTime: queryParams.endTime, endTime: queryParams.endTime,
} }
if (item.stationId === undefined){ if (item.stationId === undefined) {
item.stationId = '' item.stationId = ''
} }
if (item.beginTime == null){ if (item.beginTime == null) {
item.beginTime = '' item.beginTime = ''
} }
if (item.endTime == null){ if (item.endTime == null) {
item.endTime = '' item.endTime = ''
} }
if (item.alarmStatus === undefined){ if (item.alarmStatus === undefined) {
item.alarmStatus = '' item.alarmStatus = ''
} }
if (selectedBtn.value === 1) { if (selectedBtn.value === 1) {
...@@ -105,11 +107,12 @@ const search = () => { ...@@ -105,11 +107,12 @@ const search = () => {
} }
console.log('查询:', item); console.log('查询:', item);
}; };
// 获取报警数量 // 获取报警数量
function getNumber() { function getNumber() {
getRecycleAlarmNumber().then(res => { getRecycleAlarmNumber().then(res => {
console.log('123123123123-----------', res.data) console.log('123123123123-----------', res.data)
alarmNum.value = res.data alarmNum.value = res.data ? res.data : 0
}) })
} }
...@@ -121,16 +124,16 @@ const handleExport = () => { ...@@ -121,16 +124,16 @@ const handleExport = () => {
beginTime: queryParams.beginTime, beginTime: queryParams.beginTime,
endTime: queryParams.endTime, endTime: queryParams.endTime,
} }
if (item.stationId === undefined){ if (item.stationId === undefined) {
item.stationId = '' item.stationId = ''
} }
if (item.beginTime == null){ if (item.beginTime == null) {
item.beginTime = '' item.beginTime = ''
} }
if (item.endTime == null){ if (item.endTime == null) {
item.endTime = '' item.endTime = ''
} }
if (item.alarmStatus === undefined){ if (item.alarmStatus === undefined) {
item.alarmStatus = '' item.alarmStatus = ''
} }
console.log('selectedBtn.value:', selectedBtn.value) console.log('selectedBtn.value:', selectedBtn.value)
...@@ -185,13 +188,13 @@ const resetSearch = () => { ...@@ -185,13 +188,13 @@ const resetSearch = () => {
queryParams.stationId = '' queryParams.stationId = ''
searchData.value = [] searchData.value = []
childParams.value = { childParams.value = {
page: Page.page, // page: Page.page,
size: Page.rows, // size: Page.rows,
stationId: '', // stationId: '',
alarmStatus: '', // alarmStatus: '',
alarmType: '', // alarmType: '',
beginTime: '', // beginTime: '',
endTime: '', // endTime: '',
} }
getData() getData()
}; };
...@@ -210,29 +213,39 @@ const playAudio = () => { ...@@ -210,29 +213,39 @@ const playAudio = () => {
} }
}; };
const route = useRoute() const route = useRoute()
const performActions = async () => {
try {
await handleGetAIToken(); // 等待 handleGetAIToken 完成
resetSearch()
getNumber()
} catch (error) {
console.error('处理 Token 时出错:', error);
}
};
watch( watch(
() => route.path, // 只监听路径变化 () => route.path, // 只监听路径变化
() => { () => {
if(route.path === '/AIStation/RecyclePump') { // 路由变化,执行相应操作
if (route.path === '/AIStation/RecyclePump') {
selectedComponent.value = RecyclePumpNewDataPage selectedComponent.value = RecyclePumpNewDataPage
activeName.value = RecyclePumpNewDataPage activeName.value = RecyclePumpNewDataPage
selectedBtn.value = 1 selectedBtn.value = 1
// 路由变化,执行相应操作 performActions()
handleGetAIToken();
// 轮询检测 localStorage 是否更新 // 轮询检测 localStorage 是否更新
const checkAIToken = setInterval(() => { // const checkAIToken = setInterval(() => {
if (localStorage.getItem('AIToken')) { // if (localStorage.getItem('AIToken')) {
clearInterval(checkAIToken); // 停止轮询 // clearInterval(checkAIToken); // 停止轮询
getNumber(); // getNumber();
playAudio(); // playAudio();
// getData(); // getData();
resetSearch() // resetSearch()
} }
}, 100); // 每100ms检查一次 // }, 100); // 每100ms检查一次
console.log('route.path', route.path) console.log('route.path', route.path)
} // }
}, },
{ immediate: true } // 只在路径变化时触发 {immediate: true} // 只在路径变化时触发
) )
// 获取换热站信息 // 获取换热站信息
const options = ref([]); const options = ref([]);
...@@ -362,7 +375,6 @@ getSupplys(); ...@@ -362,7 +375,6 @@ getSupplys();
</el-tabs> </el-tabs>
<component :is="selectedComponent" ref="childComponentRef" :queryParams='childParams'></component> <component :is="selectedComponent" ref="childComponentRef" :queryParams='childParams'></component>
</div> </div>
</div> </div>
</template> </template>
......
...@@ -154,7 +154,7 @@ const search = () => { ...@@ -154,7 +154,7 @@ const search = () => {
function getNumber() { function getNumber() {
getTransAlarmNumber().then(res => { getTransAlarmNumber().then(res => {
console.log('123123123123-----------', res.data) console.log('123123123123-----------', res.data)
alarmNum.value = res.data alarmNum.value = res.data ? res.data : 0
}) })
} }
...@@ -310,6 +310,15 @@ function getSupplys() { ...@@ -310,6 +310,15 @@ function getSupplys() {
getSupplys(); getSupplys();
getNumber() getNumber()
const performActions = async () => {
try {
await handleGetAIToken(); // 等待 handleGetAIToken 完成
resetSearch()
getNumber()
} catch (error) {
console.error('处理 Token 时出错:', error);
}
};
const route = useRoute() const route = useRoute()
const number = ref(0) const number = ref(0)
watch( watch(
...@@ -320,17 +329,18 @@ watch( ...@@ -320,17 +329,18 @@ watch(
activeName.value = TransTempNewDataPage; activeName.value = TransTempNewDataPage;
selectedBtn.value = 1 selectedBtn.value = 1
// 路由变化,执行相应操作 // 路由变化,执行相应操作
handleGetAIToken(); performActions()
// 轮询检测 localStorage 是否更新 // handleGetAIToken();
const checkAIToken = setInterval(() => { // // 轮询检测 localStorage 是否更新
if (localStorage.getItem('AIToken')) { // const checkAIToken = setInterval(() => {
clearInterval(checkAIToken); // 停止轮询 // if (localStorage.getItem('AIToken')) {
getNumber(); // clearInterval(checkAIToken); // 停止轮询
// getData(); // getNumber();
resetSearch(); // // getData();
} // resetSearch();
}, 100); // 每100ms检查一次 // }
console.log('route.path', route.path) // }, 100); // 每100ms检查一次
// console.log('route.path', route.path)
} }
}, },
{ immediate: true } // 只在路径变化时触发 { immediate: true } // 只在路径变化时触发
......
...@@ -360,21 +360,31 @@ function getSupplys(){ ...@@ -360,21 +360,31 @@ function getSupplys(){
} }
} }
const performActions = async () => {
try {
await handleGetAIToken(); // 等待 handleGetAIToken 完成
resetSearch()
// getNumber()
} catch (error) {
console.error('处理 Token 时出错:', error);
}
};
const route = useRoute() const route = useRoute()
watch( watch(
() => route.path, // 只监听路径变化 () => route.path, // 只监听路径变化
() => { () => {
if(route.path === '/AIStation/VoiceCommandLocation') { if(route.path === '/AIStation/VoiceCommandLocation') {
// 路由变化,执行相应操作 // 路由变化,执行相应操作
handleGetAIToken(); performActions()
const checkAIToken = setInterval(() => { // handleGetAIToken();
if (localStorage.getItem('AIToken')) { // const checkAIToken = setInterval(() => {
clearInterval(checkAIToken); // 停止轮询 // if (localStorage.getItem('AIToken')) {
// loadData(); // clearInterval(checkAIToken); // 停止轮询
resetSearch(); // // loadData();
} // resetSearch();
}, 100); // 每100ms检查一次 // }
// }, 100); // 每100ms检查一次
} }
}, },
{ immediate: true } // 只在路径变化时触发 { immediate: true } // 只在路径变化时触发
......
...@@ -205,19 +205,30 @@ function handleDetail(row) { ...@@ -205,19 +205,30 @@ function handleDetail(row) {
singleDetails.value = row singleDetails.value = row
detailOpen.value = true detailOpen.value = true
} }
const performActions = async () => {
try {
await handleGetAIToken(); // 等待 handleGetAIToken 完成
resetSearch()
// getNumber()
} catch (error) {
console.error('处理 Token 时出错:', error);
}
};
const route = useRoute() const route = useRoute()
watch( watch(
() => route.path, // 只监听路径变化 () => route.path, // 只监听路径变化
() => { () => {
if(route.path === '/AIStation/VoiceCommand') { if(route.path === '/AIStation/VoiceCommand') {
handleGetAIToken(); performActions()
const checkAIToken = setInterval(() => { // handleGetAIToken();
if (localStorage.getItem('AIToken')) { // const checkAIToken = setInterval(() => {
clearInterval(checkAIToken); // 停止轮询 // if (localStorage.getItem('AIToken')) {
// loadData(); // clearInterval(checkAIToken); // 停止轮询
resetSearch(); // // loadData();
} // resetSearch();
}, 100); // 每100ms检查一次 // }
// }, 100); // 每100ms检查一次
} }
}, },
{ immediate: true } // 只在路径变化时触发 { immediate: true } // 只在路径变化时触发
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment