diff --git a/doc/docs/.vuepress/config.js b/doc/docs/.vuepress/config.js index 9c415e69..489b5e55 100644 --- a/doc/docs/.vuepress/config.js +++ b/doc/docs/.vuepress/config.js @@ -12,7 +12,6 @@ module.exports = { nav: [ {text: '首页', link: '/'}, {text: '指南', link: '/guide/'}, - {text: '操作手册', link: '/operation/'}, {text: 'GitHub', link: 'https://github.com/anji-plus/report'}, {text: 'Gitee', link: 'https://gitee.com/anji-plus/report'}, ], @@ -24,29 +23,24 @@ module.exports = { children: [ {title: '介绍', path: '/guide/'}, {title: '快速入门', path: '/guide/quickly'}, - // {title: '系统运行', path: '/guide/deploy'} ] }, { - title: '其他', + title: '操作手册', collapsable: false, children: [ - {title: '常见问题', path: '/guide/question'} + {title: '数据源', path: '/guide/datasource'}, + {title: '数据集', path: '/guide/dataset'}, + {title: '大屏设计', path: '/guide/dashboard'}, ] - }], - '/operation/': [ + }, { - title: '操作手册', + title: '其他', collapsable: false, children: [ - {title: '数据源', path: '/operation/datasource'}, - {title: '数据集', path: '/operation/dataset'}, - {title: '大屏设计', path: '/operation/dashboard'}, - {title: '国际化', path: '/operation/i18n'}, - {title: '字典', path: '/operation/dict'}, + {title: '常见问题', path: '/guide/question'} ] - } - ] + }], } }, plugins: [ diff --git a/doc/docs/operation/dashboard.md b/doc/docs/guide/dashboard.md similarity index 100% rename from doc/docs/operation/dashboard.md rename to doc/docs/guide/dashboard.md diff --git a/doc/docs/operation/dataset.md b/doc/docs/guide/dataset.md similarity index 100% rename from doc/docs/operation/dataset.md rename to doc/docs/guide/dataset.md diff --git a/doc/docs/operation/datasource.md b/doc/docs/guide/datasource.md similarity index 50% rename from doc/docs/operation/datasource.md rename to doc/docs/guide/datasource.md index 3625ab12..a1649c65 100644 --- a/doc/docs/operation/datasource.md +++ b/doc/docs/guide/datasource.md @@ -1,3 +1,4 @@ -# 数据源 +## 数据源 ## 标题一 + diff --git a/doc/docs/guide/question.md b/doc/docs/guide/question.md index 70d67042..3850359e 100644 --- a/doc/docs/guide/question.md +++ b/doc/docs/guide/question.md @@ -1,4 +1,9 @@ -# 常见问题 +## 常见问题 +- 没有找到新增数据源类型？
+ 字典管理目前暂未有页面维护，可自行去数据库中增加你需要的数据源类型。
+ 表gaea_dict，字段dict_type：SOURCE_TYPE
+ 表gaea_dict_item, item_extend字段是下拉选择后动态表单渲染的json数据
+ ## 其他 diff --git a/doc/docs/operation/README.md b/doc/docs/operation/README.md deleted file mode 100644 index 1520bf70..00000000 --- a/doc/docs/operation/README.md +++ /dev/null @@ -1,25 +0,0 @@ -# 介绍 ---- - -**大屏设计** - -大屏设计（Report）是一个JavaEE微服务架构平台，采用经典组合（SpringBoot，SpringCloud，Vue，ElementUI）。目前提供两种架构，单体架构和微服务架构。 -内置的基础功能包括数据源，数据集，报表管理 - -**功能架构** -- 前端 - - -- 后端 - - -**在线体验** -- 访问地址 - -- 默认账号密码 - - -**联系我们** - - - diff --git a/doc/docs/operation/dict.md b/doc/docs/operation/dict.md deleted file mode 100644 index f50cb745..00000000 --- a/doc/docs/operation/dict.md +++ /dev/null @@ -1,32 +0,0 @@ -# 快速了解 ---- -## 项目简介 -- 项目源代码地址: -- 在线提问: -- 在线文档: - -大屏设计（Report）是一个可视化拖拽编辑的，直观，酷炫，具有科技感的图表工具项目。 -内置的基础功能包括数据源，数据集，国际化，字典管理，报表管理 - - -## 技术选型 - -**1.环境** -- JavaEE 8 -- Apache Maven 3 - -**2.主框架** -- Spring Boot 2.3.x - -**3.持久层** -- Apache MyBatis 3.5.x - -**4.视图层** -- Vue 2.6.10+ -- ElementUI 2.13.0+ - - -## 系统特性 -1. 最新最稳定的技术栈； -2. 支持多数据源配置 -3. 丰富的大屏组件。拖拽配置实现动态大屏 diff --git a/doc/docs/operation/i18n.md b/doc/docs/operation/i18n.md deleted file mode 100644 index f50cb745..00000000 --- a/doc/docs/operation/i18n.md +++ /dev/null @@ -1,32 +0,0 @@ -# 快速了解 ---- -## 项目简介 -- 项目源代码地址: -- 在线提问: -- 在线文档: - -大屏设计（Report）是一个可视化拖拽编辑的，直观，酷炫，具有科技感的图表工具项目。 -内置的基础功能包括数据源，数据集，国际化，字典管理，报表管理 - - -## 技术选型 - -**1.环境** -- JavaEE 8 -- Apache Maven 3 - -**2.主框架** -- Spring Boot 2.3.x - -**3.持久层** -- Apache MyBatis 3.5.x - -**4.视图层** -- Vue 2.6.10+ -- ElementUI 2.13.0+ - - -## 系统特性 -1. 最新最稳定的技术栈； -2. 支持多数据源配置 -3. 丰富的大屏组件。拖拽配置实现动态大屏 diff --git a/doc/docs/operation/img.png b/doc/docs/operation/img.png new file mode 100644 index 00000000..91254562 Binary files /dev/null and b/doc/docs/operation/img.png differ diff --git a/doc/docs/operation/pie.md b/doc/docs/operation/pie.md new file mode 100644 index 00000000..92cff184 --- /dev/null +++ b/doc/docs/operation/pie.md @@ -0,0 +1,7 @@ +# 快速了解 +饼图配置 +## 1、添加饼图 +![img.png](img.png) +## 2、饼图设置 + +## 3、数据格式 diff --git a/doc/docs/picture/img.png b/doc/docs/picture/img.png new file mode 100644 index 00000000..f0ded706 Binary files /dev/null and b/doc/docs/picture/img.png differ diff --git a/doc/docs/picture/img_1.png b/doc/docs/picture/img_1.png new file mode 100644 index 00000000..6fd598f4 Binary files /dev/null and b/doc/docs/picture/img_1.png differ diff --git a/pom.xml b/pom.xml index 328e46eb..7264cbde 100644 --- a/pom.xml +++ b/pom.xml @@ -23,9 +23,9 @@ 6.0.0-SNAPSHOT 1.0.0-SNAPSHOT - 1.0.0-SNAPSHOT + 1.0.0.RELEASE 1.0.0-SNAPSHOT - 1.0.0-SNAPSHOT + 1.0.0.RELEASE true diff --git a/report-ui/src/api/report.js b/report-ui/src/api/report.js index e78747df..a1d6d5d0 100644 --- a/report-ui/src/api/report.js +++ b/report-ui/src/api/report.js @@ -167,7 +167,7 @@ export function editReportExcel (data) { // /dataSet/pageList export function dataSetPageList (data) { return request({ - url: '/dataSet/pageList', + url: '/dataSet/pageList?page=' + data.page + '&size=' + data.size + '&sort=' + data.sort + '&order=' + data.order + '&pageNumber=' + data.pageNumber + '&pageSize=' + data.pageSize, method: 'GET', data, }) diff --git a/report-ui/src/views/report/bigscreen/designer/index.vue b/report-ui/src/views/report/bigscreen/designer/index.vue index 98ad0f90..9819bd34 100644 --- a/report-ui/src/views/report/bigscreen/designer/index.vue +++ b/report-ui/src/views/report/bigscreen/designer/index.vue @@ -59,21 +59,15 @@
  • 边框
  • 装饰
    • @@ -848,73 +842,93 @@ li { padding: 0; } .nav { + width: 40px; + padding: 0; + list-style: none; + /* overflow: hidden; */ } -.nav > li { - display: inline-block; - position: relative; +.nav { + zoom: 1; } -.nav > li > a { - text-decoration: none; +.nav:before, +.nav:after { + content: ""; + display: table; } -.nav > li:hover > a { - color: rgb(0, 136, 214); +.nav:after { + clear: both; } -.nav a { - color: #cde8ff; - display: block; +.nav li { + width: 40px; + text-align: center; + position: relative; +} +.nav li a { + float: left; + padding: 12px 30px; + color: #999; + font: bold 12px; text-decoration: none; } - -.nav ul { - display: none; - background: #00113a; +.nav li:hover { + color: #6dc5ff; +} +.nav li ul { + visibility: hidden; position: absolute; - z-index: 10000; + z-index: 1000; + list-style: none; + top: 38px; + left: 0; + padding: 0; + background-color: #263445; + opacity: 0; + _margin: 0; width: 120px; - margin-left: -20px; + transition: all 0.2s ease-in-out; +} +.nav li:hover > ul { + opacity: 1; + visibility: visible; + margin: 0; } .nav ul li { - position: relative; + float: left; + display: block; + border: 0; + width: 100%; font-size: 12px; } -.nav > li:hover > ul { +.nav ul a { + padding: 10px; + width: 100%; display: block; + float: none; + height: 120px; + border: 1px solid #30445c; + transition: all 0.2s ease-in-out; } -.nav > li > .three-level > li > a { - width: 10em; - padding-left: 1em; - padding-right: 1em; - background-color: #0f2030; +.nav ul a:hover { + border: 1px solid #3c5e88; } -// .nav li .three-level li { -// display: none; -// } -.nav > li > ul > li:hover > a { - display: block; - background-color: #182e42; - color: #fff; -} -.nav > li > ul > li > ul { - left: 100%; - top: 0; +.nav ul li:first-child > a:hover:before { + border-bottom-color: #04acec; } -.nav > li:last-child > ul > li > ul { - left: -100%; +.nav ul ul { top: 0; + left: 120px; + width: 400px; + height: 300px; + overflow: auto; + padding: 10px; + box-shadow: -1px 0 0 #30445c; + _margin: 0; } -.nav > li > ul > li:hover > ul { +.nav ul ul li { + width: 120px; + height: 120px; + margin-right: 3px; display: block; -} -.nav > li > ul > li > ul > li > a { - padding-top: 0.4em; - padding-bottom: 0.4em; - width: 10em; - padding-left: 1em; - padding-right: 1em; - background-color: rgb(50, 50, 50); -} -.nav > li > ul > li > ul > li:hover > a { - background-color: rgb(255, 255, 0); - color: rgb(0, 0, 0); + float: left; } diff --git a/report-ui/src/views/report/datasource/index.vue b/report-ui/src/views/report/datasource/index.vue index 7ccfd658..e23bfbf7 100644 --- a/report-ui/src/views/report/datasource/index.vue +++ b/report-ui/src/views/report/datasource/index.vue @@ -106,11 +106,12 @@ @@ -376,9 +377,29 @@ export default { }) }, async delData (val) { - const { code } = await deleteDataSource(val) - if (code != '200') return - this.queryByPage() + this.$confirm('确定删除?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + }) + .then(async () => { + this.$emit('deletelayer') + this.visible = false + const { code, data } = await deleteDataSource(val) + if (code != '200') return + this.queryByPage() + this.$message({ + type: 'success', + message: '删除成功!', + }) + }) + .catch(() => { + this.$message({ + type: 'info', + message: '已取消删除', + }) + }) + }, // 提交 async UserConfirm (formName) { diff --git a/report-ui/src/views/report/resultset/index.vue b/report-ui/src/views/report/resultset/index.vue index 40bd883b..d581a6f6 100644 --- a/report-ui/src/views/report/resultset/index.vue +++ b/report-ui/src/views/report/resultset/index.vue @@ -14,12 +14,12 @@ :md="6" :lg="6" :xl="6"> - - @@ -28,12 +28,12 @@ :md="6" :lg="6" :xl="6"> - - @@ -97,16 +97,25 @@ 编辑 - - 删除 - + + 删除 + - +
    + +
    + label-width="130px"> - - + @@ -155,9 +164,9 @@ :md="8" :lg="8" :xl="8"> - - + @@ -178,8 +187,7 @@ :lg="22" :xl="22" class="code-mirror-form"> - +
    { + this.$emit('deletelayer') + this.visible = false + const { code, data } = await deleteDataSet(row) + if (code != '200') return + this.queryByPage() + this.$message({ + type: 'success', + message: '删除成功!', + }) + }) + .catch(() => { + this.$message({ + type: 'info', + message: '已取消删除', + }) + }) }, // 编辑数据集,获取单条数据详情 addOrEditDataSet (row) { @@ -886,9 +921,11 @@ export default { if (this.dialogFormVisibleTitle === '新增数据集') { const { code } = await addDataSet(this.formData) if (code != '200') return + this.queryByPage() } else { const { code } = await editDataSet(this.formData) if (code != '200') return + this.queryByPage() } this.dialogFormVisible = false } else {