diff --git a/src/components.d.ts b/src/components.d.ts index e1cc6fe..b6e680f 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -54,6 +54,7 @@ NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] + offline: typeof import('./components/map/index offline.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] PcasCascader: typeof import('./components/PcasCascader/index.vue')['default'] diff --git a/src/components.d.ts b/src/components.d.ts index e1cc6fe..b6e680f 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -54,6 +54,7 @@ NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] + offline: typeof import('./components/map/index offline.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] PcasCascader: typeof import('./components/PcasCascader/index.vue')['default'] diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue index e1ba9fd..67c6ed5 100644 --- a/src/layouts/components/Tools/alarmList.vue +++ b/src/layouts/components/Tools/alarmList.vue @@ -130,8 +130,10 @@ // else { audio.setAttribute('src', otherAudio) // } - proxy.playAudio() + setTimeout(() => { + proxy.playAudio() localStorage.setItem('eventAudio', '') + }, 100); } }).catch(() => { loading.value = false diff --git a/src/components.d.ts b/src/components.d.ts index e1cc6fe..b6e680f 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -54,6 +54,7 @@ NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] + offline: typeof import('./components/map/index offline.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] PcasCascader: typeof import('./components/PcasCascader/index.vue')['default'] diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue index e1ba9fd..67c6ed5 100644 --- a/src/layouts/components/Tools/alarmList.vue +++ b/src/layouts/components/Tools/alarmList.vue @@ -130,8 +130,10 @@ // else { audio.setAttribute('src', otherAudio) // } - proxy.playAudio() + setTimeout(() => { + proxy.playAudio() localStorage.setItem('eventAudio', '') + }, 100); } }).catch(() => { loading.value = false diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 7dc2ba9..66f534f 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -16,6 +16,7 @@ state: () => ({ username: localStorage.username || '', // 账户 token: localStorage.token || '', // token + account: '', id: '', // 用户id name: '', // 姓名 deptId: '', // 部门id @@ -92,6 +93,7 @@ doLogin(data).then((res) => { localStorage.setItem('token', res.data.token) this.username = res.data.username + this.account = res.data.account this.token = res.data.token this.isLogout = 0 resolve() @@ -200,6 +202,7 @@ this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips this.dataScope = res.data.dataScope + this.account = res.data.account localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/components.d.ts b/src/components.d.ts index e1cc6fe..b6e680f 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -54,6 +54,7 @@ NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] + offline: typeof import('./components/map/index offline.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] PcasCascader: typeof import('./components/PcasCascader/index.vue')['default'] diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue index e1ba9fd..67c6ed5 100644 --- a/src/layouts/components/Tools/alarmList.vue +++ b/src/layouts/components/Tools/alarmList.vue @@ -130,8 +130,10 @@ // else { audio.setAttribute('src', otherAudio) // } - proxy.playAudio() + setTimeout(() => { + proxy.playAudio() localStorage.setItem('eventAudio', '') + }, 100); } }).catch(() => { loading.value = false diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 7dc2ba9..66f534f 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -16,6 +16,7 @@ state: () => ({ username: localStorage.username || '', // 账户 token: localStorage.token || '', // token + account: '', id: '', // 用户id name: '', // 姓名 deptId: '', // 部门id @@ -92,6 +93,7 @@ doLogin(data).then((res) => { localStorage.setItem('token', res.data.token) this.username = res.data.username + this.account = res.data.account this.token = res.data.token this.isLogout = 0 resolve() @@ -200,6 +202,7 @@ this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips this.dataScope = res.data.dataScope + this.account = res.data.account localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue index ce23322..e6aa733 100644 --- a/src/views/home/pipeline/components/detailInfoDialog.vue +++ b/src/views/home/pipeline/components/detailInfoDialog.vue @@ -157,7 +157,7 @@ // rowData.value.deviceTypeName.includes('智能警示桩') // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return } descriptionsList.value = descriptionsList.value.filter( - (item: any) => item.text !== '燃气浓度' + (item: any) => item.text !== '燃气浓度' && item.text !== '设备运行状态' ) descriptionsList.value.push( { text: '设备运行状态', diff --git a/src/components.d.ts b/src/components.d.ts index e1cc6fe..b6e680f 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -54,6 +54,7 @@ NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] + offline: typeof import('./components/map/index offline.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] PcasCascader: typeof import('./components/PcasCascader/index.vue')['default'] diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue index e1ba9fd..67c6ed5 100644 --- a/src/layouts/components/Tools/alarmList.vue +++ b/src/layouts/components/Tools/alarmList.vue @@ -130,8 +130,10 @@ // else { audio.setAttribute('src', otherAudio) // } - proxy.playAudio() + setTimeout(() => { + proxy.playAudio() localStorage.setItem('eventAudio', '') + }, 100); } }).catch(() => { loading.value = false diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 7dc2ba9..66f534f 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -16,6 +16,7 @@ state: () => ({ username: localStorage.username || '', // 账户 token: localStorage.token || '', // token + account: '', id: '', // 用户id name: '', // 姓名 deptId: '', // 部门id @@ -92,6 +93,7 @@ doLogin(data).then((res) => { localStorage.setItem('token', res.data.token) this.username = res.data.username + this.account = res.data.account this.token = res.data.token this.isLogout = 0 resolve() @@ -200,6 +202,7 @@ this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips this.dataScope = res.data.dataScope + this.account = res.data.account localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue index ce23322..e6aa733 100644 --- a/src/views/home/pipeline/components/detailInfoDialog.vue +++ b/src/views/home/pipeline/components/detailInfoDialog.vue @@ -157,7 +157,7 @@ // rowData.value.deviceTypeName.includes('智能警示桩') // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return } descriptionsList.value = descriptionsList.value.filter( - (item: any) => item.text !== '燃气浓度' + (item: any) => item.text !== '燃气浓度' && item.text !== '设备运行状态' ) descriptionsList.value.push( { text: '设备运行状态', diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue index b330615..48f73f8 100644 --- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue +++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue @@ -73,6 +73,7 @@ addAlarmLevel({ ...dataForm.value, alarmNoteMethod: dataForm.value.alarmNoteMethod.join(','), + alarmNoteMethodName: '' }).then((response) => { if (response.code === 200) { ElMessage({ @@ -101,6 +102,7 @@ editAlarmLevel({ ...dataForm.value, alarmNoteMethod: dataForm.value.alarmNoteMethod.join(','), + alarmNoteMethodName: '' }).then((response) => { if (response.code === 200) { ElMessage({ diff --git a/src/components.d.ts b/src/components.d.ts index e1cc6fe..b6e680f 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -54,6 +54,7 @@ NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] + offline: typeof import('./components/map/index offline.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] PcasCascader: typeof import('./components/PcasCascader/index.vue')['default'] diff --git a/src/layouts/components/Tools/alarmList.vue b/src/layouts/components/Tools/alarmList.vue index e1ba9fd..67c6ed5 100644 --- a/src/layouts/components/Tools/alarmList.vue +++ b/src/layouts/components/Tools/alarmList.vue @@ -130,8 +130,10 @@ // else { audio.setAttribute('src', otherAudio) // } - proxy.playAudio() + setTimeout(() => { + proxy.playAudio() localStorage.setItem('eventAudio', '') + }, 100); } }).catch(() => { loading.value = false diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 7dc2ba9..66f534f 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -16,6 +16,7 @@ state: () => ({ username: localStorage.username || '', // 账户 token: localStorage.token || '', // token + account: '', id: '', // 用户id name: '', // 姓名 deptId: '', // 部门id @@ -92,6 +93,7 @@ doLogin(data).then((res) => { localStorage.setItem('token', res.data.token) this.username = res.data.username + this.account = res.data.account this.token = res.data.token this.isLogout = 0 resolve() @@ -200,6 +202,7 @@ this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips this.dataScope = res.data.dataScope + this.account = res.data.account localStorage.setItem('nameId', res.data.id) localStorage.setItem('depId', res.data.deptId) } diff --git a/src/views/home/pipeline/components/detailInfoDialog.vue b/src/views/home/pipeline/components/detailInfoDialog.vue index ce23322..e6aa733 100644 --- a/src/views/home/pipeline/components/detailInfoDialog.vue +++ b/src/views/home/pipeline/components/detailInfoDialog.vue @@ -157,7 +157,7 @@ // rowData.value.deviceTypeName.includes('智能警示桩') // if (descriptionsList.value[descriptionsList.value.length - 1].text === '燃气浓度') { return } descriptionsList.value = descriptionsList.value.filter( - (item: any) => item.text !== '燃气浓度' + (item: any) => item.text !== '燃气浓度' && item.text !== '设备运行状态' ) descriptionsList.value.push( { text: '设备运行状态', diff --git a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue index b330615..48f73f8 100644 --- a/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue +++ b/src/views/home/rule/alarm/components/editAlarmLevelDialog.vue @@ -73,6 +73,7 @@ addAlarmLevel({ ...dataForm.value, alarmNoteMethod: dataForm.value.alarmNoteMethod.join(','), + alarmNoteMethodName: '' }).then((response) => { if (response.code === 200) { ElMessage({ @@ -101,6 +102,7 @@ editAlarmLevel({ ...dataForm.value, alarmNoteMethod: dataForm.value.alarmNoteMethod.join(','), + alarmNoteMethodName: '' }).then((response) => { if (response.code === 200) { ElMessage({ diff --git a/src/views/home/station/station/components/detailInfoDialog.vue b/src/views/home/station/station/components/detailInfoDialog.vue index a6c7d24..5ffbb84 100644 --- a/src/views/home/station/station/components/detailInfoDialog.vue +++ b/src/views/home/station/station/components/detailInfoDialog.vue @@ -248,6 +248,7 @@ if (!currentDeviceId.value) { ElMessage.warning('设备ID为空') + unref(playRef).playerFun.stopAllPlay() return } videoType.value = type