ehs_tanghHe
/
tanghe-report
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into dev

Browse Source 
# Conflicts:
#	README.md
Raod 3 years ago
parent a57f3dec06 dac4210e69
commit 36027d793f
8 changed files with 72 additions and 47 deletions
Show Stats Download Patch File Download Diff File

18
README.en.md
Unescape Escape View File

@ -1,14 +1,20 @@
## Online experience ## Online experience
####   Computer online experience: [https://report.anji-plus.com/](https://report.anji-plus.com/ "链接")  account：guest password：guest
#### &emsp; Online documents: [https://report.anji-plus.com/report-doc/](https://report.anji-plus.com/report-doc/ "doc")<br> #### &emsp; Computer online experience: [https://ajreport.beliefteam.cn/](https://ajreport.beliefteam.cn/ "链接") &emsp;account：guest password：guest
#### &emsp; Online documents: [https://ajreport.beliefteam.cn/report-doc/](https://ajreport.beliefteam.cn/report-doc/ "doc")<br>
#### &emsp; issues: [https://gitee.com/anji-plus/report/issues](https://gitee.com/anji-plus/report/issues "issue") #### &emsp; issues: [https://gitee.com/anji-plus/report/issues](https://gitee.com/anji-plus/report/issues "issue")
## Function overview ## Function overview
#### &emsp; Component introduction #### &emsp; Component introduction
&emsp;&emsp; （AJ-Report）is a visual drag edit, intuitive, cool, with a sense of science and technology chart tool full open source project.
The built-in basic functions include data source, data set, report management, and some screenshots of the project are shown below.。<br> &emsp;&emsp; （AJ-Report）is a visual drag edit, intuitive, cool, with a sense of science and technology chart tool full
open source project.
The built-in basic functions include data source, data set, report management, and some screenshots of the project are
shown below.。<br>
## Packaging directory ## Packaging directory
@ -26,6 +32,7 @@ The built-in basic functions include data source, data set, report management, a
``` ```
## System directory ## System directory
``` ```
├── doc ├── doc
│ ├── docs │ ├── docs
@ -40,11 +47,12 @@ The built-in basic functions include data source, data set, report management, a
├── README.md ├── README.md
``` ```
## Short term plan ## Short term plan
#### &emsp; Enrich more chart components #### &emsp; Enrich more chart components
## technical support ## technical support
If you have any questions, please submit to [Issue](https://gitee.com/anji-plus/report/issues) If you have any questions, please submit to [Issue](https://gitee.com/anji-plus/report/issues)
#### Open source is not easy, please, star ☺ #### Open source is not easy, please, star ☺

59
README.md
Unescape Escape View File

@ -6,9 +6,9 @@
## 在线体验 ## 在线体验
#### &emsp; [在线体验](https://report.anji-plus.com/index.html "链接"): https://report.anji-plus.com/index.html &emsp;体验账号：guest 密码：guest #### &emsp; [在线体验](https://ajreport.beliefteam.cn/index.html "链接"): https://ajreport.beliefteam.cn/index.html &emsp;体验账号：guest 密码：guest
#### &emsp; [在线文档](https://report.anji-plus.com/report-doc/ "doc"): https://report.anji-plus.com/report-doc/ <br> #### &emsp; [在线文档](https://ajreport.beliefteam.cn/report-doc/ "doc"): https://ajreport.beliefteam.cn/report-doc/ <br>
#### &emsp; [在线提问](https://gitee.com/anji-plus/report/issues "issue"): https://gitee.com/anji-plus/report/issues <br> #### &emsp; [在线提问](https://gitee.com/anji-plus/report/issues "issue"): https://gitee.com/anji-plus/report/issues <br>
@ -23,10 +23,8 @@
&emsp;&emsp; 大屏设计（AJ-Report）是一个可视化拖拽编辑的，直观，酷炫，具有科技感的图表工具全开源项目。 内置的基础功能包括数据源，数据集，报表管理，项目部分截图如下。<br> &emsp;&emsp; 大屏设计（AJ-Report）是一个可视化拖拽编辑的，直观，酷炫，具有科技感的图表工具全开源项目。 内置的基础功能包括数据源，数据集，报表管理，项目部分截图如下。<br>
![操作](https://images.gitee.com/uploads/images/2021/0703/094742_c0243f70_1728982.gif "2021-07-03_09-43-50.gif") ![操作](https://images.gitee.com/uploads/images/2021/0703/094742_c0243f70_1728982.gif "2021-07-03_09-43-50.gif")
![视频](https://ajreport.beliefteam.cn/report-doc/static/Rhea.mp4) <br>
![视频](https://report.anji-plus.com/report-doc/static/Rhea.mp4) <br> **[更多社区大屏案例](https://ajreport.beliefteam.cn/report-doc/guide/bigScreenCase.html)** <br>
**[更多社区大屏案例](https://report.anji-plus.com/report-doc/guide/bigScreenCase.html)** <br>
## 数据流程图 ## 数据流程图
@ -93,15 +91,28 @@
## 部署方式 ## 部署方式
**[运行环境参考](https://report.anji-plus.com/report-doc/guide/quicklyDevelop.html)** <br> **注意版本兼容性** <br>
源码 doc -> docs -> guide 目录下即所有文档 <br>
### 发行版部署
```
下载最新发行版，解压
cd aj-report-xxxx
vim conf/bootstrap.yml 修改数据库连接等信息
sh bin/start.sh Linux启动
bin/start.bat Windows修改第4行的JAVA_HOME后(去掉rem注释)，双击启动
**[发行版部署参考](https://report.anji-plus.com/report-doc/guide/quicklyDistribution.html)** <br> 启动后访问
http://serverip:9095
用户名密码：admin/123456
**[源码编译部署参考](https://report.anji-plus.com/report-doc/guide/quicklySource.html)** <br> 登陆后修改"数据源->mysql数据源"用户名密码
```
**[前后端分离部署参考](https://report.anji-plus.com/report-doc/guide/quicklySeparate.html)** <br> ### 源码编译部署
以源码部署为例：在Linux上先准备好maven、node.js、jdk 在Linux上先准备好maven、node.js、jdk
- [Apache Maven] 3.5 <br> - [Apache Maven] 3.5 <br>
- [Node.js] v14.16.0 <br> - [Node.js] v14.16.0 <br>
@ -126,11 +137,18 @@ http://serverip:9095
登陆后修改"数据源->mysql数据源"用户名密码 登陆后修改"数据源->mysql数据源"用户名密码
``` ```
**[运行环境参考文档](https://ajreport.beliefteam.cn/report-doc/guide/quicklyDevelop.html)** <br>
**[源码编译部署参考文档](https://ajreport.beliefteam.cn/report-doc/guide/quicklySource.html)** <br>
**[发行版部署参考文档](https://ajreport.beliefteam.cn/report-doc/guide/quicklyDistribution.html)** <br>
**[前后端分离部署参考文档](https://ajreport.beliefteam.cn/report-doc/guide/quicklySeparate.html)** <br>
## 操作手册 ## 操作手册
新建数据源（重置mysql数据源） --> 新建数据集（编写sql） --> 新建大屏（设计大屏） <br> 新建数据源（重置mysql数据源） --> 新建数据集（编写sql） --> 新建大屏（设计大屏） <br>
**[在线文档](https://ajreport.beliefteam.cn/report-doc/guide/datasource.html)**
**[在线文档](https://report.anji-plus.com/report-doc/guide/datasource.html)**
## SQL初始化 ## SQL初始化
@ -143,13 +161,13 @@ sql文件的目录在：report-core --> src --> main --> resources -- > db.migra
希望你们的logo出现在此，[请点此Issue进行登记](https://gitee.com/anji-plus/report/issues/I3ZXT4) ，我们将优先进行技术支持 <br> 希望你们的logo出现在此，[请点此Issue进行登记](https://gitee.com/anji-plus/report/issues/I3ZXT4) ，我们将优先进行技术支持 <br>
<a href='http://www.anji-plus.com/'> <img src="https://report.anji-plus.com/file/download/d287d4d3-d30b-4850-9bac-a6c991409251" width = "130" height = "50" align=left/> </a> <a href='http://www.anji-plus.com/'> <img src="https://ajreport.beliefteam.cn/file/download/d287d4d3-d30b-4850-9bac-a6c991409251" width = "130" height = "50" align=left/> </a>
<a href='https://www.yunstech.cn/'><img src="https://www.yunstech.cn/images/logo.png" width = "130" height = "50" /> </a> <a href='https://www.yunstech.cn/'><img src="https://www.yunstech.cn/images/logo.png" width = "130" height = "50" /> </a>
<a href='http://www.fgkb.net/'><img src="https://report.anji-plus.com/file/download/9ee5b709-5033-4cd5-a784-ebd2877fd373" width = "130" height = "50" /> </a> <a href='http://www.fgkb.net/'><img src="https://ajreport.beliefteam.cn/file/download/9ee5b709-5033-4cd5-a784-ebd2877fd373" width = "130" height = "50" /> </a>
<a href='http://www.turingoal.com/'><img src="https://report.anji-plus.com/file/download/cda7bf68-376b-45dc-9a55-c52b21e4a8c8" width = "130" height = "50" /> </a> <a href='http://www.turingoal.com/'><img src="https://ajreport.beliefteam.cn/file/download/cda7bf68-376b-45dc-9a55-c52b21e4a8c8" width = "130" height = "50" /> </a>
<a href='https://www.gykjweb.com/'><img src="https://report.anji-plus.com/file/download/d13b03f5-0c20-4878-9a79-f3c76b44bfd9" width = "130" height = "130" /> </a> <br> <a href='https://www.gykjweb.com/'><img src="https://ajreport.beliefteam.cn/file/download/d13b03f5-0c20-4878-9a79-f3c76b44bfd9" width = "130" height = "130" /> </a> <br>
<a href='http://www.plian.net/'><img src="https://report.anji-plus.com/file/download/7838f2c2-fdce-4ca7-8373-14d13dcda5cc" width = "130" height = "50" /> </a> <a href='http://www.plian.net/'><img src="https://ajreport.beliefteam.cn/file/download/7838f2c2-fdce-4ca7-8373-14d13dcda5cc" width = "130" height = "50" /> </a>
<a href='https://www.zjjcl.cn/'><img src="https://report.anji-plus.com/file/download/8df07663-60c9-4e32-a0f2-0ea7d5c46ff9" width = "130" height = "50" /> </a> <a href='https://www.zjjcl.cn/'><img src="https://ajreport.beliefteam.cn/file/download/8df07663-60c9-4e32-a0f2-0ea7d5c46ff9" width = "130" height = "50" /> </a>
## 未来计划 ## 未来计划
@ -171,8 +189,7 @@ sql文件的目录在：report-core --> src --> main --> resources -- > db.migra
- openJdk - openJdk
- Jdk 11 - Jdk 11
- Mysql 8.0（8.0.23/26版本没有问题，8.0.21版本存在问题） - Mysql 8.0（8.0.23/26版本没有问题，8.0.21版本存在问题）
**[常见问题](https://ajreport.beliefteam.cn/report-doc/guide/question.html)**
**[常见问题](https://report.anji-plus.com/report-doc/guide/question.html)**
## 商业授权 ## 商业授权

2
doc/docs/guide/README.md
Unescape Escape View File

@ -10,7 +10,7 @@
## 在线体验 ## 在线体验
#### &emsp; [在线体验](https://report.anji-plus.com/index.html "链接"): https://report.anji-plus.com/index.html &emsp;体验账号：guest 密码：guest #### &emsp; [在线体验](https://ajreport.beliefteam.cn/index.html "链接"): https://ajreport.beliefteam.cn/index.html &emsp;体验账号：guest 密码：guest
#### &emsp; [在线提问](https://gitee.com/anji-plus/report/issues "issue"): https://gitee.com/anji-plus/report/issues <br> #### &emsp; [在线提问](https://gitee.com/anji-plus/report/issues "issue"): https://gitee.com/anji-plus/report/issues <br>

10
doc/docs/guide/bigScreenCase.md
Unescape Escape View File

@ -1,22 +1,22 @@
## 案例一 ## 案例一
由社区 **[~无痕~@tengzhouboy](https://gitee.com/tengzhouboy)** 提供 <br> 由社区 **[~无痕~@tengzhouboy](https://gitee.com/tengzhouboy)** 提供 <br>
[AJ-Report分享链接](https://report.anji-plus.com/index.html#/aj/mtwbjPot) <br> [AJ-Report分享链接](https://ajreport.beliefteam.cn/index.html#/aj/mtwbjPot) <br>
![img.png](../picture/bigScreenCase/img.png) <br> ![img.png](../picture/bigScreenCase/img.png) <br>
## 案例二 ## 案例二
由社区 **[心瘾丶 @yi_shan_liu](https://gitee.com/yi_shan_liu)** 提供<br> 由社区 **[心瘾丶 @yi_shan_liu](https://gitee.com/yi_shan_liu)** 提供<br>
[AJ-Report分享链接](https://report.anji-plus.com/index.html#/aj/hkBJgLW0) <br> [AJ-Report分享链接](https://ajreport.beliefteam.cn/index.html#/aj/hkBJgLW0) <br>
![img1](../picture/bigScreenCase/img1.png) <br> ![img1](../picture/bigScreenCase/img1.png) <br>
[AJ-Report分享链接](https://report.anji-plus.com/index.html#/aj/Hgfi4pj5) <br> [AJ-Report分享链接](https://ajreport.beliefteam.cn/index.html#/aj/Hgfi4pj5) <br>
![img2](../picture/bigScreenCase/img2.png) <br> ![img2](../picture/bigScreenCase/img2.png) <br>
[AJ-Report分享链接](https://report.anji-plus.com/index.html#/aj/zJa5Wwey) <br> [AJ-Report分享链接](https://ajreport.beliefteam.cn/index.html#/aj/zJa5Wwey) <br>
![img3](../picture/bigScreenCase/img3.png) <br> ![img3](../picture/bigScreenCase/img3.png) <br>
[AJ-Report分享链接](https://report.anji-plus.com/index.html#/aj/D0cpO4re) <br> [AJ-Report分享链接](https://ajreport.beliefteam.cn/index.html#/aj/D0cpO4re) <br>
![img4](../picture/bigScreenCase/img4.png) <br> ![img4](../picture/bigScreenCase/img4.png) <br>

12
doc/docs/guide/briefUsing.md
Unescape Escape View File

@ -1,9 +1,9 @@
希望你们的logo出现在此，[请点此Issue进行登记](https://gitee.com/anji-plus/report/issues/I3ZXT4) <br> 希望你们的logo出现在此，[请点此Issue进行登记](https://gitee.com/anji-plus/report/issues/I3ZXT4) <br>
<a href='http://www.anji-plus.com/'> <img src="https://report.anji-plus.com/file/download/d287d4d3-d30b-4850-9bac-a6c991409251" width = "130" height = "50" align=left/> </a> <a href='http://www.anji-plus.com/'> <img src="https://ajreport.beliefteam.cn/file/download/d287d4d3-d30b-4850-9bac-a6c991409251" width = "130" height = "50" align=left/> </a>
<a href='https://www.yunstech.cn/'><img src="https://www.yunstech.cn/images/logo.png" width = "130" height = "50" /> </a> <a href='https://www.yunstech.cn/'><img src="https://www.yunstech.cn/images/logo.png" width = "130" height = "50" /> </a>
<a href='http://www.fgkb.net/'><img src="https://report.anji-plus.com/file/download/9ee5b709-5033-4cd5-a784-ebd2877fd373" width = "130" height = "50" /> </a> <a href='http://www.fgkb.net/'><img src="https://ajreport.beliefteam.cn/file/download/9ee5b709-5033-4cd5-a784-ebd2877fd373" width = "130" height = "50" /> </a>
<a href='http://www.turingoal.com/'><img src="https://report.anji-plus.com/file/download/cda7bf68-376b-45dc-9a55-c52b21e4a8c8" width = "130" height = "50" /> </a> <a href='http://www.turingoal.com/'><img src="https://ajreport.beliefteam.cn/file/download/cda7bf68-376b-45dc-9a55-c52b21e4a8c8" width = "130" height = "50" /> </a>
<a href='http://www.plian.net/'><img src="https://report.anji-plus.com/file/download/7838f2c2-fdce-4ca7-8373-14d13dcda5cc" width = "130" height = "50" /> </a> <a href='http://www.plian.net/'><img src="https://ajreport.beliefteam.cn/file/download/7838f2c2-fdce-4ca7-8373-14d13dcda5cc" width = "130" height = "50" /> </a>
<a href='https://www.gykjweb.com/'><img src="https://report.anji-plus.com/file/download/d13b03f5-0c20-4878-9a79-f3c76b44bfd9" width = "130" height = "130" /> </a> <br> <a href='https://www.gykjweb.com/'><img src="https://ajreport.beliefteam.cn/file/download/d13b03f5-0c20-4878-9a79-f3c76b44bfd9" width = "130" height = "130" /> </a> <br>
<a href='https://www.zjjcl.cn/'><img src="https://report.anji-plus.com/file/download/8df07663-60c9-4e32-a0f2-0ea7d5c46ff9" width = "130" height = "50" /> </a> <a href='https://www.zjjcl.cn/'><img src="https://ajreport.beliefteam.cn/file/download/8df07663-60c9-4e32-a0f2-0ea7d5c46ff9" width = "130" height = "50" /> </a>

2
doc/docs/guide/question.md
Unescape Escape View File

@ -12,7 +12,7 @@
<br> <br>
## 版本问题：[开发环境参考](https://report.anji-plus.com/report-doc/guide/quicklyDevelop.html) ## 版本问题：[开发环境参考](https://ajreport.beliefteam.cn/report-doc/guide/quicklyDevelop.html)
- 底层数据库为Mysql8.0+时，flyway执行SQL报错<br> - 底层数据库为Mysql8.0+时，flyway执行SQL报错<br>
- Node.js是V16版本时 npm install失败 <br> - Node.js是V16版本时 npm install失败 <br>

2
report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-iframe.js
Unescape Escape View File

@ -28,7 +28,7 @@ export const widgetIframe = {
name: 'iframeAdress', name: 'iframeAdress',
required: false, required: false,
placeholder: '', placeholder: '',
value: 'https://report.anji-plus.com/index.html', value: 'https://ajreport.beliefteam.cn/index.html',
}, },
], ],
// 数据 // 数据

2
report-ui/src/views/bigscreenDesigner/designer/tools/index.js
Unescape Escape View File

@ -59,7 +59,7 @@ const screenConfig = {
name: 'backgroundImage', name: 'backgroundImage',
required: false, required: false,
placeholder: '', placeholder: '',
value: 'https://report.anji-plus.com/file/download/bf566e48-ccad-40e1-8ee9-228427e5466b', value: 'https://ajreport.beliefteam.cn/file/download/bf566e48-ccad-40e1-8ee9-228427e5466b',
}, },
], ],
data: [], data: [],

Write Preview
Loading…
Cancel
Save