diff --git a/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue b/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue index 46235df8..8fbac024 100644 --- a/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue +++ b/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue @@ -155,6 +155,12 @@ 确定 + + 组件管理 + @@ -204,6 +210,10 @@ export default { this.remoteComponentlist = [...innerRemoteComponents, ...getRemoteComponents()] }, methods: { + jumpto(){ + let {href} = this.$router.resolve(`/big-screen-components?edit=1`) + window.open(href,'_blank') + }, chooseComponent(component) { this.focus = _.cloneDeep(component) }, diff --git a/data-room-ui/packages/BigScreenDesign/SourceDialog/index.vue b/data-room-ui/packages/BigScreenDesign/SourceDialog/index.vue index 0df04de1..7062be52 100644 --- a/data-room-ui/packages/BigScreenDesign/SourceDialog/index.vue +++ b/data-room-ui/packages/BigScreenDesign/SourceDialog/index.vue @@ -59,6 +59,12 @@ 确定 + + 组件管理 + @@ -88,6 +94,10 @@ export default { }, mounted() { }, methods: { + jumpto(){ + let {href} = this.$router.resolve(`/big-screen-source?edit=1`) + window.open(href,'_blank') + }, chooseImg(img) { this.focus = _.cloneDeep(img) }, diff --git a/data-room-ui/packages/DataSourceManagement/src/index.vue b/data-room-ui/packages/DataSourceManagement/src/index.vue index be67d654..5d4db73a 100644 --- a/data-room-ui/packages/DataSourceManagement/src/index.vue +++ b/data-room-ui/packages/DataSourceManagement/src/index.vue @@ -280,7 +280,6 @@ export default { // eslint-disable-next-line eqeqeq if (row.editable == 1 && !this.appCode) return dataSourceCheck(row.id).then((res)=>{ - console.log(res) if(res.canDelete){ this.$confirm('确定删除当前数据源吗?', '提示', { confirmButtonText: '确定', diff --git a/data-room-ui/packages/Layout/BigScreenHomeLayout/index.vue b/data-room-ui/packages/Layout/BigScreenHomeLayout/index.vue index 7a922d14..b8ad0853 100644 --- a/data-room-ui/packages/Layout/BigScreenHomeLayout/index.vue +++ b/data-room-ui/packages/Layout/BigScreenHomeLayout/index.vue @@ -39,12 +39,29 @@ export default { }, computed: { title () { + if (this.$route.query.edit) return '智能报表平台' return window?.BS_CONFIG?.starter?.title }, logo () { return window?.BS_CONFIG?.starter?.logo || require('./images/logo.png') }, tabList () { + if (this.$route.query.edit) { + return [ + { + id: 1, + name: '资源库', + path: window?.BS_CONFIG?.routers?.sourceUrl || '/big-screen-source', + icon: 'icon-tupian' + }, + { + id: 2, + name: '组件库', + path: window?.BS_CONFIG?.routers?.componentUrl || '/big-screen-components', + icon: 'icon-zujian1' + } + ] + } return [ { id: 0, @@ -90,9 +107,16 @@ export default { created () {}, methods: { changeTab (tab) { + if (this.$route.query.edit) { + this.$router.push({ + path: tab.path, + query: { edit: 1 } + }) + }else{ this.$router.push({ path: tab.path }) + } } } } diff --git a/data-room-ui/packages/js/utils/datasetConfigService.js b/data-room-ui/packages/js/utils/datasetConfigService.js index e42645b9..3b840b3b 100644 --- a/data-room-ui/packages/js/utils/datasetConfigService.js +++ b/data-room-ui/packages/js/utils/datasetConfigService.js @@ -17,7 +17,7 @@ const datasetPage = (params = {}, flag = false) => Vue.prototype.$dataRoomAxios. * @param flag * @returns {*} */ -const dataSourceCheck = (id='-1', flag = false) => Vue.prototype.$dataRoomAxios.post(`/datasource/deleteCheck/${id}`, {}, flag) +const datasetCheck = (id='-1', flag = false) => Vue.prototype.$dataRoomAxios.post(`/dataset/deleteCheck/${id}`, {}, flag) /** @@ -123,5 +123,5 @@ export { categoryAdd, categoryUpdate, categoryRemove, - dataSourceCheck + datasetCheck }