diff --git a/src/assets/js/api/configManage.js b/src/assets/js/api/configManage.js index e1d0b135..26c43efd 100644 --- a/src/assets/js/api/configManage.js +++ b/src/assets/js/api/configManage.js @@ -52,4 +52,6 @@ export const editNoticeRemindSoundApi = data => post('xmgl/noticeRemindSound/edi // 编辑通知提示音信息 export const deleteNoticeRemindSoundApi = data => post('xmgl/noticeRemindSound/delete', data); //列表查询通知提示音信息 -export const selectNoticeRemindSoundApi = data => post('xmgl/noticeRemindSound/list', data); \ No newline at end of file +export const selectNoticeRemindSoundApi = data => post('xmgl/noticeRemindSound/list', data); + + diff --git a/src/components/closePage.vue b/src/components/closePage.vue index 6b206e7e..cf00504e 100644 --- a/src/components/closePage.vue +++ b/src/components/closePage.vue @@ -18,13 +18,18 @@ export default { }, methods:{ closePage(){ - console.log(this.$route.path) - if(this.$route.path.indexOf('/project/dataBoard') != -1 || this.$route.path.indexOf('/project/videoOverview') != -1 || this.$route.path.indexOf('/project/environmentalOverview') != -1 || this.$route.path.indexOf('/project/projectSummary') != -1 || this.$route.path.indexOf('/project/imgRanging') != -1 || this.$route.path.indexOf('/project/warningManage') != -1){ - // console.log(window.location.href.split('#/')[0]+'#/projectIndex') - window.location.href = window.location.href.split('#/')[0] + '#/projectIndex' - } else{ - window.history.back() - } + // console.log(this.$route.path) + // getDockingUrlApi().then((res)=>{ + // console.log('路径',res) + // }) + + // if(this.$route.path.indexOf('/project/dataBoard') != -1 || this.$route.path.indexOf('/project/videoOverview') != -1 || this.$route.path.indexOf('/project/environmentalOverview') != -1 || this.$route.path.indexOf('/project/projectSummary') != -1 || this.$route.path.indexOf('/project/imgRanging') != -1 || this.$route.path.indexOf('/project/warningManage') != -1){ + // // console.log(window.location.href.split('#/')[0]+'#/projectIndex') + // // window.location.href = window.location.href.split('#/')[0] + '#/projectIndex' //注释 + // } else{ + // window.history.back() + // } + } }, mounted() { diff --git a/src/views/projectAdmin/projectIndex.vue b/src/views/projectAdmin/projectIndex.vue index 03781bc7..97ef40e5 100644 --- a/src/views/projectAdmin/projectIndex.vue +++ b/src/views/projectAdmin/projectIndex.vue @@ -104,6 +104,7 @@ diff --git a/src/views/projectFront/imgRanging/overview.vue b/src/views/projectFront/imgRanging/overview.vue index 86d25f65..7b986459 100644 --- a/src/views/projectFront/imgRanging/overview.vue +++ b/src/views/projectFront/imgRanging/overview.vue @@ -2,15 +2,15 @@
-
- +
+
- +
-
+