diff --git a/src/App.vue b/src/App.vue index 761d55e..88135c2 100644 --- a/src/App.vue +++ b/src/App.vue @@ -46,7 +46,7 @@ const openAiAssistantMenu = () => { height: 24px; } -/deep/.el-message { +.el-message { z-index:8006 !important; } diff --git a/src/permission.ts b/src/permission.ts index efb91bb..bd0392a 100644 --- a/src/permission.ts +++ b/src/permission.ts @@ -15,6 +15,8 @@ const whiteList = ['/print', '/externalPrint', '/boardGenerate', '/boardView', ' router.beforeEach(async (to, from, next) => { NProgress.start(); if (getToken()) { + console.log(to); + console.log(next); to.meta.title && useSettingsStore().setTitle(to.meta.title); /* has token*/ if (to.path === '/login') { diff --git a/src/views/boardGenerate/components/scrollText.vue b/src/views/boardGenerate/components/scrollText.vue new file mode 100644 index 0000000..3392ac4 --- /dev/null +++ b/src/views/boardGenerate/components/scrollText.vue @@ -0,0 +1,45 @@ + + + diff --git a/src/views/boardGenerate/dataSourceList.vue b/src/views/boardGenerate/dataSourceList.vue index b962a1b..ac31038 100644 --- a/src/views/boardGenerate/dataSourceList.vue +++ b/src/views/boardGenerate/dataSourceList.vue @@ -430,7 +430,6 @@ const delData = () => { constructionDataFormVisible.value = true; }; const editDataSource = (e) => { - console.log(e); if (e.responseType === '1' || !e.responseType) { constructionDataFormVisible.value = true; constructionDataForm.value = e; @@ -573,7 +572,12 @@ const findTier = () => { const sqlFindTier = () => { addSQLForm.value.designDataFieldList = []; if (addSQLForm.value.isPage) { - querySql1({ sql: addSQLForm.value.SQL, linkId: addSQLForm.value.db, pageSize: 10, pageNum: 1 }).then((res) => { + querySql1({ + sql: addSQLForm.value.SQL.replace(/\n/g, ' '), + linkId: addSQLForm.value.db, + pageSize: 10, + pageNum: 1 + }).then((res) => { let data = res.data || {}; Object.keys(data.rows?.[0]).forEach(key => { addSQLForm.value.designDataFieldList.push({ diff --git a/src/views/boardGenerate/index.vue b/src/views/boardGenerate/index.vue index ce227b0..82e3968 100644 --- a/src/views/boardGenerate/index.vue +++ b/src/views/boardGenerate/index.vue @@ -1278,6 +1278,7 @@ const pitchOnNode = (e) => { nodeDataForm.value = e; customDataForm.value = e.data.customData; }; +let a = { "x1": ["2025-09-22", "2025-09-23", "2025-09-24"], "y1": ["40", "59", "50"], "y2": ["3", "6", "1"] };