diff --git a/README.en.md b/README.en.md index 27ef5db8..1e4b7f40 100644 --- a/README.en.md +++ b/README.en.md @@ -1,14 +1,20 @@ ## Online experience -####   Computer online experience: [https://report.anji-plus.com/](https://report.anji-plus.com/ "链接")  account：guest password：guest -####   Online documents: [https://report.anji-plus.com/report-doc/](https://report.anji-plus.com/report-doc/ "doc")
-####   issues: [https://gitee.com/anji-plus/report/issues](https://gitee.com/anji-plus/report/issues "issue") + +####   Computer online experience: [https://ajreport.beliefteam.cn/](https://ajreport.beliefteam.cn/ "链接")  account：guest password：guest + +####   Online documents: [https://ajreport.beliefteam.cn/report-doc/](https://ajreport.beliefteam.cn/report-doc/ "doc")
+ +####   issues: [https://gitee.com/anji-plus/report/issues](https://gitee.com/anji-plus/report/issues "issue") ## Function overview -####   Component introduction -   （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.。
+####   Component introduction + +   （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.。
## Packaging directory @@ -26,6 +32,7 @@ The built-in basic functions include data source, data set, report management, a ``` ## System directory + ``` ├── doc │ ├── docs @@ -40,11 +47,12 @@ The built-in basic functions include data source, data set, report management, a ├── README.md ``` - ## Short term plan -####   Enrich more chart components + +####   Enrich more chart components ## technical support + If you have any questions, please submit to [Issue](https://gitee.com/anji-plus/report/issues) #### Open source is not easy, please, star ☺ diff --git a/README.md b/README.md index efc9d388..52c4cc64 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ ## 在线体验 -####   [在线体验](https://report.anji-plus.com/index.html "链接"): https://report.anji-plus.com/index.html  体验账号：guest 密码：guest +####   [在线体验](https://ajreport.beliefteam.cn/index.html "链接"): https://ajreport.beliefteam.cn/index.html  体验账号：guest 密码：guest -####   [在线文档](https://report.anji-plus.com/report-doc/ "doc"): https://report.anji-plus.com/report-doc/
+####   [在线文档](https://ajreport.beliefteam.cn/report-doc/ "doc"): https://ajreport.beliefteam.cn/report-doc/
####   [在线提问](https://gitee.com/anji-plus/report/issues "issue"): https://gitee.com/anji-plus/report/issues
@@ -23,10 +23,8 @@    大屏设计（AJ-Report）是一个可视化拖拽编辑的，直观，酷炫，具有科技感的图表工具全开源项目。 内置的基础功能包括数据源，数据集，报表管理，项目部分截图如下。
![操作](https://images.gitee.com/uploads/images/2021/0703/094742_c0243f70_1728982.gif "2021-07-03_09-43-50.gif") - -![视频](https://report.anji-plus.com/report-doc/static/Rhea.mp4)
- -**[更多社区大屏案例](https://report.anji-plus.com/report-doc/guide/bigScreenCase.html)**
+![视频](https://ajreport.beliefteam.cn/report-doc/static/Rhea.mp4)
+**[更多社区大屏案例](https://ajreport.beliefteam.cn/report-doc/guide/bigScreenCase.html)**
## 数据流程图 @@ -93,15 +91,28 @@ ## 部署方式 -**[运行环境参考](https://report.anji-plus.com/report-doc/guide/quicklyDevelop.html)**
+**注意版本兼容性**
+源码 doc -> docs -> guide 目录下即所有文档
+ +### 发行版部署 + +``` +下载最新发行版，解压 +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)**
+启动后访问 +http://serverip:9095 +用户名密码：admin/123456 -**[源码编译部署参考](https://report.anji-plus.com/report-doc/guide/quicklySource.html)**
+登陆后修改"数据源->mysql数据源"用户名密码 +``` -**[前后端分离部署参考](https://report.anji-plus.com/report-doc/guide/quicklySeparate.html)**
+### 源码编译部署 -以源码部署为例：在Linux上先准备好maven、node.js、jdk +在Linux上先准备好maven、node.js、jdk - [Apache Maven] 3.5
- [Node.js] v14.16.0
@@ -126,11 +137,18 @@ http://serverip:9095 登陆后修改"数据源->mysql数据源"用户名密码 ``` +**[运行环境参考文档](https://ajreport.beliefteam.cn/report-doc/guide/quicklyDevelop.html)**
+ +**[源码编译部署参考文档](https://ajreport.beliefteam.cn/report-doc/guide/quicklySource.html)**
+ +**[发行版部署参考文档](https://ajreport.beliefteam.cn/report-doc/guide/quicklyDistribution.html)**
+ +**[前后端分离部署参考文档](https://ajreport.beliefteam.cn/report-doc/guide/quicklySeparate.html)**
+ ## 操作手册 新建数据源（重置mysql数据源） --> 新建数据集（编写sql） --> 新建大屏（设计大屏）
- -**[在线文档](https://report.anji-plus.com/report-doc/guide/datasource.html)** +**[在线文档](https://ajreport.beliefteam.cn/report-doc/guide/datasource.html)** ## SQL初始化 @@ -143,13 +161,13 @@ sql文件的目录在：report-core --> src --> main --> resources -- > db.migra 希望你们的logo出现在此，[请点此Issue进行登记](https://gitee.com/anji-plus/report/issues/I3ZXT4) ，我们将优先进行技术支持
- + - - -
- - + + +
+ + ## 未来计划 @@ -171,8 +189,7 @@ sql文件的目录在：report-core --> src --> main --> resources -- > db.migra - openJdk - Jdk 11 - Mysql 8.0（8.0.23/26版本没有问题，8.0.21版本存在问题） - -**[常见问题](https://report.anji-plus.com/report-doc/guide/question.html)** + **[常见问题](https://ajreport.beliefteam.cn/report-doc/guide/question.html)** ## 商业授权 @@ -190,7 +207,7 @@ AJ-Report使用[Apache2.0开源协议](http://www.apache.org/licenses/LICENSE-2. ## 技术支持 **如有问题，请提交 [Issue](https://gitee.com/anji-plus/report/issues)
** -个人企业微信：加微信进群备注AJ-Report或者Report（不备注是看不到的）
+个人企业微信：加微信进群备注AJ-Report或者Report （不备注是看不到的）
#### 开源不易，劳烦各位star ☺ diff --git a/doc/docs/guide/README.md b/doc/docs/guide/README.md index 6af10628..ef54e6f9 100644 --- a/doc/docs/guide/README.md +++ b/doc/docs/guide/README.md @@ -10,7 +10,7 @@ ## 在线体验 -####   [在线体验](https://report.anji-plus.com/index.html "链接"): https://report.anji-plus.com/index.html  体验账号：guest 密码：guest +####   [在线体验](https://ajreport.beliefteam.cn/index.html "链接"): https://ajreport.beliefteam.cn/index.html  体验账号：guest 密码：guest ####   [在线提问](https://gitee.com/anji-plus/report/issues "issue"): https://gitee.com/anji-plus/report/issues
diff --git a/doc/docs/guide/bigScreenCase.md b/doc/docs/guide/bigScreenCase.md index e9accfd9..88e92c1b 100644 --- a/doc/docs/guide/bigScreenCase.md +++ b/doc/docs/guide/bigScreenCase.md @@ -1,22 +1,22 @@ ## 案例一 由社区 **[~无痕~@tengzhouboy](https://gitee.com/tengzhouboy)** 提供
-[AJ-Report分享链接](https://report.anji-plus.com/index.html#/aj/mtwbjPot)
+[AJ-Report分享链接](https://ajreport.beliefteam.cn/index.html#/aj/mtwbjPot)
![img.png](../picture/bigScreenCase/img.png)
## 案例二 由社区 **[心瘾丶 @yi_shan_liu](https://gitee.com/yi_shan_liu)** 提供
-[AJ-Report分享链接](https://report.anji-plus.com/index.html#/aj/hkBJgLW0)
+[AJ-Report分享链接](https://ajreport.beliefteam.cn/index.html#/aj/hkBJgLW0)
![img1](../picture/bigScreenCase/img1.png)
-[AJ-Report分享链接](https://report.anji-plus.com/index.html#/aj/Hgfi4pj5)
+[AJ-Report分享链接](https://ajreport.beliefteam.cn/index.html#/aj/Hgfi4pj5)
![img2](../picture/bigScreenCase/img2.png)
-[AJ-Report分享链接](https://report.anji-plus.com/index.html#/aj/zJa5Wwey)
+[AJ-Report分享链接](https://ajreport.beliefteam.cn/index.html#/aj/zJa5Wwey)
![img3](../picture/bigScreenCase/img3.png)
-[AJ-Report分享链接](https://report.anji-plus.com/index.html#/aj/D0cpO4re)
+[AJ-Report分享链接](https://ajreport.beliefteam.cn/index.html#/aj/D0cpO4re)
![img4](../picture/bigScreenCase/img4.png)
\ No newline at end of file diff --git a/doc/docs/guide/briefUsing.md b/doc/docs/guide/briefUsing.md index 089a9210..c5a1d33f 100644 --- a/doc/docs/guide/briefUsing.md +++ b/doc/docs/guide/briefUsing.md @@ -1,9 +1,9 @@ 希望你们的logo出现在此，[请点此Issue进行登记](https://gitee.com/anji-plus/report/issues/I3ZXT4)
- + - - - -
- \ No newline at end of file + + + +
+ \ No newline at end of file diff --git a/doc/docs/guide/question.md b/doc/docs/guide/question.md index 3721505d..0eb8ba97 100644 --- a/doc/docs/guide/question.md +++ b/doc/docs/guide/question.md @@ -12,7 +12,7 @@
-## 版本问题：[开发环境参考](https://report.anji-plus.com/report-doc/guide/quicklyDevelop.html) +## 版本问题：[开发环境参考](https://ajreport.beliefteam.cn/report-doc/guide/quicklyDevelop.html) - 底层数据库为Mysql8.0+时，flyway执行SQL报错
- Node.js是V16版本时 npm install失败
diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-iframe.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-iframe.js index a38ba983..8aa78f08 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-iframe.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-iframe.js @@ -1,6 +1,6 @@ /* * @Descripttion: iframe json - * @version: + * @version: * @Author: qianlishi * @Date: 2021-08-29 07:17:55 * @LastEditors: qianlishi @@ -28,7 +28,7 @@ export const widgetIframe = { name: 'iframeAdress', required: false, placeholder: '', - value: 'https://report.anji-plus.com/index.html', + value: 'https://ajreport.beliefteam.cn/index.html', }, ], // 数据 diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/index.js b/report-ui/src/views/bigscreenDesigner/designer/tools/index.js index df359352..9ff919e1 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/index.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/index.js @@ -1,6 +1,6 @@ /* * @Descripttion: 主文件 - * @version: + * @version: * @Author: qianlishi * @Date: 2021-08-29 06:43:07 * @LastEditors: qianlishi @@ -59,7 +59,7 @@ const screenConfig = { name: 'backgroundImage', required: false, 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: [],