diff --git a/index.html b/index.html index 0f5e78c..9ecfa5a 100644 --- a/index.html +++ b/index.html @@ -40,9 +40,6 @@ <%- devtoolScript %> diff --git a/index.html b/index.html index 0f5e78c..9ecfa5a 100644 --- a/index.html +++ b/index.html @@ -40,9 +40,6 @@ <%- devtoolScript %> diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts index 40042d2..1abdbef 100644 --- a/src/directives/table-scroll/index.ts +++ b/src/directives/table-scroll/index.ts @@ -23,8 +23,8 @@ // table-container const container = document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement // console.log(container, 'container') - container.addEventListener('mouseover', onMouseOver) - container.addEventListener('mouseout', onMouseOut) + container?.addEventListener('mouseover', onMouseOver) + container?.addEventListener('mouseout', onMouseOut) el.timer = window.setInterval(() => { const viewDomClientHeight = viewDom.scrollHeight diff --git a/index.html b/index.html index 0f5e78c..9ecfa5a 100644 --- a/index.html +++ b/index.html @@ -40,9 +40,6 @@ <%- devtoolScript %> diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts index 40042d2..1abdbef 100644 --- a/src/directives/table-scroll/index.ts +++ b/src/directives/table-scroll/index.ts @@ -23,8 +23,8 @@ // table-container const container = document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement // console.log(container, 'container') - container.addEventListener('mouseover', onMouseOver) - container.addEventListener('mouseout', onMouseOut) + container?.addEventListener('mouseover', onMouseOver) + container?.addEventListener('mouseout', onMouseOut) el.timer = window.setInterval(() => { const viewDomClientHeight = viewDom.scrollHeight diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts index 8289351..0f7359d 100644 --- a/src/router/modules/pc.ts +++ b/src/router/modules/pc.ts @@ -89,7 +89,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/alarm/current', - auth: '/alarm/detail', + auth: '/alarm/current', }, }, { @@ -115,7 +115,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/alarm/history', - auth: '/alarm/detail', + auth: '/alarm/history', }, }, { @@ -232,7 +232,6 @@ sidebar: false, breadcrumb: true, activeMenu: '/temporary', - // auth: '/temporary/detail/menu', }, }, ], @@ -282,7 +281,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/well', - auth: '/well/detail/menu', + auth: '/well', }, }, ], @@ -321,7 +320,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/station/monitor', - auth: '/station/detail', + auth: '/station/monitor', }, }, { @@ -399,7 +398,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/pipeline', - auth: '/pipeline/detail/menu', + auth: '/pipeline', }, }, ], @@ -531,7 +530,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/device/manage', - auth: '/device/manage/detail/menu', + auth: '/device/manage', }, }, // { @@ -609,7 +608,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/operation/alarm', - auth: '/operation/alarm/detail', + auth: '/operation/alarm', }, }, { @@ -635,7 +634,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/operation/history', - auth: '/operation/alarm/detail', + auth: '/operation/history', }, }, { diff --git a/index.html b/index.html index 0f5e78c..9ecfa5a 100644 --- a/index.html +++ b/index.html @@ -40,9 +40,6 @@ <%- devtoolScript %> diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts index 40042d2..1abdbef 100644 --- a/src/directives/table-scroll/index.ts +++ b/src/directives/table-scroll/index.ts @@ -23,8 +23,8 @@ // table-container const container = document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement // console.log(container, 'container') - container.addEventListener('mouseover', onMouseOver) - container.addEventListener('mouseout', onMouseOut) + container?.addEventListener('mouseover', onMouseOver) + container?.addEventListener('mouseout', onMouseOut) el.timer = window.setInterval(() => { const viewDomClientHeight = viewDom.scrollHeight diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts index 8289351..0f7359d 100644 --- a/src/router/modules/pc.ts +++ b/src/router/modules/pc.ts @@ -89,7 +89,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/alarm/current', - auth: '/alarm/detail', + auth: '/alarm/current', }, }, { @@ -115,7 +115,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/alarm/history', - auth: '/alarm/detail', + auth: '/alarm/history', }, }, { @@ -232,7 +232,6 @@ sidebar: false, breadcrumb: true, activeMenu: '/temporary', - // auth: '/temporary/detail/menu', }, }, ], @@ -282,7 +281,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/well', - auth: '/well/detail/menu', + auth: '/well', }, }, ], @@ -321,7 +320,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/station/monitor', - auth: '/station/detail', + auth: '/station/monitor', }, }, { @@ -399,7 +398,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/pipeline', - auth: '/pipeline/detail/menu', + auth: '/pipeline', }, }, ], @@ -531,7 +530,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/device/manage', - auth: '/device/manage/detail/menu', + auth: '/device/manage', }, }, // { @@ -609,7 +608,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/operation/alarm', - auth: '/operation/alarm/detail', + auth: '/operation/alarm', }, }, { @@ -635,7 +634,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/operation/history', - auth: '/operation/alarm/detail', + auth: '/operation/history', }, }, { diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts index c270e8c..240fc2e 100644 --- a/src/utils/sessionData.ts +++ b/src/utils/sessionData.ts @@ -76,10 +76,10 @@ indexDBHandler('all-video-list', JSON.stringify(res.data)) }) } -// 泄露 +// 泄漏 export const fetchCacheLeak= () => { getLeakageList({}).then(res => { - // console.log(res.data, '泄露') + // console.log(res.data, '泄漏') indexDBHandler('all-leakage-list', JSON.stringify(res.data)) }) } diff --git a/index.html b/index.html index 0f5e78c..9ecfa5a 100644 --- a/index.html +++ b/index.html @@ -40,9 +40,6 @@ <%- devtoolScript %> diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts index 40042d2..1abdbef 100644 --- a/src/directives/table-scroll/index.ts +++ b/src/directives/table-scroll/index.ts @@ -23,8 +23,8 @@ // table-container const container = document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement // console.log(container, 'container') - container.addEventListener('mouseover', onMouseOver) - container.addEventListener('mouseout', onMouseOut) + container?.addEventListener('mouseover', onMouseOver) + container?.addEventListener('mouseout', onMouseOut) el.timer = window.setInterval(() => { const viewDomClientHeight = viewDom.scrollHeight diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts index 8289351..0f7359d 100644 --- a/src/router/modules/pc.ts +++ b/src/router/modules/pc.ts @@ -89,7 +89,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/alarm/current', - auth: '/alarm/detail', + auth: '/alarm/current', }, }, { @@ -115,7 +115,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/alarm/history', - auth: '/alarm/detail', + auth: '/alarm/history', }, }, { @@ -232,7 +232,6 @@ sidebar: false, breadcrumb: true, activeMenu: '/temporary', - // auth: '/temporary/detail/menu', }, }, ], @@ -282,7 +281,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/well', - auth: '/well/detail/menu', + auth: '/well', }, }, ], @@ -321,7 +320,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/station/monitor', - auth: '/station/detail', + auth: '/station/monitor', }, }, { @@ -399,7 +398,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/pipeline', - auth: '/pipeline/detail/menu', + auth: '/pipeline', }, }, ], @@ -531,7 +530,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/device/manage', - auth: '/device/manage/detail/menu', + auth: '/device/manage', }, }, // { @@ -609,7 +608,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/operation/alarm', - auth: '/operation/alarm/detail', + auth: '/operation/alarm', }, }, { @@ -635,7 +634,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/operation/history', - auth: '/operation/alarm/detail', + auth: '/operation/history', }, }, { diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts index c270e8c..240fc2e 100644 --- a/src/utils/sessionData.ts +++ b/src/utils/sessionData.ts @@ -76,10 +76,10 @@ indexDBHandler('all-video-list', JSON.stringify(res.data)) }) } -// 泄露 +// 泄漏 export const fetchCacheLeak= () => { getLeakageList({}).then(res => { - // console.log(res.data, '泄露') + // console.log(res.data, '泄漏') indexDBHandler('all-leakage-list', JSON.stringify(res.data)) }) } diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue index 199a47a..08c9eb4 100644 --- a/src/views/home/alarm/current/components/confirmSituation.vue +++ b/src/views/home/alarm/current/components/confirmSituation.vue @@ -113,6 +113,7 @@ loading.value = true info.value = row alarmCategoryName.value = row.alarmCategory + console.log(row.alarmCategory, 'row.alarmCategory') if (row.alarmCategory.includes('浓度')) { confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0') diff --git a/index.html b/index.html index 0f5e78c..9ecfa5a 100644 --- a/index.html +++ b/index.html @@ -40,9 +40,6 @@ <%- devtoolScript %> diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts index 40042d2..1abdbef 100644 --- a/src/directives/table-scroll/index.ts +++ b/src/directives/table-scroll/index.ts @@ -23,8 +23,8 @@ // table-container const container = document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement // console.log(container, 'container') - container.addEventListener('mouseover', onMouseOver) - container.addEventListener('mouseout', onMouseOut) + container?.addEventListener('mouseover', onMouseOver) + container?.addEventListener('mouseout', onMouseOut) el.timer = window.setInterval(() => { const viewDomClientHeight = viewDom.scrollHeight diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts index 8289351..0f7359d 100644 --- a/src/router/modules/pc.ts +++ b/src/router/modules/pc.ts @@ -89,7 +89,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/alarm/current', - auth: '/alarm/detail', + auth: '/alarm/current', }, }, { @@ -115,7 +115,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/alarm/history', - auth: '/alarm/detail', + auth: '/alarm/history', }, }, { @@ -232,7 +232,6 @@ sidebar: false, breadcrumb: true, activeMenu: '/temporary', - // auth: '/temporary/detail/menu', }, }, ], @@ -282,7 +281,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/well', - auth: '/well/detail/menu', + auth: '/well', }, }, ], @@ -321,7 +320,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/station/monitor', - auth: '/station/detail', + auth: '/station/monitor', }, }, { @@ -399,7 +398,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/pipeline', - auth: '/pipeline/detail/menu', + auth: '/pipeline', }, }, ], @@ -531,7 +530,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/device/manage', - auth: '/device/manage/detail/menu', + auth: '/device/manage', }, }, // { @@ -609,7 +608,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/operation/alarm', - auth: '/operation/alarm/detail', + auth: '/operation/alarm', }, }, { @@ -635,7 +634,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/operation/history', - auth: '/operation/alarm/detail', + auth: '/operation/history', }, }, { diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts index c270e8c..240fc2e 100644 --- a/src/utils/sessionData.ts +++ b/src/utils/sessionData.ts @@ -76,10 +76,10 @@ indexDBHandler('all-video-list', JSON.stringify(res.data)) }) } -// 泄露 +// 泄漏 export const fetchCacheLeak= () => { getLeakageList({}).then(res => { - // console.log(res.data, '泄露') + // console.log(res.data, '泄漏') indexDBHandler('all-leakage-list', JSON.stringify(res.data)) }) } diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue index 199a47a..08c9eb4 100644 --- a/src/views/home/alarm/current/components/confirmSituation.vue +++ b/src/views/home/alarm/current/components/confirmSituation.vue @@ -113,6 +113,7 @@ loading.value = true info.value = row alarmCategoryName.value = row.alarmCategory + console.log(row.alarmCategory, 'row.alarmCategory') if (row.alarmCategory.includes('浓度')) { confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0') diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue index 4572d68..f0cadbc 100644 --- a/src/views/home/alarm/current/components/detail.vue +++ b/src/views/home/alarm/current/components/detail.vue @@ -205,7 +205,7 @@ ElMessage.warning('缺少设备关键信息') return } - if (!proxy.hasPerm('/device/manage/detail/menu')) { + if (!proxy.hasPerm('/device/manage')) { ElMessage.warning('没有对应权限菜单') return } diff --git a/index.html b/index.html index 0f5e78c..9ecfa5a 100644 --- a/index.html +++ b/index.html @@ -40,9 +40,6 @@ <%- devtoolScript %> diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts index 40042d2..1abdbef 100644 --- a/src/directives/table-scroll/index.ts +++ b/src/directives/table-scroll/index.ts @@ -23,8 +23,8 @@ // table-container const container = document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement // console.log(container, 'container') - container.addEventListener('mouseover', onMouseOver) - container.addEventListener('mouseout', onMouseOut) + container?.addEventListener('mouseover', onMouseOver) + container?.addEventListener('mouseout', onMouseOut) el.timer = window.setInterval(() => { const viewDomClientHeight = viewDom.scrollHeight diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts index 8289351..0f7359d 100644 --- a/src/router/modules/pc.ts +++ b/src/router/modules/pc.ts @@ -89,7 +89,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/alarm/current', - auth: '/alarm/detail', + auth: '/alarm/current', }, }, { @@ -115,7 +115,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/alarm/history', - auth: '/alarm/detail', + auth: '/alarm/history', }, }, { @@ -232,7 +232,6 @@ sidebar: false, breadcrumb: true, activeMenu: '/temporary', - // auth: '/temporary/detail/menu', }, }, ], @@ -282,7 +281,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/well', - auth: '/well/detail/menu', + auth: '/well', }, }, ], @@ -321,7 +320,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/station/monitor', - auth: '/station/detail', + auth: '/station/monitor', }, }, { @@ -399,7 +398,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/pipeline', - auth: '/pipeline/detail/menu', + auth: '/pipeline', }, }, ], @@ -531,7 +530,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/device/manage', - auth: '/device/manage/detail/menu', + auth: '/device/manage', }, }, // { @@ -609,7 +608,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/operation/alarm', - auth: '/operation/alarm/detail', + auth: '/operation/alarm', }, }, { @@ -635,7 +634,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/operation/history', - auth: '/operation/alarm/detail', + auth: '/operation/history', }, }, { diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts index c270e8c..240fc2e 100644 --- a/src/utils/sessionData.ts +++ b/src/utils/sessionData.ts @@ -76,10 +76,10 @@ indexDBHandler('all-video-list', JSON.stringify(res.data)) }) } -// 泄露 +// 泄漏 export const fetchCacheLeak= () => { getLeakageList({}).then(res => { - // console.log(res.data, '泄露') + // console.log(res.data, '泄漏') indexDBHandler('all-leakage-list', JSON.stringify(res.data)) }) } diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue index 199a47a..08c9eb4 100644 --- a/src/views/home/alarm/current/components/confirmSituation.vue +++ b/src/views/home/alarm/current/components/confirmSituation.vue @@ -113,6 +113,7 @@ loading.value = true info.value = row alarmCategoryName.value = row.alarmCategory + console.log(row.alarmCategory, 'row.alarmCategory') if (row.alarmCategory.includes('浓度')) { confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0') diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue index 4572d68..f0cadbc 100644 --- a/src/views/home/alarm/current/components/detail.vue +++ b/src/views/home/alarm/current/components/detail.vue @@ -205,7 +205,7 @@ ElMessage.warning('缺少设备关键信息') return } - if (!proxy.hasPerm('/device/manage/detail/menu')) { + if (!proxy.hasPerm('/device/manage')) { ElMessage.warning('没有对应权限菜单') return } diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue index ae1a319..101e4a8 100644 --- a/src/views/home/alarm/current/components/detailInfoDialog.vue +++ b/src/views/home/alarm/current/components/detailInfoDialog.vue @@ -118,7 +118,7 @@ } // 设备详情 const goDevice = () => { - if (!proxy.hasPerm('/device/manage/detail/menu')) { + if (!proxy.hasPerm('/device/manage')) { ElMessage.warning('没有对应权限菜单') return } @@ -275,7 +275,7 @@
{{ info.alarmType }} - >>更多
@@ -317,7 +317,7 @@ {{ info.devcode }} - 查看数据 @@ -384,7 +384,7 @@ {{ info.confirmContent }} - 流程图 @@ -413,7 +413,7 @@ 报警处置 --> - {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }} diff --git a/index.html b/index.html index 0f5e78c..9ecfa5a 100644 --- a/index.html +++ b/index.html @@ -40,9 +40,6 @@ <%- devtoolScript %> diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts index 40042d2..1abdbef 100644 --- a/src/directives/table-scroll/index.ts +++ b/src/directives/table-scroll/index.ts @@ -23,8 +23,8 @@ // table-container const container = document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement // console.log(container, 'container') - container.addEventListener('mouseover', onMouseOver) - container.addEventListener('mouseout', onMouseOut) + container?.addEventListener('mouseover', onMouseOver) + container?.addEventListener('mouseout', onMouseOut) el.timer = window.setInterval(() => { const viewDomClientHeight = viewDom.scrollHeight diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts index 8289351..0f7359d 100644 --- a/src/router/modules/pc.ts +++ b/src/router/modules/pc.ts @@ -89,7 +89,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/alarm/current', - auth: '/alarm/detail', + auth: '/alarm/current', }, }, { @@ -115,7 +115,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/alarm/history', - auth: '/alarm/detail', + auth: '/alarm/history', }, }, { @@ -232,7 +232,6 @@ sidebar: false, breadcrumb: true, activeMenu: '/temporary', - // auth: '/temporary/detail/menu', }, }, ], @@ -282,7 +281,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/well', - auth: '/well/detail/menu', + auth: '/well', }, }, ], @@ -321,7 +320,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/station/monitor', - auth: '/station/detail', + auth: '/station/monitor', }, }, { @@ -399,7 +398,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/pipeline', - auth: '/pipeline/detail/menu', + auth: '/pipeline', }, }, ], @@ -531,7 +530,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/device/manage', - auth: '/device/manage/detail/menu', + auth: '/device/manage', }, }, // { @@ -609,7 +608,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/operation/alarm', - auth: '/operation/alarm/detail', + auth: '/operation/alarm', }, }, { @@ -635,7 +634,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/operation/history', - auth: '/operation/alarm/detail', + auth: '/operation/history', }, }, { diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts index c270e8c..240fc2e 100644 --- a/src/utils/sessionData.ts +++ b/src/utils/sessionData.ts @@ -76,10 +76,10 @@ indexDBHandler('all-video-list', JSON.stringify(res.data)) }) } -// 泄露 +// 泄漏 export const fetchCacheLeak= () => { getLeakageList({}).then(res => { - // console.log(res.data, '泄露') + // console.log(res.data, '泄漏') indexDBHandler('all-leakage-list', JSON.stringify(res.data)) }) } diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue index 199a47a..08c9eb4 100644 --- a/src/views/home/alarm/current/components/confirmSituation.vue +++ b/src/views/home/alarm/current/components/confirmSituation.vue @@ -113,6 +113,7 @@ loading.value = true info.value = row alarmCategoryName.value = row.alarmCategory + console.log(row.alarmCategory, 'row.alarmCategory') if (row.alarmCategory.includes('浓度')) { confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0') diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue index 4572d68..f0cadbc 100644 --- a/src/views/home/alarm/current/components/detail.vue +++ b/src/views/home/alarm/current/components/detail.vue @@ -205,7 +205,7 @@ ElMessage.warning('缺少设备关键信息') return } - if (!proxy.hasPerm('/device/manage/detail/menu')) { + if (!proxy.hasPerm('/device/manage')) { ElMessage.warning('没有对应权限菜单') return } diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue index ae1a319..101e4a8 100644 --- a/src/views/home/alarm/current/components/detailInfoDialog.vue +++ b/src/views/home/alarm/current/components/detailInfoDialog.vue @@ -118,7 +118,7 @@ } // 设备详情 const goDevice = () => { - if (!proxy.hasPerm('/device/manage/detail/menu')) { + if (!proxy.hasPerm('/device/manage')) { ElMessage.warning('没有对应权限菜单') return } @@ -275,7 +275,7 @@
{{ info.alarmType }} - >>更多
@@ -317,7 +317,7 @@ {{ info.devcode }} - 查看数据 @@ -384,7 +384,7 @@ {{ info.confirmContent }} - 流程图 @@ -413,7 +413,7 @@ 报警处置 --> - {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }} diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts index 32c418e..c8ce54f 100644 --- a/src/views/home/alarm/current/components/dict.ts +++ b/src/views/home/alarm/current/components/dict.ts @@ -2,7 +2,7 @@ OffLine: '设备离线', Sloping: '倾斜报警', Destroy: '破坏报警', - Leak: '甲烷泄露报警', + Leak: '甲烷泄漏报警', DiscL: '左侧断线报警', DiscR: '右侧断线报警', VibL: '左侧震动报警', diff --git a/index.html b/index.html index 0f5e78c..9ecfa5a 100644 --- a/index.html +++ b/index.html @@ -40,9 +40,6 @@ <%- devtoolScript %> diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts index 40042d2..1abdbef 100644 --- a/src/directives/table-scroll/index.ts +++ b/src/directives/table-scroll/index.ts @@ -23,8 +23,8 @@ // table-container const container = document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement // console.log(container, 'container') - container.addEventListener('mouseover', onMouseOver) - container.addEventListener('mouseout', onMouseOut) + container?.addEventListener('mouseover', onMouseOver) + container?.addEventListener('mouseout', onMouseOut) el.timer = window.setInterval(() => { const viewDomClientHeight = viewDom.scrollHeight diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts index 8289351..0f7359d 100644 --- a/src/router/modules/pc.ts +++ b/src/router/modules/pc.ts @@ -89,7 +89,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/alarm/current', - auth: '/alarm/detail', + auth: '/alarm/current', }, }, { @@ -115,7 +115,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/alarm/history', - auth: '/alarm/detail', + auth: '/alarm/history', }, }, { @@ -232,7 +232,6 @@ sidebar: false, breadcrumb: true, activeMenu: '/temporary', - // auth: '/temporary/detail/menu', }, }, ], @@ -282,7 +281,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/well', - auth: '/well/detail/menu', + auth: '/well', }, }, ], @@ -321,7 +320,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/station/monitor', - auth: '/station/detail', + auth: '/station/monitor', }, }, { @@ -399,7 +398,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/pipeline', - auth: '/pipeline/detail/menu', + auth: '/pipeline', }, }, ], @@ -531,7 +530,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/device/manage', - auth: '/device/manage/detail/menu', + auth: '/device/manage', }, }, // { @@ -609,7 +608,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/operation/alarm', - auth: '/operation/alarm/detail', + auth: '/operation/alarm', }, }, { @@ -635,7 +634,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/operation/history', - auth: '/operation/alarm/detail', + auth: '/operation/history', }, }, { diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts index c270e8c..240fc2e 100644 --- a/src/utils/sessionData.ts +++ b/src/utils/sessionData.ts @@ -76,10 +76,10 @@ indexDBHandler('all-video-list', JSON.stringify(res.data)) }) } -// 泄露 +// 泄漏 export const fetchCacheLeak= () => { getLeakageList({}).then(res => { - // console.log(res.data, '泄露') + // console.log(res.data, '泄漏') indexDBHandler('all-leakage-list', JSON.stringify(res.data)) }) } diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue index 199a47a..08c9eb4 100644 --- a/src/views/home/alarm/current/components/confirmSituation.vue +++ b/src/views/home/alarm/current/components/confirmSituation.vue @@ -113,6 +113,7 @@ loading.value = true info.value = row alarmCategoryName.value = row.alarmCategory + console.log(row.alarmCategory, 'row.alarmCategory') if (row.alarmCategory.includes('浓度')) { confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0') diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue index 4572d68..f0cadbc 100644 --- a/src/views/home/alarm/current/components/detail.vue +++ b/src/views/home/alarm/current/components/detail.vue @@ -205,7 +205,7 @@ ElMessage.warning('缺少设备关键信息') return } - if (!proxy.hasPerm('/device/manage/detail/menu')) { + if (!proxy.hasPerm('/device/manage')) { ElMessage.warning('没有对应权限菜单') return } diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue index ae1a319..101e4a8 100644 --- a/src/views/home/alarm/current/components/detailInfoDialog.vue +++ b/src/views/home/alarm/current/components/detailInfoDialog.vue @@ -118,7 +118,7 @@ } // 设备详情 const goDevice = () => { - if (!proxy.hasPerm('/device/manage/detail/menu')) { + if (!proxy.hasPerm('/device/manage')) { ElMessage.warning('没有对应权限菜单') return } @@ -275,7 +275,7 @@
{{ info.alarmType }} - >>更多
@@ -317,7 +317,7 @@ {{ info.devcode }} - 查看数据 @@ -384,7 +384,7 @@ {{ info.confirmContent }} - 流程图 @@ -413,7 +413,7 @@ 报警处置 --> - {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }} diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts index 32c418e..c8ce54f 100644 --- a/src/views/home/alarm/current/components/dict.ts +++ b/src/views/home/alarm/current/components/dict.ts @@ -2,7 +2,7 @@ OffLine: '设备离线', Sloping: '倾斜报警', Destroy: '破坏报警', - Leak: '甲烷泄露报警', + Leak: '甲烷泄漏报警', DiscL: '左侧断线报警', DiscR: '右侧断线报警', VibL: '左侧震动报警', diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue index 9b67b54..c022cf5 100644 --- a/src/views/home/alarm/current/components/gasDataDialog.vue +++ b/src/views/home/alarm/current/components/gasDataDialog.vue @@ -54,7 +54,7 @@ setTimeout(() => { const resize = new Event('resize') window.dispatchEvent(resize) - }, 500) + }) } // 列表loading const loadingTable = ref(true) diff --git a/index.html b/index.html index 0f5e78c..9ecfa5a 100644 --- a/index.html +++ b/index.html @@ -40,9 +40,6 @@ <%- devtoolScript %> diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts index 40042d2..1abdbef 100644 --- a/src/directives/table-scroll/index.ts +++ b/src/directives/table-scroll/index.ts @@ -23,8 +23,8 @@ // table-container const container = document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement // console.log(container, 'container') - container.addEventListener('mouseover', onMouseOver) - container.addEventListener('mouseout', onMouseOut) + container?.addEventListener('mouseover', onMouseOver) + container?.addEventListener('mouseout', onMouseOut) el.timer = window.setInterval(() => { const viewDomClientHeight = viewDom.scrollHeight diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts index 8289351..0f7359d 100644 --- a/src/router/modules/pc.ts +++ b/src/router/modules/pc.ts @@ -89,7 +89,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/alarm/current', - auth: '/alarm/detail', + auth: '/alarm/current', }, }, { @@ -115,7 +115,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/alarm/history', - auth: '/alarm/detail', + auth: '/alarm/history', }, }, { @@ -232,7 +232,6 @@ sidebar: false, breadcrumb: true, activeMenu: '/temporary', - // auth: '/temporary/detail/menu', }, }, ], @@ -282,7 +281,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/well', - auth: '/well/detail/menu', + auth: '/well', }, }, ], @@ -321,7 +320,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/station/monitor', - auth: '/station/detail', + auth: '/station/monitor', }, }, { @@ -399,7 +398,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/pipeline', - auth: '/pipeline/detail/menu', + auth: '/pipeline', }, }, ], @@ -531,7 +530,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/device/manage', - auth: '/device/manage/detail/menu', + auth: '/device/manage', }, }, // { @@ -609,7 +608,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/operation/alarm', - auth: '/operation/alarm/detail', + auth: '/operation/alarm', }, }, { @@ -635,7 +634,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/operation/history', - auth: '/operation/alarm/detail', + auth: '/operation/history', }, }, { diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts index c270e8c..240fc2e 100644 --- a/src/utils/sessionData.ts +++ b/src/utils/sessionData.ts @@ -76,10 +76,10 @@ indexDBHandler('all-video-list', JSON.stringify(res.data)) }) } -// 泄露 +// 泄漏 export const fetchCacheLeak= () => { getLeakageList({}).then(res => { - // console.log(res.data, '泄露') + // console.log(res.data, '泄漏') indexDBHandler('all-leakage-list', JSON.stringify(res.data)) }) } diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue index 199a47a..08c9eb4 100644 --- a/src/views/home/alarm/current/components/confirmSituation.vue +++ b/src/views/home/alarm/current/components/confirmSituation.vue @@ -113,6 +113,7 @@ loading.value = true info.value = row alarmCategoryName.value = row.alarmCategory + console.log(row.alarmCategory, 'row.alarmCategory') if (row.alarmCategory.includes('浓度')) { confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0') diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue index 4572d68..f0cadbc 100644 --- a/src/views/home/alarm/current/components/detail.vue +++ b/src/views/home/alarm/current/components/detail.vue @@ -205,7 +205,7 @@ ElMessage.warning('缺少设备关键信息') return } - if (!proxy.hasPerm('/device/manage/detail/menu')) { + if (!proxy.hasPerm('/device/manage')) { ElMessage.warning('没有对应权限菜单') return } diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue index ae1a319..101e4a8 100644 --- a/src/views/home/alarm/current/components/detailInfoDialog.vue +++ b/src/views/home/alarm/current/components/detailInfoDialog.vue @@ -118,7 +118,7 @@ } // 设备详情 const goDevice = () => { - if (!proxy.hasPerm('/device/manage/detail/menu')) { + if (!proxy.hasPerm('/device/manage')) { ElMessage.warning('没有对应权限菜单') return } @@ -275,7 +275,7 @@
{{ info.alarmType }} - >>更多
@@ -317,7 +317,7 @@ {{ info.devcode }} - 查看数据 @@ -384,7 +384,7 @@ {{ info.confirmContent }} - 流程图 @@ -413,7 +413,7 @@ 报警处置 --> - {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }} diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts index 32c418e..c8ce54f 100644 --- a/src/views/home/alarm/current/components/dict.ts +++ b/src/views/home/alarm/current/components/dict.ts @@ -2,7 +2,7 @@ OffLine: '设备离线', Sloping: '倾斜报警', Destroy: '破坏报警', - Leak: '甲烷泄露报警', + Leak: '甲烷泄漏报警', DiscL: '左侧断线报警', DiscR: '右侧断线报警', VibL: '左侧震动报警', diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue index 9b67b54..c022cf5 100644 --- a/src/views/home/alarm/current/components/gasDataDialog.vue +++ b/src/views/home/alarm/current/components/gasDataDialog.vue @@ -54,7 +54,7 @@ setTimeout(() => { const resize = new Event('resize') window.dispatchEvent(resize) - }, 500) + }) } // 列表loading const loadingTable = ref(true) diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue index 156fbfe..2fb9c6c 100644 --- a/src/views/home/alarm/current/components/monitorDataDialog.vue +++ b/src/views/home/alarm/current/components/monitorDataDialog.vue @@ -55,7 +55,7 @@ setTimeout(() => { const resize = new Event('resize') window.dispatchEvent(resize) - }, 500) + }) } const fetchData = () => { loadingTable.value = true diff --git a/index.html b/index.html index 0f5e78c..9ecfa5a 100644 --- a/index.html +++ b/index.html @@ -40,9 +40,6 @@ <%- devtoolScript %> diff --git a/src/directives/table-scroll/index.ts b/src/directives/table-scroll/index.ts index 40042d2..1abdbef 100644 --- a/src/directives/table-scroll/index.ts +++ b/src/directives/table-scroll/index.ts @@ -23,8 +23,8 @@ // table-container const container = document.getElementsByClassName('table-container')[0] as HTMLElement || document.getElementsByClassName('list-container')[0] as HTMLElement // console.log(container, 'container') - container.addEventListener('mouseover', onMouseOver) - container.addEventListener('mouseout', onMouseOut) + container?.addEventListener('mouseover', onMouseOver) + container?.addEventListener('mouseout', onMouseOut) el.timer = window.setInterval(() => { const viewDomClientHeight = viewDom.scrollHeight diff --git a/src/router/modules/pc.ts b/src/router/modules/pc.ts index 8289351..0f7359d 100644 --- a/src/router/modules/pc.ts +++ b/src/router/modules/pc.ts @@ -89,7 +89,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/alarm/current', - auth: '/alarm/detail', + auth: '/alarm/current', }, }, { @@ -115,7 +115,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/alarm/history', - auth: '/alarm/detail', + auth: '/alarm/history', }, }, { @@ -232,7 +232,6 @@ sidebar: false, breadcrumb: true, activeMenu: '/temporary', - // auth: '/temporary/detail/menu', }, }, ], @@ -282,7 +281,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/well', - auth: '/well/detail/menu', + auth: '/well', }, }, ], @@ -321,7 +320,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/station/monitor', - auth: '/station/detail', + auth: '/station/monitor', }, }, { @@ -399,7 +398,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/pipeline', - auth: '/pipeline/detail/menu', + auth: '/pipeline', }, }, ], @@ -531,7 +530,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/device/manage', - auth: '/device/manage/detail/menu', + auth: '/device/manage', }, }, // { @@ -609,7 +608,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/operation/alarm', - auth: '/operation/alarm/detail', + auth: '/operation/alarm', }, }, { @@ -635,7 +634,7 @@ sidebar: false, breadcrumb: true, activeMenu: '/operation/history', - auth: '/operation/alarm/detail', + auth: '/operation/history', }, }, { diff --git a/src/utils/sessionData.ts b/src/utils/sessionData.ts index c270e8c..240fc2e 100644 --- a/src/utils/sessionData.ts +++ b/src/utils/sessionData.ts @@ -76,10 +76,10 @@ indexDBHandler('all-video-list', JSON.stringify(res.data)) }) } -// 泄露 +// 泄漏 export const fetchCacheLeak= () => { getLeakageList({}).then(res => { - // console.log(res.data, '泄露') + // console.log(res.data, '泄漏') indexDBHandler('all-leakage-list', JSON.stringify(res.data)) }) } diff --git a/src/views/home/alarm/current/components/confirmSituation.vue b/src/views/home/alarm/current/components/confirmSituation.vue index 199a47a..08c9eb4 100644 --- a/src/views/home/alarm/current/components/confirmSituation.vue +++ b/src/views/home/alarm/current/components/confirmSituation.vue @@ -113,6 +113,7 @@ loading.value = true info.value = row alarmCategoryName.value = row.alarmCategory + console.log(row.alarmCategory, 'row.alarmCategory') if (row.alarmCategory.includes('浓度')) { confirmSituationList.value = confirmSituationAllList.value.filter((item) => item.value.split('-')[1] === '0') diff --git a/src/views/home/alarm/current/components/detail.vue b/src/views/home/alarm/current/components/detail.vue index 4572d68..f0cadbc 100644 --- a/src/views/home/alarm/current/components/detail.vue +++ b/src/views/home/alarm/current/components/detail.vue @@ -205,7 +205,7 @@ ElMessage.warning('缺少设备关键信息') return } - if (!proxy.hasPerm('/device/manage/detail/menu')) { + if (!proxy.hasPerm('/device/manage')) { ElMessage.warning('没有对应权限菜单') return } diff --git a/src/views/home/alarm/current/components/detailInfoDialog.vue b/src/views/home/alarm/current/components/detailInfoDialog.vue index ae1a319..101e4a8 100644 --- a/src/views/home/alarm/current/components/detailInfoDialog.vue +++ b/src/views/home/alarm/current/components/detailInfoDialog.vue @@ -118,7 +118,7 @@ } // 设备详情 const goDevice = () => { - if (!proxy.hasPerm('/device/manage/detail/menu')) { + if (!proxy.hasPerm('/device/manage')) { ElMessage.warning('没有对应权限菜单') return } @@ -275,7 +275,7 @@
{{ info.alarmType }} - >>更多
@@ -317,7 +317,7 @@ {{ info.devcode }} - 查看数据 @@ -384,7 +384,7 @@ {{ info.confirmContent }} - 流程图 @@ -413,7 +413,7 @@ 报警处置 --> - {{ $route.fullPath.includes('operation') ? '报警处置' : '确认/处置记录' }} diff --git a/src/views/home/alarm/current/components/dict.ts b/src/views/home/alarm/current/components/dict.ts index 32c418e..c8ce54f 100644 --- a/src/views/home/alarm/current/components/dict.ts +++ b/src/views/home/alarm/current/components/dict.ts @@ -2,7 +2,7 @@ OffLine: '设备离线', Sloping: '倾斜报警', Destroy: '破坏报警', - Leak: '甲烷泄露报警', + Leak: '甲烷泄漏报警', DiscL: '左侧断线报警', DiscR: '右侧断线报警', VibL: '左侧震动报警', diff --git a/src/views/home/alarm/current/components/gasDataDialog.vue b/src/views/home/alarm/current/components/gasDataDialog.vue index 9b67b54..c022cf5 100644 --- a/src/views/home/alarm/current/components/gasDataDialog.vue +++ b/src/views/home/alarm/current/components/gasDataDialog.vue @@ -54,7 +54,7 @@ setTimeout(() => { const resize = new Event('resize') window.dispatchEvent(resize) - }, 500) + }) } // 列表loading const loadingTable = ref(true) diff --git a/src/views/home/alarm/current/components/monitorDataDialog.vue b/src/views/home/alarm/current/components/monitorDataDialog.vue index 156fbfe..2fb9c6c 100644 --- a/src/views/home/alarm/current/components/monitorDataDialog.vue +++ b/src/views/home/alarm/current/components/monitorDataDialog.vue @@ -55,7 +55,7 @@ setTimeout(() => { const resize = new Event('resize') window.dispatchEvent(resize) - }, 500) + }) } const fetchData = () => { loadingTable.value = true diff --git a/src/views/home/alarm/current/index.vue b/src/views/home/alarm/current/index.vue index b3767e0..af75307 100644 --- a/src/views/home/alarm/current/index.vue +++ b/src/views/home/alarm/current/index.vue @@ -40,7 +40,7 @@ const columns = ref([ { text: '报警类型', value: 'alarmType', align: 'center', width: '130' }, { text: '报警等级', value: 'alarmLevelName', align: 'center', width: '85' }, - { text: '报警原因', value: 'alarmReason', align: 'center', }, + { text: '报警原因', value: 'alarmReason', align: 'center', width: '150' }, { text: '位置', value: 'position', align: 'center', isCustom: true, }, { text: '设备类型', value: 'devTypeName', align: 'center', width: '145', isRequired: false, }, { text: '设备编号', value: 'devcode', align: 'center', width: '160', isCustom: true, isRequired: false, }, @@ -456,7 +456,8 @@ mapRef.value.mapRef.addMarker({ position: [data.lngGaode, data.latGaode], // content: '
', - content: row.alarmLevelName === '预警' || row.alarmLevelName === '一级' ? '
' : '
', + content: row.alarmLevelName === '报警' || row.alarmLevelName === '一级' ? '
' : + row.alarmLevelName === '预警' || row.alarmLevelName === '二级' ? '
' : '
', label: '', offsetX: -25, offsetY: -25, @@ -788,7 +789,7 @@