diff --git a/doc/docs/.vuepress/config.js b/doc/docs/.vuepress/config.js
index 42bc294f..d8e946e5 100644
--- a/doc/docs/.vuepress/config.js
+++ b/doc/docs/.vuepress/config.js
@@ -50,7 +50,9 @@ module.exports = {
children: [
{title: '数据源', path: '/guide/datasource'},
{title: '数据集', path: '/guide/dataset'},
- {title: '大屏设计', path: '/guide/dashboard'},
+ {title: '报表管理', path: '/guide/reportmanager'},
+ {title: '大屏报表', path: '/guide/dashboard'},
+ {title: '表格报表', path: '/guide/execl'},
{title: '导入导出', path: '/guide/importexport'},
]
},
@@ -65,6 +67,7 @@ module.exports = {
title: '社区提供',
collapsable: false,
children: [
+ {title: '说明', path: '/guide/community/report'},
{title: '搭建AJ-Report开发环境', path: '/guide/community/AC1688/搭建aj-report开发环境'}
]
}
diff --git a/doc/docs/guide/authmanager.md b/doc/docs/guide/authmanager.md
index 666bdc33..46ff4720 100644
--- a/doc/docs/guide/authmanager.md
+++ b/doc/docs/guide/authmanager.md
@@ -19,4 +19,11 @@
为角色分配权限，可看已有角色示例 <br>
 <br>
+## 导入导出权限
+**注**：现在guest用户的权限是底层写死只有访问权限，无实质操作权限。<br>
+导入导出的权限是在 角色 --> 分配权限中控制。 <br>
+ <br>
+用户绑定了角色，角色则绑定了权限，是这样一层关系。 <br>
+
+
diff --git a/doc/docs/guide/community/report.md b/doc/docs/guide/community/report.md
new file mode 100644
index 00000000..9c9b9d6c
--- /dev/null
+++ b/doc/docs/guide/community/report.md
@@ -0,0 +1,14 @@
+# 社区用户提交文档PR的简易说明
+
+## 提交位置
+doc -- > docs --> guide -- > community 目录 <br>
+ <br>
+
+## 具体操作
+- 请在community目录下新建属于你自己的文件目录，命名方式可以使用自己在gitee的名字作为命名，注意中文命令可能会存在的一些问题。<br>
+- 在你的个人目录下，你可以新建MD文件，需要用到图片可以直接放一个目录，如果md多，图片也多，建议再建下级目录存放。<br>
+
+最后别忘了在config.js中添加配置，如图示。<br>
+ <br>
+
+
diff --git a/doc/docs/guide/community/report/img.png b/doc/docs/guide/community/report/img.png
new file mode 100644
index 00000000..4b79b38f
Binary files /dev/null and b/doc/docs/guide/community/report/img.png differ
diff --git a/doc/docs/guide/community/report/img_1.png b/doc/docs/guide/community/report/img_1.png
new file mode 100644
index 00000000..0452f0da
Binary files /dev/null and b/doc/docs/guide/community/report/img_1.png differ
diff --git a/doc/docs/guide/dashboard.md b/doc/docs/guide/dashboard.md
index 9a4a6c72..1b8ed3a4 100644
--- a/doc/docs/guide/dashboard.md
+++ b/doc/docs/guide/dashboard.md
@@ -1,16 +1,21 @@
-## 介绍
-## 新增大屏
-
+## 设计大屏
+进入大屏设计方法1： <br>
+从报表管理模块选择需要设计的大屏，按图示进入大屏设计界面 <br>
+ <br>
+
+进入大屏设计方法2： <br>
+从大屏报表模块选择需要设计的大屏，按图示进入大屏设计界面 <br>
+ <br>
## 大屏简介
-
+ <br>
## 工具栏
### 文本框
-
-
-
-
+ <br>
+ <br>
+ <br>
+ <br>
### 滚动文本
已支持动态数据，请参考文本框的操作 <br>
diff --git a/doc/docs/guide/execl.md b/doc/docs/guide/execl.md
new file mode 100644
index 00000000..b3eeb720
--- /dev/null
+++ b/doc/docs/guide/execl.md
@@ -0,0 +1,27 @@
+# 介绍
+execl报表基于Luckysheet开发，[Luckysheet](https://gitee.com/mengshukeji/Luckysheet) 一款纯前端类似excel的在线表格，功能强大、配置简单、完全开源。
+**注意：** execl报表目前只是简单集成，如果你遇到了一些问题请在此[Issue](https://gitee.com/anji-plus/report/issues/I4CEWV) 下面进行回复。<br>
+## 表格报表设计
+进入表格设计方法1： <br>
+从报表管理模块选择需要设计的大屏，按图示进入大屏设计界面 <br>
+ <br>
+
+进入大屏设计方法2： <br>
+从大屏报表模块选择需要设计的大屏，按图示进入大屏设计界面 <br>
+ <br>
+
+## 简介
+ <br>
+
+## 使用
+**注**：不建议一列中同时存在俩个字段数据，同时一列值也建议不要存到超大数据量，肯定无法显示的<br>
+ <br>
+
+## 预览/保存
+点击保存，则会将数据写入到库中。<br>
+点击预览，则进入预览界面。<br>
+ <br>
+
+## 预览界面
+可以进行导出操作。<br>
+ <br>
diff --git a/doc/docs/guide/importexport.md b/doc/docs/guide/importexport.md
index 787dd62a..7d7c8315 100644
--- a/doc/docs/guide/importexport.md
+++ b/doc/docs/guide/importexport.md
@@ -15,3 +15,7 @@
 <br>
选择一个导出的zip文件导入即可。注意，导入会覆盖当前大屏，请新建一张空白的大屏进行导入。<br>
**注：如果你导入的大屏中含有你当前系统不存在的图表，整个大屏是不会显示的。** <br>
+
+
+## 导入导出权限
+请查看权限控制模块中关于导入导出权限的说明。 <br>
\ No newline at end of file
diff --git a/doc/docs/guide/reportmanager.md b/doc/docs/guide/reportmanager.md
new file mode 100644
index 00000000..b0be4011
--- /dev/null
+++ b/doc/docs/guide/reportmanager.md
@@ -0,0 +1,3 @@
+## 新增报表
+ <br>
+状态默认为已启用。
diff --git a/doc/docs/picture/authmanager/img_7.png b/doc/docs/picture/authmanager/img_7.png
new file mode 100644
index 00000000..174988ea
Binary files /dev/null and b/doc/docs/picture/authmanager/img_7.png differ
diff --git a/doc/docs/picture/dashboard/img.png b/doc/docs/picture/dashboard/img.png
deleted file mode 100644
index 67a0a19a..00000000
Binary files a/doc/docs/picture/dashboard/img.png and /dev/null differ
diff --git a/doc/docs/picture/dashboard/img22.png b/doc/docs/picture/dashboard/img22.png
new file mode 100644
index 00000000..a9b7723f
Binary files /dev/null and b/doc/docs/picture/dashboard/img22.png differ
diff --git a/doc/docs/picture/dashboard/img23.png b/doc/docs/picture/dashboard/img23.png
new file mode 100644
index 00000000..83bcb8ce
Binary files /dev/null and b/doc/docs/picture/dashboard/img23.png differ
diff --git a/doc/docs/picture/execl/img.png b/doc/docs/picture/execl/img.png
new file mode 100644
index 00000000..bbfa70cf
Binary files /dev/null and b/doc/docs/picture/execl/img.png differ
diff --git a/doc/docs/picture/execl/img_1.png b/doc/docs/picture/execl/img_1.png
new file mode 100644
index 00000000..5c969c97
Binary files /dev/null and b/doc/docs/picture/execl/img_1.png differ
diff --git a/doc/docs/picture/execl/img_2.png b/doc/docs/picture/execl/img_2.png
new file mode 100644
index 00000000..45efaadb
Binary files /dev/null and b/doc/docs/picture/execl/img_2.png differ
diff --git a/doc/docs/picture/execl/img_3.png b/doc/docs/picture/execl/img_3.png
new file mode 100644
index 00000000..0cc2fcae
Binary files /dev/null and b/doc/docs/picture/execl/img_3.png differ
diff --git a/doc/docs/picture/execl/img_4.png b/doc/docs/picture/execl/img_4.png
new file mode 100644
index 00000000..eafd032e
Binary files /dev/null and b/doc/docs/picture/execl/img_4.png differ
diff --git a/doc/docs/picture/execl/img_5.png b/doc/docs/picture/execl/img_5.png
new file mode 100644
index 00000000..c2112950
Binary files /dev/null and b/doc/docs/picture/execl/img_5.png differ
diff --git a/doc/docs/picture/reportmanager/img.png b/doc/docs/picture/reportmanager/img.png
new file mode 100644
index 00000000..8ce4974b
Binary files /dev/null and b/doc/docs/picture/reportmanager/img.png differ
diff --git a/report-ui/src/views/report/bigscreen/designer/index.vue b/report-ui/src/views/report/bigscreen/designer/index.vue
index 049f7060..55bbca5c 100644
--- a/report-ui/src/views/report/bigscreen/designer/index.vue
+++ b/report-ui/src/views/report/bigscreen/designer/index.vue
@@ -1157,13 +1157,13 @@ li {
clear: both;
}
-.nav li {
+.nav > li {
width: 55px;
- text-align: center;
+ text-align: left;
position: relative;
}
-.nav li a {
+.nav > li a {
float: left;
padding: 12px 30px;
color: #999;
@@ -1171,16 +1171,15 @@ li {
text-decoration: none;
}
-.nav li:hover {
+.nav > li:hover {
color: #788994;
}
-.nav li ul {
+.nav > li ul {
visibility: hidden;
position: absolute;
z-index: 1000;
list-style: none;
- top: 38px;
left: 0;
padding: 0;
background-color: rgb(36, 42, 48);
@@ -1190,7 +1189,7 @@ li {
transition: all 0.2s ease-in-out;
}
-.nav li:hover > ul {
+.nav > li:hover > ul {
opacity: 1;
visibility: visible;
margin: 0;
@@ -1245,6 +1244,10 @@ li {
float: left;
}
+.nav .item {
+ padding: 5px;
+}
+
/deep/ .vue-ruler-h {
opacity: 0.3;
}